Merge pull request #615 from nautobot/bootstrap_fix_614

fix: 🐛 Pydantic errors and field normalization issues

changes/614.fixed

@@ -0,0 +1,2 @@
+Fixed creating platforms with no Manufacturer assigned.
+Fixed time_zone attribute normalization on Location objects.

nautobot_ssot/integrations/bootstrap/diffsync/adapters/nautobot.py

@@ -440,7 +440,7 @@ def load_location(self):
                     except AttributeError:
                         _time_zone = nb_location.time_zone
                 else:
-                    _time_zone = None
+                    _time_zone = ""
                 if nb_location.tenant is not None:
                     _tenant = nb_location.tenant.name
                 else:

nautobot_ssot/integrations/bootstrap/diffsync/models/base.py

@@ -362,7 +362,7 @@ class Platform(DiffSyncModel):
     _children = {}
 
     name: str
-    manufacturer: str
+    manufacturer: Optional[str] = None
     network_driver: Optional[str] = None
     napalm_driver: Optional[str] = None
     napalm_arguments: Optional[dict] = None

nautobot_ssot/integrations/bootstrap/diffsync/models/nautobot.py

@@ -351,7 +351,9 @@ def create(cls, adapter, ids, attrs):
         """Create Platform in Nautobot from NautobotPlatform object."""
         adapter.job.logger.info(f'Creating Nautobot Platform {ids["name"]}')
         try:
-            _manufacturer = ORMManufacturer.objects.get(name=ids["manufacturer"])
+            _manufacturer = None
+            if ids["manufacturer"]:
+                _manufacturer = ORMManufacturer.objects.get(name=ids["manufacturer"])
             _new_platform = ORMPlatform(
                 name=ids["name"],
                 manufacturer=_manufacturer,

nautobot_ssot/integrations/bootstrap/fixtures/global_settings.yml

@@ -151,6 +151,12 @@ platform:
     napalm_driver: ""
     napalm_arguments: {}
     description: "Arista Devices"
+  - name: "linux"
+    manufacturer: ""
+    network_driver: ""
+    napalm_driver: ""
+    napalm_arguments: {}
+    description: "Linux Devices"
 location_type:
   - name: "Region"
     parent: ""
@@ -248,6 +254,23 @@ location:
     contact_phone: ""
     contact_email: ""
     tags: []
+  - name: "Southwest"
+    location_type: "Region"
+    parent: ""
+    status: "Active"
+    facility: "OR1"
+    asn:
+    time_zone: ""
+    description: ""
+    tenant: ""
+    physical_address: ""
+    shipping_address: ""
+    latitude:
+    longitude:
+    contact_name: ""
+    contact_phone: ""
+    contact_email: ""
+    tags: []
 team:
   - name: "Datacenter"
     phone: "123-456-7890"

nautobot_ssot/tests/bootstrap/fixtures/global_settings.json

@@ -211,6 +211,14 @@
       "napalm_driver": "",
       "napalm_arguments": {},
       "description": "Arista Devices"
+    },
+    {
+      "name": "linux",
+      "manufacturer": "",
+      "network_driver": "",
+      "napalm_driver": "",
+      "napalm_arguments": {},
+      "description": "Linux Devices"
     }
   ],
   "location_type": [
@@ -281,6 +289,20 @@
       "contact_phone": "",
       "contact_email": "",
       "tags": []
+    },
+    {
+      "name": "Southwest",
+      "location_type": "Region",
+      "status": "Active",
+      "facility": "OR1",
+      "time_zone": "",
+      "description": "",
+      "physical_address": "",
+      "shipping_address": "",
+      "contact_name": "",
+      "contact_phone": "",
+      "contact_email": "",
+      "tags": []
     }
   ],
   "team": [

nautobot_ssot/tests/bootstrap/test_setup.py

@@ -695,7 +695,9 @@ def _setup_manufacturers(self):
 
     def _setup_platforms(self):
         for _platform in GLOBAL_YAML_SETTINGS["platform"]:
-            _manufac = Manufacturer.objects.get(name=_platform["manufacturer"])
+            _manufac = None
+            if _platform["manufacturer"]:
+                _manufac = Manufacturer.objects.get(name=_platform["manufacturer"])
             _platf = Platform.objects.create(
                 name=_platform["name"],
                 manufacturer=_manufac,