upgrade orchestrator-core to v2

test/workflows/iptrunk/test_create_iptrunk.py

@@ -6,7 +6,6 @@ import pytest
 from gso.products import Iptrunk, ProductName
 from gso.products.product_blocks.iptrunk import IptrunkType, PhysicalPortCapacity
 from gso.services.subscriptions import get_product_id_by_name
-from gso.utils.helpers import LAGMember
 from gso.utils.shared_enums import Vendor
 from test import USER_CONFIRM_EMPTY_FORM
 from test.services.conftest import MockedNetboxClient
@@ -56,7 +55,7 @@ def input_form_wizard_data(request, juniper_router_subscription_factory, nokia_r
     else:
         router_side_b = nokia_router_subscription_factory()
         side_b_members = [
-            LAGMember(interface_name=f"Interface{interface}", interface_description=faker.sentence())
+            {"interface_name": f"Interface{interface}", "interface_description": faker.sentence()}
             for interface in range(2)
         ]
 
@@ -74,10 +73,10 @@ def input_form_wizard_data(request, juniper_router_subscription_factory, nokia_r
         "side_a_ae_iface": "lag-1",
         "side_a_ae_geant_a_sid": None,
         "side_a_ae_members": [
-            LAGMember(
-                interface_name=f"Interface{interface}",
-                interface_description=faker.sentence(),
-            )
+            {
+                "interface_name": f"Interface{interface}",
+                "interface_description": faker.sentence(),
+            }
             for interface in range(2)
         ],
     }
@@ -134,12 +133,10 @@ def test_successful_iptrunk_creation_with_standard_lso_result(
     subscription_id = state["subscription_id"]
     subscription = Iptrunk.from_subscription(subscription_id)
 
-    sorted_sides = sorted(
-        [
-            subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node.router_site.site_name,
-            subscription.iptrunk.iptrunk_sides[1].iptrunk_side_node.router_site.site_name,
-        ]
-    )
+    sorted_sides = sorted([
+        subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node.router_site.site_name,
+        subscription.iptrunk.iptrunk_sides[1].iptrunk_side_node.router_site.site_name,
+    ])
     assert subscription.status == "provisioning"
     assert subscription.description == (
         f"IP trunk {sorted_sides[0]} {sorted_sides[1]}, geant_s_sid:{input_form_wizard_data[0]['geant_s_sid']}"

test/workflows/iptrunk/test_migrate_iptrunk.py

@@ -29,6 +29,8 @@ def migrate_form_input(
     iptrunk_side_subscription_factory,
 ):
     use_juniper = getattr(request, "param", UseJuniperSide.NONE)
+    new_side_ae_members_nokia = faker.link_members_nokia()[0:2]
+    new_side_ae_members_juniper = faker.link_members_juniper()[0:2]
 
     if use_juniper == UseJuniperSide.SIDE_A:
         # Nokia -> Juniper
@@ -36,7 +38,7 @@ def migrate_form_input(
         old_subscription = Iptrunk.from_subscription(product_id)
         new_router = juniper_router_subscription_factory()
         replace_side = str(old_subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node.subscription.subscription_id)
-        new_side_ae_members = faker.link_members_juniper()[0:2]
+        new_side_ae_members = new_side_ae_members_juniper
         lag_name = "ae1"
     elif use_juniper == UseJuniperSide.SIDE_B:
         # Juniper -> Nokia
@@ -48,7 +50,7 @@ def migrate_form_input(
         old_subscription = Iptrunk.from_subscription(product_id)
         new_router = nokia_router_subscription_factory()
         replace_side = str(old_subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node.subscription.subscription_id)
-        new_side_ae_members = faker.link_members_nokia()[0:2]
+        new_side_ae_members = new_side_ae_members_nokia
         lag_name = "lag-1"
     elif use_juniper == UseJuniperSide.SIDE_BOTH:
         # Juniper -> Juniper
@@ -60,7 +62,7 @@ def migrate_form_input(
         old_subscription = Iptrunk.from_subscription(product_id)
         new_router = juniper_router_subscription_factory()
         replace_side = str(old_subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node.subscription.subscription_id)
-        new_side_ae_members = faker.link_members_juniper()[0:2]
+        new_side_ae_members = new_side_ae_members_juniper
         lag_name = "ae1"
     else:
         # Nokia -> Nokia
@@ -68,7 +70,7 @@ def migrate_form_input(
         old_subscription = Iptrunk.from_subscription(product_id)
         new_router = nokia_router_subscription_factory()
         replace_side = str(old_subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node.subscription.subscription_id)
-        new_side_ae_members = faker.link_members_nokia()[0:2]
+        new_side_ae_members = new_side_ae_members_nokia
         lag_name = "lag-1"
 
     return [

test/workflows/site/test_create_site.py

@@ -4,7 +4,6 @@ from pydantic_forms.exceptions import FormValidationError
 from gso.products import ProductName
 from gso.products.product_blocks.site import SiteTier
 from gso.products.product_types.site import Site
-from gso.services.partners import get_partner_by_name
 from gso.services.subscriptions import get_product_id_by_name
 from test.workflows import assert_complete, extract_state, run_workflow
 
@@ -65,7 +64,7 @@ def test_site_name_is_incorrect(responses, faker):
             "site_internal_id": faker.pyint(),
             "site_tier": SiteTier.TIER1,
             "site_ts_address": faker.ipv4(),
-            "partner": get_partner_by_name("GEANT")["partner_id"],
+            "partner": "GEANT",
         },
     ]