Skip to content
Snippets Groups Projects
Commit a9e0e2f9 authored by Mohammad Torkashvand's avatar Mohammad Torkashvand
Browse files

upgrade orchestrator-core to v2

parent 6d89fe55
No related branches found
No related tags found
No related merge requests found
...@@ -6,7 +6,6 @@ import pytest ...@@ -6,7 +6,6 @@ import pytest
from gso.products import Iptrunk, ProductName from gso.products import Iptrunk, ProductName
from gso.products.product_blocks.iptrunk import IptrunkType, PhysicalPortCapacity from gso.products.product_blocks.iptrunk import IptrunkType, PhysicalPortCapacity
from gso.services.subscriptions import get_product_id_by_name from gso.services.subscriptions import get_product_id_by_name
from gso.utils.helpers import LAGMember
from gso.utils.shared_enums import Vendor from gso.utils.shared_enums import Vendor
from test import USER_CONFIRM_EMPTY_FORM from test import USER_CONFIRM_EMPTY_FORM
from test.services.conftest import MockedNetboxClient from test.services.conftest import MockedNetboxClient
...@@ -56,7 +55,7 @@ def input_form_wizard_data(request, juniper_router_subscription_factory, nokia_r ...@@ -56,7 +55,7 @@ def input_form_wizard_data(request, juniper_router_subscription_factory, nokia_r
else: else:
router_side_b = nokia_router_subscription_factory() router_side_b = nokia_router_subscription_factory()
side_b_members = [ 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) for interface in range(2)
] ]
...@@ -74,10 +73,10 @@ def input_form_wizard_data(request, juniper_router_subscription_factory, nokia_r ...@@ -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_iface": "lag-1",
"side_a_ae_geant_a_sid": None, "side_a_ae_geant_a_sid": None,
"side_a_ae_members": [ "side_a_ae_members": [
LAGMember( {
interface_name=f"Interface{interface}", "interface_name": f"Interface{interface}",
interface_description=faker.sentence(), "interface_description": faker.sentence(),
) }
for interface in range(2) for interface in range(2)
], ],
} }
...@@ -134,12 +133,10 @@ def test_successful_iptrunk_creation_with_standard_lso_result( ...@@ -134,12 +133,10 @@ def test_successful_iptrunk_creation_with_standard_lso_result(
subscription_id = state["subscription_id"] subscription_id = state["subscription_id"]
subscription = Iptrunk.from_subscription(subscription_id) subscription = Iptrunk.from_subscription(subscription_id)
sorted_sides = sorted( sorted_sides = sorted([
[ subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node.router_site.site_name,
subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node.router_site.site_name, subscription.iptrunk.iptrunk_sides[1].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.status == "provisioning"
assert subscription.description == ( assert subscription.description == (
f"IP trunk {sorted_sides[0]} {sorted_sides[1]}, geant_s_sid:{input_form_wizard_data[0]['geant_s_sid']}" f"IP trunk {sorted_sides[0]} {sorted_sides[1]}, geant_s_sid:{input_form_wizard_data[0]['geant_s_sid']}"
......
...@@ -29,6 +29,8 @@ def migrate_form_input( ...@@ -29,6 +29,8 @@ def migrate_form_input(
iptrunk_side_subscription_factory, iptrunk_side_subscription_factory,
): ):
use_juniper = getattr(request, "param", UseJuniperSide.NONE) 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: if use_juniper == UseJuniperSide.SIDE_A:
# Nokia -> Juniper # Nokia -> Juniper
...@@ -36,7 +38,7 @@ def migrate_form_input( ...@@ -36,7 +38,7 @@ def migrate_form_input(
old_subscription = Iptrunk.from_subscription(product_id) old_subscription = Iptrunk.from_subscription(product_id)
new_router = juniper_router_subscription_factory() new_router = juniper_router_subscription_factory()
replace_side = str(old_subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node.subscription.subscription_id) 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" lag_name = "ae1"
elif use_juniper == UseJuniperSide.SIDE_B: elif use_juniper == UseJuniperSide.SIDE_B:
# Juniper -> Nokia # Juniper -> Nokia
...@@ -48,7 +50,7 @@ def migrate_form_input( ...@@ -48,7 +50,7 @@ def migrate_form_input(
old_subscription = Iptrunk.from_subscription(product_id) old_subscription = Iptrunk.from_subscription(product_id)
new_router = nokia_router_subscription_factory() new_router = nokia_router_subscription_factory()
replace_side = str(old_subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node.subscription.subscription_id) 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" lag_name = "lag-1"
elif use_juniper == UseJuniperSide.SIDE_BOTH: elif use_juniper == UseJuniperSide.SIDE_BOTH:
# Juniper -> Juniper # Juniper -> Juniper
...@@ -60,7 +62,7 @@ def migrate_form_input( ...@@ -60,7 +62,7 @@ def migrate_form_input(
old_subscription = Iptrunk.from_subscription(product_id) old_subscription = Iptrunk.from_subscription(product_id)
new_router = juniper_router_subscription_factory() new_router = juniper_router_subscription_factory()
replace_side = str(old_subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node.subscription.subscription_id) 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" lag_name = "ae1"
else: else:
# Nokia -> Nokia # Nokia -> Nokia
...@@ -68,7 +70,7 @@ def migrate_form_input( ...@@ -68,7 +70,7 @@ def migrate_form_input(
old_subscription = Iptrunk.from_subscription(product_id) old_subscription = Iptrunk.from_subscription(product_id)
new_router = nokia_router_subscription_factory() new_router = nokia_router_subscription_factory()
replace_side = str(old_subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node.subscription.subscription_id) 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" lag_name = "lag-1"
return [ return [
......
...@@ -4,7 +4,6 @@ from pydantic_forms.exceptions import FormValidationError ...@@ -4,7 +4,6 @@ from pydantic_forms.exceptions import FormValidationError
from gso.products import ProductName from gso.products import ProductName
from gso.products.product_blocks.site import SiteTier from gso.products.product_blocks.site import SiteTier
from gso.products.product_types.site import Site 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 gso.services.subscriptions import get_product_id_by_name
from test.workflows import assert_complete, extract_state, run_workflow from test.workflows import assert_complete, extract_state, run_workflow
...@@ -65,7 +64,7 @@ def test_site_name_is_incorrect(responses, faker): ...@@ -65,7 +64,7 @@ def test_site_name_is_incorrect(responses, faker):
"site_internal_id": faker.pyint(), "site_internal_id": faker.pyint(),
"site_tier": SiteTier.TIER1, "site_tier": SiteTier.TIER1,
"site_ts_address": faker.ipv4(), "site_ts_address": faker.ipv4(),
"partner": get_partner_by_name("GEANT")["partner_id"], "partner": "GEANT",
}, },
] ]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment