added support for multiple IPs on juniper interface

changes/346.fixed

@@ -0,0 +1 @@
+Fixed Juniper IP addresses not syncing secondary IP addresses.

nautobot_device_onboarding/jinja_filters.py

@@ -4,6 +4,7 @@
 from itertools import chain
 
 from django_jinja import library
+from netutils.ip import is_ip
 from netutils.vlan import vlanconfig_to_list
 
 from nautobot_device_onboarding.constants import INTERFACE_TYPE_MAP_STATIC
@@ -174,11 +175,27 @@ def parse_junos_ip_address(item):
     """
     if isinstance(item, list) and len(item) > 0:
         if item[0]["prefix_length"] and item[0]["ip_address"]:
-            return [
-                {"prefix_length": item[0]["prefix_length"][0].split("/")[-1], "ip_address": item[0]["ip_address"][0]}
-            ]
+            result = []
+            for i in range(len(item[0]["ip_address"])):
+                prefix = item[0]["prefix_length"][i].split("/")[-1]
+                result.append(
+                    {
+                        "prefix_length": prefix,
+                        "ip_address": item[0]["ip_address"][i],
+                    }
+                )
+            return result
         if not item[0]["prefix_length"] and item[0]["ip_address"]:
-            return [{"prefix_length": 32, "ip_address": item[0]["ip_address"][0]}]
+            result = []
+            for i in range(len(item[0]["ip_address"])):
+                if is_ip(item[0]["ip_address"][i]):
+                    result.append(
+                        {
+                            "prefix_length": 32,
+                            "ip_address": item[0]["ip_address"][i],
+                        }
+                    )
+            return result
     return []
 
 

nautobot_device_onboarding/tests/test_formatter.py

@@ -547,7 +547,7 @@ def test_perform_data_extraction_sync_network_data_no_options(self):
                                 command_outputs,
                                 job_debug=False,
                             )
-                            self.assertEqual(expected_parsed_result, actual_result)
+                            self.assertCountEqual(expected_parsed_result, actual_result)
 
 
 class TestFormatterSyncNetworkDataWithVrfs(unittest.TestCase):
@@ -615,7 +615,7 @@ def test_perform_data_extraction_sync_network_data_with_vrfs(self):
                                 command_outputs,
                                 job_debug=False,
                             )
-                            self.assertEqual(expected_parsed_result, actual_result)
+                            self.assertCountEqual(expected_parsed_result, actual_result)
 
 
 class TestFormatterSyncNetworkDataWithVlans(unittest.TestCase):
@@ -683,7 +683,7 @@ def test_perform_data_extraction_sync_network_data_with_vlans(self):
                                 command_outputs,
                                 job_debug=False,
                             )
-                            self.assertEqual(expected_parsed_result, actual_result)
+                            self.assertCountEqual(expected_parsed_result, actual_result)
 
 
 @unittest.skip(reason="Todo test sync network data with all options.")

nautobot_device_onboarding/tests/test_jinja_filters.py

@@ -238,15 +238,14 @@ def test_parse_junos_ip_address_values_as_list_single(self):
         expected = [{"prefix_length": "31", "ip_address": "10.65.229.106"}]
         self.assertEqual(parse_junos_ip_address(data), expected)
 
-    @unittest.skip("Need to correct assert used for list of dictionaries.")
     def test_parse_junos_ip_address_values_as_list_multiple(self):
         """Parse Junos IP and destination prefix."""
         data = [{"prefix_length": ["10.65.133.0/29", "10.65.133.0/29"], "ip_address": ["10.65.133.1", "10.65.133.3"]}]
         expected = [
             {"prefix_length": "29", "ip_address": "10.65.133.1"},
-            {"ip_address": "10.65.133.3", "prefix_length": "29"},
+            {"prefix_length": "29", "ip_address": "10.65.133.3"},
         ]
-        self.assertEqual(parse_junos_ip_address(data), expected)
+        self.assertCountEqual(parse_junos_ip_address(data), expected)
 
     def test_parse_junos_ip_address_values_as_empty_list(self):
         """Parse Junos IP and destination prefix."""