diff --git a/gso/migrations/versions/2023-08-23_01e42c100448_update_ip_trunk_model.py b/gso/migrations/versions/2023-08-23_01e42c100448_update_ip_trunk_model.py index 469215e9b87cf1ece5a8ecf7f4df69fa9b3631d9..e4d9a86a323577e8df7bea7e97126ce55e6a6a9f 100644 --- a/gso/migrations/versions/2023-08-23_01e42c100448_update_ip_trunk_model.py +++ b/gso/migrations/versions/2023-08-23_01e42c100448_update_ip_trunk_model.py @@ -106,12 +106,6 @@ INSERT INTO product_block_resource_types (product_block_id, resource_type_id) VA """) conn.execute(""" INSERT INTO product_block_resource_types (product_block_id, resource_type_id) VALUES ((SELECT product_blocks.product_block_id FROM product_blocks WHERE product_blocks.name IN ('IptrunkSideBlock')), (SELECT resource_types.resource_type_id FROM resource_types WHERE resource_types.resource_type IN ('iptrunk_side_ae_geant_a_sid'))) - """) - conn.execute(""" -INSERT INTO subscription_instances (subscription_id, product_block_id) VALUES ('76af1125-9374-4653-bce2-e213419cdae5', (SELECT product_blocks.product_block_id FROM product_blocks WHERE product_blocks.name IN ('IptrunkSideBlock'))), ('f69f3d25-929c-4e41-98e6-49f1bd89e70f', (SELECT product_blocks.product_block_id FROM product_blocks WHERE product_blocks.name IN ('IptrunkSideBlock'))) - """) - conn.execute(""" -INSERT INTO subscription_instance_relations (in_use_by_id, depends_on_id, order_id) VALUES ('eaa4cf58-358f-4c34-82a1-d248dad43b9a', (SELECT subscription_instances.subscription_instance_id FROM subscription_instances WHERE subscription_instances.product_block_id IN (SELECT product_blocks.product_block_id FROM product_blocks WHERE product_blocks.name IN ('IptrunkSideBlock')) AND subscription_instances.subscription_id = '76af1125-9374-4653-bce2-e213419cdae5' LIMIT 1), 0), ('9794538d-d7a4-42c9-8fbe-f2c88f6e3e12', (SELECT subscription_instances.subscription_instance_id FROM subscription_instances WHERE subscription_instances.product_block_id IN (SELECT product_blocks.product_block_id FROM product_blocks WHERE product_blocks.name IN ('IptrunkSideBlock')) AND subscription_instances.subscription_id = 'f69f3d25-929c-4e41-98e6-49f1bd89e70f' LIMIT 1), 0) """) conn.execute(""" diff --git a/gso/workflows/tasks/import_router.py b/gso/workflows/tasks/import_router.py index 10a8b75e0674438aa3ad4927f60a505f960d8480..8f122b35048107f53ab012899b3343ba72307bf8 100644 --- a/gso/workflows/tasks/import_router.py +++ b/gso/workflows/tasks/import_router.py @@ -10,7 +10,7 @@ from orchestrator.workflow import StepList, done, init, step from orchestrator.workflows.steps import resync, set_status, store_process_subscription from gso.products.product_blocks import router as router_pb -from gso.products.product_blocks.router import RouterRole, RouterVendor +from gso.products.product_blocks.router import PortNumber, RouterRole, RouterVendor from gso.products.product_types import router from gso.products.product_types.router import RouterInactive from gso.products.product_types.site import Site @@ -73,7 +73,7 @@ def initial_input_form_generator() -> FormGenerator: def initialize_subscription( subscription: RouterInactive, hostname: str, - ts_port: int, + ts_port: PortNumber, router_vendor: router_pb.RouterVendor, router_site: str, router_role: router_pb.RouterRole,