apply review suggestions

gso/utils/workflow_steps.py

@@ -22,8 +22,8 @@ from gso.settings import load_oss_params
 from gso.utils.helpers import generate_inventory_for_routers
 from gso.utils.shared_enums import Vendor
 
-SKIP_MOODI_KEY = "__skip_moodi__"
-IS_HUMAN_INITIATED_WF_KEY = "__is_human_initiated_wf_key__"
+SKIP_MOODI_KEY = "__skip_moodi"
+IS_HUMAN_INITIATED_WF_KEY = "__is_human_initiated_wf"
 
 
 def _deploy_base_config(

gso/workflows/edge_port/migrate_edge_port.py

@@ -359,16 +359,21 @@ def disable_old_config_dry(
 
 @step("[FOR REAL] Disable configuration on old router")
 def disable_old_config_real(
-    # subscription: EdgePort, TODO
+    subscription: EdgePort,
     process_id: UUIDstr,
     tt_number: str,
 ) -> LSOState:
     """Disable old configuration on the routers."""
+    layer3_services = get_active_l3_services_linked_to_edge_port(str(subscription.subscription_id))
+    layer2_circuits = get_active_l2_circuit_services_linked_to_edge_port(str(subscription.subscription_id))
+
     extra_vars = {
         "verb": "deactivate",
         "config_object": "deactivate",
         "dry_run": False,
         "commit_comment": f"GSO_PROCESS_ID: {process_id} - TT_NUMBER: {tt_number} " f"- Deploy config for # TODO",
+        "l3_core_services": [json.loads(json_dumps(layer3_service)) for layer3_service in layer3_services],
+        "l2_circuits": [json.loads(json_dumps(layer2_circuit)) for layer2_circuit in layer2_circuits],
     }
 
     return {
@@ -405,12 +410,12 @@ def inform_operator_traffic_check() -> FormGenerator:
 
 
 @workflow(
-    "Migrate an EdgePort",
+    "Migrate an Edge Port",
     initial_input_form=wrap_modify_initial_input_form(initial_input_form_generator),
     target=Target.MODIFY,
 )
 def migrate_edge_port() -> StepList:
-    """Migrate an EdgePort."""
+    """Migrate an Edge Port."""
     return (
         begin
         >> store_process_subscription(Target.MODIFY)

gso/workflows/l3_core_service/create_l3_core_service.py

@@ -201,16 +201,14 @@ def initialize_subscription(
         gs_id=sbp_gs_id,
     )
     subscription.l3_core_service.ap_list.append(
-        AccessPortInactive.new(  # TODO: Ask Simone why we don't active them somewhere?
+        AccessPortInactive.new(
             subscription_id=uuid4(),
             ap_type=edge_port["ap_type"],
             sbp=service_binding_port,
             custom_service_name=edge_port.get("custom_service_name"),
         )
     )
-    edge_port_fqdn_list.append(
-        edge_port_subscription.edge_port.node.router_fqdn
-    )  # TODO: why this is only one EP? what if we have multiple EP for an L3 Core Service
+    edge_port_fqdn_list.append(edge_port_subscription.edge_port.node.router_fqdn)
 
     partner_name = get_partner_by_id(subscription.customer_id).name
     subscription.description = f"{product_name} service for {partner_name}"