@@ -336,44 +336,47 @@ def test_load_vlans(self):
336336 def test_load_tagged_vlans_to_interface (self ):
337337 """Test loading Nautobot tagged vlan interface assignments into the Diffsync store."""
338338 self .sync_network_data_adapter .load_tagged_vlans_to_interface ()
339- for interface in Interface .objects .filter (device__in = self .job .devices_to_load ):
340- tagged_vlans = []
341- for vlan in interface .tagged_vlans .all ():
342- vlan_dict = {}
343- vlan_dict ["name" ] = vlan .name
344- vlan_dict ["id" ] = str (vlan .vid )
345- tagged_vlans .append (vlan_dict )
346-
347- unique_id = f"{ interface .device .name } __{ interface .name } "
348- diffsync_obj = self .sync_network_data_adapter .get ("tagged_vlans_to_interface" , unique_id )
349- self .assertEqual (interface .device .name , diffsync_obj .device__name )
350- self .assertEqual (interface .name , diffsync_obj .name )
351- self .assertEqual (tagged_vlans , diffsync_obj .tagged_vlans )
339+ for device in self .job .devices_to_load :
340+ for interface in device .all_interfaces :
341+ tagged_vlans = []
342+ for vlan in interface .tagged_vlans .all ():
343+ vlan_dict = {}
344+ vlan_dict ["name" ] = vlan .name
345+ vlan_dict ["id" ] = str (vlan .vid )
346+ tagged_vlans .append (vlan_dict )
347+
348+ unique_id = f"{ interface .parent .name } __{ interface .name } "
349+ diffsync_obj = self .sync_network_data_adapter .get ("tagged_vlans_to_interface" , unique_id )
350+ self .assertEqual (interface .parent .name , diffsync_obj .device__name )
351+ self .assertEqual (interface .name , diffsync_obj .name )
352+ self .assertEqual (tagged_vlans , diffsync_obj .tagged_vlans )
352353
353354 def load_untagged_vlan_to_interface (self ):
354355 """Test loading Nautobot untagged vlan interface assignments into the Diffsync store."""
355356 self .sync_network_data_adapter .load_untagged_vlan_to_interface ()
356- for interface in Interface .objects .filter (device__in = self .job .devices_to_load ):
357- untagged_vlan = {}
358- if interface .untagged_vlan :
359- untagged_vlan ["name" ] = interface .untagged_vlan .name
360- untagged_vlan ["id" ] = str (interface .untagged_vlan .vid )
361-
362- unique_id = f"{ interface .device .name } __{ interface .name } "
363- diffsync_obj = self .sync_network_data_adapter .get ("untagged_vlans_to_interface" , unique_id )
364- self .assertEqual (interface .device .name , diffsync_obj .device__name )
365- self .assertEqual (interface .name , diffsync_obj .name )
366- self .assertEqual (untagged_vlan , diffsync_obj .tagged_vlan )
357+ for device in self .job .devices_to_load :
358+ for interface in device .all_interfaces :
359+ untagged_vlan = {}
360+ if interface .untagged_vlan :
361+ untagged_vlan ["name" ] = interface .untagged_vlan .name
362+ untagged_vlan ["id" ] = str (interface .untagged_vlan .vid )
363+
364+ unique_id = f"{ interface .parent .name } __{ interface .name } "
365+ diffsync_obj = self .sync_network_data_adapter .get ("untagged_vlans_to_interface" , unique_id )
366+ self .assertEqual (interface .parent .name , diffsync_obj .device__name )
367+ self .assertEqual (interface .name , diffsync_obj .name )
368+ self .assertEqual (untagged_vlan , diffsync_obj .tagged_vlan )
367369
368370 def test_load_lag_to_interface (self ):
369371 """Test loading Nautobot lag interface assignments into the Diffsync store."""
370372 self .sync_network_data_adapter .load_lag_to_interface ()
371- for interface in Interface .objects .filter (device__in = self .job .devices_to_load ):
372- unique_id = f"{ interface .device .name } __{ interface .name } "
373- diffsync_obj = self .sync_network_data_adapter .get ("lag_to_interface" , unique_id )
374- self .assertEqual (interface .device .name , diffsync_obj .device__name )
375- self .assertEqual (interface .name , diffsync_obj .name )
376- self .assertEqual (interface .lag .name if interface .lag else "" , diffsync_obj .lag__interface__name )
373+ for device in self .job .devices_to_load :
374+ for interface in device .all_interfaces :
375+ unique_id = f"{ interface .parent .name } __{ interface .name } "
376+ diffsync_obj = self .sync_network_data_adapter .get ("lag_to_interface" , unique_id )
377+ self .assertEqual (interface .parent .name , diffsync_obj .device__name )
378+ self .assertEqual (interface .name , diffsync_obj .name )
379+ self .assertEqual (interface .lag .name if interface .lag else "" , diffsync_obj .lag__interface__name )
377380
378381 def test_load_vrfs (self ):
379382 """Test loading Nautobot vrf data into the diffsync store."""
@@ -411,15 +414,16 @@ def test_load_cables(self):
411414 def test_load_vrf_to_interface (self ):
412415 """Test loading Nautobot vrf interface assignments into the Diffsync store."""
413416 self .sync_network_data_adapter .load_vrf_to_interface ()
414- for interface in Interface .objects .filter (device__in = self .job .devices_to_load ):
415- vrf = {}
416- if interface .vrf :
417- vrf ["name" ] = interface .vrf .name
418- unique_id = f"{ interface .device .name } __{ interface .name } "
419- diffsync_obj = self .sync_network_data_adapter .get ("vrf_to_interface" , unique_id )
420- self .assertEqual (interface .device .name , diffsync_obj .device__name )
421- self .assertEqual (interface .name , diffsync_obj .name )
422- self .assertEqual (vrf , diffsync_obj .vrf )
417+ for device in self .job .devices_to_load :
418+ for interface in device .all_interfaces :
419+ vrf = {}
420+ if interface .vrf :
421+ vrf ["name" ] = interface .vrf .name
422+ unique_id = f"{ interface .parent .name } __{ interface .name } "
423+ diffsync_obj = self .sync_network_data_adapter .get ("vrf_to_interface" , unique_id )
424+ self .assertEqual (interface .parent .name , diffsync_obj .device__name )
425+ self .assertEqual (interface .name , diffsync_obj .name )
426+ self .assertEqual (vrf , diffsync_obj .vrf )
423427
424428 def test_load_software_versions (self ):
425429 """Test loading Nautobot software version data into the diffsync store."""
0 commit comments