Replace calls to deprecated .dict() with .model_dump()

gso/cli/imports.py

@@ -218,7 +218,7 @@ def _generic_import_product(
         typer.echo(f"Creating imported {name_key}: {details[name_key]}")
         try:
             initial_data = import_model(**details)
-            start_process(f"create_imported_{workflow_suffix}", [initial_data.dict()])
+            start_process(f"create_imported_{workflow_suffix}", [initial_data.model_dump()])
             successfully_imported_data.append(getattr(initial_data, name_key))
             typer.echo(
                 f"Successfully created {name_key}: {getattr(initial_data, name_key)}",
@@ -341,7 +341,7 @@ def import_iptrunks(filepath: str = common_filepath_option) -> None:
                 iptrunk_ipv4_network=iptrunk_ipv4_network,
                 iptrunk_ipv6_network=iptrunk_ipv6_network,
             )
-            start_process("create_imported_iptrunk", [initial_data.dict()])
+            start_process("create_imported_iptrunk", [initial_data.model_dump()])
             successfully_imported_data.append(trunk["id"])
             typer.echo(f"Successfully imported IP Trunk: {trunk['id']}")
         except ValidationError as e:

gso/services/partners.py

@@ -38,7 +38,7 @@ def create_partner(
     :return: JSON representation of the created partner.
     """
     try:
-        new_partner = PartnerTable(**partner_data.dict())
+        new_partner = PartnerTable(**partner_data.model_dump())
 
         db.session.add(new_partner)
         db.session.commit()

gso/workflows/iptrunk/activate_iptrunk.py

@@ -20,7 +20,7 @@ def _initial_input_form(subscription_id: UUIDstr) -> FormGenerator:
 
     user_input = yield ActivateTrunkForm
 
-    return user_input.dict() | {"subscription": trunk}
+    return user_input.model_dump() | {"subscription": trunk}
 
 
 @inputstep("Verify checklist completion", assignee=Assignee.SYSTEM)
@@ -33,7 +33,7 @@ def verify_complete_checklist() -> FormGenerator:
 
     user_input = yield VerifyCompleteForm
 
-    return {"checklist_url": user_input.dict()["checklist_url"]}
+    return {"checklist_url": user_input.model_dump()["checklist_url"]}
 
 
 @workflow(

gso/workflows/iptrunk/create_imported_iptrunk.py

@@ -66,7 +66,7 @@ def initial_input_form_generator() -> FormGenerator:
 
     initial_user_input = yield CreateIptrunkForm
 
-    return initial_user_input.dict()
+    return initial_user_input.model_dump()
 
 
 @step("Create a new subscription")

gso/workflows/iptrunk/create_iptrunk.py

@@ -189,12 +189,12 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
     user_input_side_b = yield CreateIptrunkSideBForm
 
     return (
-        initial_user_input.dict()
-        | verify_minimum_links.dict()
-        | user_input_router_side_a.dict()
-        | user_input_side_a.dict()
-        | user_input_router_side_b.dict()
-        | user_input_side_b.dict()
+        initial_user_input.model_dump()
+        | verify_minimum_links.model_dump()
+        | user_input_router_side_a.model_dump()
+        | user_input_side_a.model_dump()
+        | user_input_router_side_b.model_dump()
+        | user_input_side_b.model_dump()
     )
 
 

gso/workflows/iptrunk/deploy_twamp.py

@@ -34,7 +34,7 @@ def _initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
 
     user_input = yield DeployTWAMPForm
 
-    return user_input.dict()
+    return user_input.model_dump()
 
 
 @step("[DRY RUN] Deploy TWAMP on both sides")

gso/workflows/iptrunk/migrate_iptrunk.py

@@ -171,9 +171,9 @@ def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
 
     new_side_input = yield NewSideIPTrunkForm
     return (
-        migrate_form_input.dict()
-        | new_side_iptrunk_router_input.dict()
-        | new_side_input.dict()
+        migrate_form_input.model_dump()
+        | new_side_iptrunk_router_input.model_dump()
+        | new_side_input.model_dump()
         | {"replace_index": replace_index}
     )
 

gso/workflows/iptrunk/modify_isis_metric.py

@@ -24,7 +24,7 @@ def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
 
     user_input = yield ModifyIptrunkForm
 
-    return user_input.dict()
+    return user_input.model_dump()
 
 
 @step("Update subscription")

gso/workflows/iptrunk/modify_trunk_interface.py

@@ -114,7 +114,7 @@ def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
         info_label2: Label = "Please confirm or modify."
 
     verify_minimum_links = yield VerifyMinimumLinksForm
-    ae_members_side_a = initialize_ae_members(subscription, initial_user_input.dict(), 0)
+    ae_members_side_a = initialize_ae_members(subscription, initial_user_input.model_dump(), 0)
 
     class ModifyIptrunkSideAForm(FormPage):
         model_config = ConfigDict(title="Provide subscription details for side A of the trunk.")
@@ -140,7 +140,7 @@ def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
             return validate_interface_name_list(side_a_ae_members, vendor)
 
     user_input_side_a = yield ModifyIptrunkSideAForm
-    ae_members_side_b = initialize_ae_members(subscription, initial_user_input.dict(), 1)
+    ae_members_side_b = initialize_ae_members(subscription, initial_user_input.model_dump(), 1)
 
     class ModifyIptrunkSideBForm(FormPage):
         model_config = ConfigDict(title="Provide subscription details for side B of the trunk.")
@@ -167,7 +167,12 @@ def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
 
     user_input_side_b = yield ModifyIptrunkSideBForm
 
-    return initial_user_input.dict() | user_input_side_a.dict() | user_input_side_b.dict() | verify_minimum_links.dict()
+    return (
+        initial_user_input.model_dump()
+        | user_input_side_a.model_dump()
+        | user_input_side_b.model_dump()
+        | verify_minimum_links.model_dump()
+    )
 
 
 @step("Update subscription")

gso/workflows/iptrunk/terminate_iptrunk.py

@@ -51,7 +51,7 @@ def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
             return validate_tt_number(tt_number)
 
     user_input = yield TerminateForm
-    return user_input.dict()
+    return user_input.model_dump()
 
 
 @step("[DRY RUN] Deprovision IP trunk")

gso/workflows/office_router/create_imported_office_router.py

@@ -44,7 +44,7 @@ def initial_input_form_generator() -> FormGenerator:
 
     user_input = yield ImportOfficeRouter
 
-    return user_input.dict()
+    return user_input.model_dump()
 
 
 @step("Initialize subscription")

gso/workflows/router/activate_router.py

@@ -20,7 +20,7 @@ def _initial_input_form(subscription_id: UUIDstr) -> FormGenerator:
 
     user_input = yield ActivateRouterForm
 
-    return user_input.dict() | {"subscription": router}
+    return user_input.model_dump() | {"subscription": router}
 
 
 @inputstep("Verify checklist completion", assignee=Assignee.SYSTEM)
@@ -33,7 +33,7 @@ def verify_complete_checklist() -> FormGenerator:
 
     user_input = yield VerifyCompleteForm
 
-    return {"checklist_url": user_input.dict()["checklist_url"]}
+    return {"checklist_url": user_input.model_dump()["checklist_url"]}
 
 
 @workflow(

gso/workflows/router/create_imported_router.py

@@ -48,7 +48,7 @@ def initial_input_form_generator() -> FormGenerator:
 
     user_input = yield ImportRouter
 
-    return user_input.dict()
+    return user_input.model_dump()
 
 
 @step("Initialize subscription")

gso/workflows/router/create_router.py

@@ -73,7 +73,7 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
 
     user_input = yield CreateRouterForm
 
-    return user_input.dict()
+    return user_input.model_dump()
 
 
 @step("Create subscription")

gso/workflows/router/modify_connection_strategy.py

@@ -27,7 +27,7 @@ def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
 
     user_input = yield ModifyConnectionStrategyForm
 
-    return user_input.dict()
+    return user_input.model_dump()
 
 
 @step("Update subscription model")

gso/workflows/router/redeploy_base_config.py

@@ -22,7 +22,7 @@ def _initial_input_form(subscription_id: UUIDstr) -> FormGenerator:
 
     user_input = yield RedeployBaseConfigForm
 
-    return user_input.dict() | {"subscription": router}
+    return user_input.model_dump() | {"subscription": router}
 
 
 @workflow(

gso/workflows/router/terminate_router.py

@@ -44,7 +44,7 @@ def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
         remove_configuration: bool = True
 
     user_input = yield TerminateForm
-    return user_input.dict() | {"router_is_nokia": router.router.vendor == Vendor.NOKIA}
+    return user_input.model_dump() | {"router_is_nokia": router.router.vendor == Vendor.NOKIA}
 
 
 @step("Deprovision loopback IPs from IPAM")

gso/workflows/router/update_ibgp_mesh.py

@@ -46,7 +46,7 @@ def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
 
     user_input = yield AddBGPSessionForm
 
-    return user_input.dict()
+    return user_input.model_dump()
 
 
 @step("Calculate list of all active PE routers")

gso/workflows/site/create_imported_site.py

@@ -37,7 +37,7 @@ def generate_initial_input_form() -> FormGenerator:
         model_config = ConfigDict(title="Import Site")
 
     user_input = yield ImportSite
-    return user_input.dict()
+    return user_input.model_dump()
 
 
 @step("Initialize subscription")

gso/workflows/site/create_site.py

@@ -25,7 +25,7 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
 
     user_input = yield CreateSiteForm
 
-    return user_input.dict()
+    return user_input.model_dump()
 
 
 @step("Create subscription")