fix: 🐛 fix time_zone normalization

nautobot · Dec 6, 2024 · 769f9e2 · 769f9e2
1 parent 79a9576
commit 769f9e2
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 2 deletions.
diff --git a/changes/614.fixed b/changes/614.fixed
@@ -1 +1,2 @@
-Fixed creating platforms with no Manufacturer assigned.
+Fixed creating platforms with no Manufacturer assigned.
+Fixed time_zone attribute normalization on Location objects.
diff --git a/nautobot_ssot/integrations/bootstrap/diffsync/adapters/nautobot.py b/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:

diff --git a/nautobot_ssot/integrations/bootstrap/fixtures/global_settings.yml b/nautobot_ssot/integrations/bootstrap/fixtures/global_settings.yml
@@ -254,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"

diff --git a/nautobot_ssot/tests/bootstrap/fixtures/global_settings.json b/nautobot_ssot/tests/bootstrap/fixtures/global_settings.json
@@ -289,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": [