From 0bb5f9eae803638fd2954008d9c30ae957eaaee0 Mon Sep 17 00:00:00 2001
From: Neda Moeini <neda.moeini@geant.org>
Date: Wed, 13 Nov 2024 16:31:11 +0100
Subject: [PATCH] Finish the import WF for the L2Circuit.
---
gso/workflows/l2_circuit/import_layer_2_circuit.py | 4 ++--
test/fixtures/layer_2_circuit_fixtures.py | 9 +++++----
test/workflows/l2_circuit/test_import_layer_2_circuit.py | 3 ++-
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/gso/workflows/l2_circuit/import_layer_2_circuit.py b/gso/workflows/l2_circuit/import_layer_2_circuit.py
index 370af7ef..7a22d3cc 100644
--- a/gso/workflows/l2_circuit/import_layer_2_circuit.py
+++ b/gso/workflows/l2_circuit/import_layer_2_circuit.py
@@ -16,9 +16,9 @@ from gso.services.subscriptions import get_product_id_by_name
def import_layer_2_circuit_subscription(subscription_id: UUIDstr) -> State:
"""Take an imported subscription, and turn it into a layer 2 circuit subscription."""
old_layer_2_circuit_subscription = ImportedLayer2Circuit.from_subscription(subscription_id)
- if old_layer_2_circuit_subscription.layer_2_circuit_type == Layer2CircuitServiceType.IMPORTED_GEANT_PLUS:
+ if old_layer_2_circuit_subscription.layer_2_circuit_service_type == Layer2CircuitServiceType.IMPORTED_GEANT_PLUS:
new_subscription_id = get_product_id_by_name(ProductName.GEANT_PLUS)
- elif old_layer_2_circuit_subscription.layer_2_circuit_type == Layer2CircuitServiceType.IMPORTED_EXPRESSROUTE:
+ elif old_layer_2_circuit_subscription.layer_2_circuit_service_type == Layer2CircuitServiceType.IMPORTED_EXPRESSROUTE:
new_subscription_id = get_product_id_by_name(ProductName.EXPRESSROUTE)
else:
msg = f"This {old_layer_2_circuit_subscription.layer_2_circuit_service_type} is already imported."
diff --git a/test/fixtures/layer_2_circuit_fixtures.py b/test/fixtures/layer_2_circuit_fixtures.py
index 7ab7a7de..28fd88ae 100644
--- a/test/fixtures/layer_2_circuit_fixtures.py
+++ b/test/fixtures/layer_2_circuit_fixtures.py
@@ -5,11 +5,12 @@ from orchestrator.db import db
from orchestrator.domain import SubscriptionModel
from orchestrator.types import SubscriptionLifecycle, UUIDstr
-from gso.products import EdgePort, ProductName
+from gso.products import ProductName
from gso.products.product_blocks.layer_2_circuit import Layer2CircuitSideBlockInactive, Layer2CircuitType
from gso.products.product_blocks.service_binding_port import ServiceBindingPortInactive
+from gso.products.product_types.edge_port import EdgePort
from gso.products.product_types.layer_2_circuit import (
- ImportedLayer2Circuit,
+ ImportedLayer2CircuitInactive,
Layer2CircuitInactive,
Layer2CircuitServiceType,
)
@@ -54,7 +55,7 @@ def layer_2_circuit_subscription_factory(faker, geant_partner, edge_port_subscri
)
case Layer2CircuitServiceType.IMPORTED_GEANT_PLUS:
product_id = subscriptions.get_product_id_by_name(ProductName.IMPORTED_GEANT_PLUS)
- subscription = ImportedLayer2Circuit.from_product_id(
+ subscription = ImportedLayer2CircuitInactive.from_product_id(
product_id, customer_id=partner["partner_id"], insync=True
)
case Layer2CircuitServiceType.EXPRESSROUTE:
@@ -64,7 +65,7 @@ def layer_2_circuit_subscription_factory(faker, geant_partner, edge_port_subscri
)
case Layer2CircuitServiceType.IMPORTED_EXPRESSROUTE:
product_id = subscriptions.get_product_id_by_name(ProductName.IMPORTED_EXPRESSROUTE)
- subscription = ImportedLayer2Circuit.from_product_id(
+ subscription = ImportedLayer2CircuitInactive.from_product_id(
product_id, customer_id=partner["partner_id"], insync=True
)
case _:
diff --git a/test/workflows/l2_circuit/test_import_layer_2_circuit.py b/test/workflows/l2_circuit/test_import_layer_2_circuit.py
index 20350877..31b31066 100644
--- a/test/workflows/l2_circuit/test_import_layer_2_circuit.py
+++ b/test/workflows/l2_circuit/test_import_layer_2_circuit.py
@@ -20,6 +20,7 @@ def test_import_layer_2_circuit_success(layer_2_circuit_service_type, layer_2_ci
subscription = Layer2Circuit.from_subscription(imported_layer_2_circuit)
assert_complete(result)
- assert subscription.product.name == layer_2_circuit_service_type
+ # Remove the "IMPORTED_" prefix with ``[9:]``
+ assert subscription.product.name == layer_2_circuit_service_type.value[9:]
assert subscription.status == SubscriptionLifecycle.ACTIVE
assert subscription.insync is True
--
GitLab