fix: Use super.save()

Author: snaselj

nautobot_netbox_importer/diffsync/models/cables.py

@@ -181,5 +181,10 @@ def create_missing_cable_terminations(adapter: SourceAdapter) -> None:
     wrapper = adapter.get_or_create_wrapper("dcim.cable")
 
     for cable in adapter.get_all(wrapper.nautobot.diffsync_class):
+        if getattr(cable, "termination_a_id", None) and getattr(cable, "termination_b_id", None):
+            continue
+
+        adapter.logger.debug(f"Processing missing cable terminations {getattr(cable, 'id')} ...")
+
         _update_cable_termination(wrapper, cable, "a")
         _update_cable_termination(wrapper, cable, "b")

nautobot_netbox_importer/diffsync/models/dcim.py

@@ -106,6 +106,10 @@ def setup(adapter: SourceAdapter) -> None:
         "dcim.cable",
         fields={
             "label": _define_cable_label,
+            "termination_a_type": "",
+            "termination_a_id": "",
+            "termination_b_type": "",
+            "termination_b_id": "",
         },
     )
     adapter.configure_model(

nautobot_netbox_importer/generator/nautobot.py

@@ -615,6 +615,24 @@ def set_empty(field, field_name: FieldName):
             else:
                 setattr(instance, field_name, None)
 
+        def save_or_super_save():
+            error = None
+
+            try:
+                instance.save()
+                return
+            except Exception as exception:
+                error = exception
+
+            super(instance.__class__, instance).save()
+
+            self.add_issue(
+                "FirstSaveFailed",
+                nautobot_instance=instance,
+                data=values,
+                error=error,
+            )
+
         @atomic
         def save():
             m2m_fields = set()
@@ -636,13 +654,13 @@ def save():
                 else:
                     setattr(instance, field_name, value)
 
-            instance.save()
+            save_or_super_save()
 
             if force_fields:
                 # These fields has to be set after the initial save to override any default values.
                 for field_name, value in force_fields.items():
                     setattr(instance, field_name, value)
-                instance.save()
+                save_or_super_save()
 
             for field_name in m2m_fields:
                 field = getattr(instance, field_name)

tasks.py

@@ -627,12 +627,16 @@ def import_db(context, db_name="", input_file="dump.sql"):
 @task(
     help={
         "db-name": "Database name to backup (default: Nautobot database)",
+        "format": "Database dump format (default: `sql`)",
         "output-file": "Ouput file, overwrite if exists (default: `dump.sql`)",
         "readable": "Flag to dump database data in more readable format (default: `True`)",
     }
 )
-def backup_db(context, db_name="", output_file="dump.sql", readable=True):
+def backup_db(context, db_name="", format="sql", output_file="", readable=True):
     """Dump database into `output_file` file from `db` container."""
+    if not output_file:
+        output_file = f"dump.{format}"
+
     start(context, "db")
     _await_healthy_service(context, "db")
 
@@ -651,6 +655,7 @@ def backup_db(context, db_name="", output_file="dump.sql", readable=True):
             "pg_dump",
             "--username=$POSTGRES_USER",
             f"--dbname={db_name or '$POSTGRES_DB'}",
+            f"--format={format}",
             "--inserts" if readable else "",
         ]
     else: