1 files changed, 44 insertions, 39 deletions
diff --git a/smoketest/scripts/cli/test_vrf.py b/smoketest/scripts/cli/test_vrf.py
index 5daea589c..c591d6cf5 100755
--- a/smoketest/scripts/cli/test_vrf.py
+++ b/smoketest/scripts/cli/test_vrf.py
@@ -131,41 +131,6 @@ class VRFTest(VyOSUnitTestSHIM.TestCase):
             for addr in loopbacks:
                 self.assertTrue(is_intf_addr_assigned(vrf, addr))
 
-    def test_vrf_loopbacks_no_ipv6(self):
-        table = '2002'
-        for vrf in vrfs:
-            base = base_path + ['name', vrf]
-            self.cli_set(base + ['table', str(table)])
-            table = str(int(table) + 1)
-
-        # Globally disable IPv6 - this will remove all IPv6 interface addresses
-        self.cli_set(['system', 'ipv6', 'disable'])
-
-        # commit changes
-        self.cli_commit()
-
-        # Verify VRF configuration
-        table = '2002'
-        loopbacks = ['127.0.0.1', '::1']
-        for vrf in vrfs:
-            # Ensure VRF was created
-            self.assertIn(vrf, interfaces())
-
-            # Verify VRF table ID
-            tmp = get_interface_config(vrf)
-            self.assertEqual(int(table), tmp['linkinfo']['info_data']['table'])
-
-            # Test for proper loopback IP assignment
-            for addr in loopbacks:
-                if is_ipv4(addr):
-                    self.assertTrue(is_intf_addr_assigned(vrf, addr))
-                else:
-                    self.assertFalse(is_intf_addr_assigned(vrf, addr))
-
-            table = str(int(table) + 1)
-
-        self.cli_delete(['system', 'ipv6'])
-
     def test_vrf_bind_all(self):
         table = '2000'
         for vrf in vrfs:
@@ -216,11 +181,11 @@ class VRFTest(VyOSUnitTestSHIM.TestCase):
         # commit changes
         self.cli_commit()
 
-        # Verify & cleanup
+        # Verify VRF assignmant
         for interface in self._interfaces:
-            # os.readlink resolves to: '../../../../../virtual/net/foovrf'
-            tmp = os.readlink(f'/sys/class/net/{interface}/master').split('/')[-1]
-            self.assertEqual(tmp, vrf)
+            tmp = get_interface_config(interface)
+            self.assertEqual(vrf, tmp['master'])
+
             # cleanup
             section = Section.section(interface)
             self.cli_delete(['interfaces', section, interface, 'vrf'])
@@ -262,5 +227,45 @@ class VRFTest(VyOSUnitTestSHIM.TestCase):
             # Increment table ID for the next run
             table = str(int(table) + 1)
 
+    def test_vrf_link_local_ip_addresses(self):
+        # Testcase for issue T4331
+        table = '100'
+        vrf = 'orange'
+        interface = 'dum9998'
+        addresses = ['192.0.2.1/26', '2001:db8:9998::1/64', 'fe80::1/64']
+
+        for address in addresses:
+            self.cli_set(['interfaces', 'dummy', interface, 'address', address])
+
+        # Create dummy interfaces
+        self.cli_commit()
+
+        # ... and verify IP addresses got assigned
+        for address in addresses:
+            self.assertTrue(is_intf_addr_assigned(interface, address))
+
+        # Move interface to VRF
+        self.cli_set(base_path + ['name', vrf, 'table', table])
+        self.cli_set(['interfaces', 'dummy', interface, 'vrf', vrf])
+
+        # Apply VRF config
+        self.cli_commit()
+        # Ensure VRF got created
+        self.assertIn(vrf, interfaces())
+        # ... and IP addresses are still assigned
+        for address in addresses:
+            self.assertTrue(is_intf_addr_assigned(interface, address))
+        # Verify VRF table ID
+        tmp = get_interface_config(vrf)
+        self.assertEqual(int(table), tmp['linkinfo']['info_data']['table'])
+
+        # Verify interface is assigned to VRF
+        tmp = get_interface_config(interface)
+        self.assertEqual(vrf, tmp['master'])
+
+        # Delete Interface
+        self.cli_delete(['interfaces', 'dummy', interface])
+        self.cli_commit()
+
 if __name__ == '__main__':
     unittest.main(verbosity=2)