Merge pull request #645 from nautobot/patch-635-dna-center-integratio…

…n-imports-empty-locations-with-meraki-import-disabled Fix DNAC SSoT Empty Locations
nautobot · Jan 8, 2025 · b55043c · b55043c
2 parents 668308c + fa42e21
commit b55043c
Show file tree

Hide file tree

Showing 12 changed files with 1,328 additions and 1,144 deletions.
diff --git a/changes/643.fixed b/changes/643.fixed
@@ -0,0 +1 @@
+Fixed DNA Center bug where empty Locations were imported.
diff --git a/nautobot_ssot/integrations/dna_center/diffsync/adapters/dna_center.py b/nautobot_ssot/integrations/dna_center/diffsync/adapters/dna_center.py
diff --git a/nautobot_ssot/tests/dna_center/fixtures.py b/nautobot_ssot/tests/dna_center/fixtures.py
@@ -10,10 +10,15 @@ def load_json(path):
 
 
 LOCATION_FIXTURE = load_json(path="./nautobot_ssot/tests/dna_center/fixtures/get_locations.json")
+LOCATION_WO_GLOBAL_FIXTURE = load_json(path="./nautobot_ssot/tests/dna_center/fixtures/get_locations_wo_global.json")
+EXPECTED_BUILDING_MAP = load_json(path="./nautobot_ssot/tests/dna_center/fixtures/expected_building_map.json")
 EXPECTED_DNAC_LOCATION_MAP = load_json(path="./nautobot_ssot/tests/dna_center/fixtures/expected_dnac_location_map.json")
 EXPECTED_DNAC_LOCATION_MAP_WO_GLOBAL = load_json(
     path="./nautobot_ssot/tests/dna_center/fixtures/expected_dnac_location_map_wo_global.json"
 )
+EXPECTED_DNAC_LOCATION_MAP_W_JOB_LOCATION_MAP = load_json(
+    path="./nautobot_ssot/tests/dna_center/fixtures/expected_dnac_location_map_w_job_location_map.json"
+)
 RECV_LOCATION_FIXTURE = load_json(path="./nautobot_ssot/tests/dna_center/fixtures/get_locations_recv.json")
 DEVICE_FIXTURE = load_json(path="./nautobot_ssot/tests/dna_center/fixtures/get_devices.json")
 RECV_DEVICE_FIXTURE = load_json(path="./nautobot_ssot/tests/dna_center/fixtures/get_devices_recv.json")
@@ -22,7 +27,4 @@ def load_json(path):
 PORT_FIXTURE = load_json(path="./nautobot_ssot/tests/dna_center/fixtures/get_port_info.json")
 RECV_PORT_FIXTURE = load_json(path="./nautobot_ssot/tests/dna_center/fixtures/get_port_info_recv.json")
 
-EXPECTED_AREAS = load_json(path="./nautobot_ssot/tests/dna_center/fixtures/expected_areas.json")
-EXPECTED_AREAS_WO_GLOBAL = load_json(path="./nautobot_ssot/tests/dna_center/fixtures/expected_areas_wo_global.json")
-EXPECTED_BUILDINGS = load_json(path="./nautobot_ssot/tests/dna_center/fixtures/expected_buildings.json")
 EXPECTED_FLOORS = load_json(path="./nautobot_ssot/tests/dna_center/fixtures/expected_floors.json")
diff --git a/nautobot_ssot/tests/dna_center/fixtures/expected_areas.json b/nautobot_ssot/tests/dna_center/fixtures/expected_areas.json
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fixed DNA Center bug where empty Locations were imported.