No overlapping sub-nets on any interface in the same table/VRF (VPP-943)

DBGvpp# set int ip addr loop0 10.10.10.10/24
DBGvpp# set int ip addr loop0 10.10.10.11/24
set interface ip address: failed to add 10.10.10.11/24 which conflicts with 10.10.10.10/24 for interface loop0

Change-Id: Iba63ffafbd36b6146ce86adb78139da9d55b40ba
Signed-off-by: Neale Ranns <nranns@cisco.com>

2 files changed, 9 insertions, 1 deletions

diff --git a/test/test_classifier.py b/test/test_classifier.py
index 1753feff66a..1e29aec6b00 100644
--- a/test/test_classifier.py
+++ b/test/test_classifier.py
@@ -60,6 +60,10 @@ class TestClassifier(VppTestCase):
 
     def tearDown(self):
         """Run standard test teardown and acl related log."""
+        for intf in self.interfaces:
+            intf.unconfig_ip4()
+            intf.admin_down()
+
         super(TestClassifier, self).tearDown()
         if not self.vpp_dead:
             self.logger.info(self.vapi.cli("show classify table verbose"))
diff --git a/test/test_ip6.py b/test/test_ip6.py
index 884f793680d..21d8025d583 100644
--- a/test/test_ip6.py
+++ b/test/test_ip6.py
@@ -212,10 +212,11 @@ class TestIPv6(TestIPv6ND):
 
     def tearDown(self):
         """Run standard test teardown and log ``show ip6 neighbors``."""
-        for i in self.sub_interfaces:
+        for i in self.interfaces:
             i.unconfig_ip6()
             i.ip6_disable()
             i.admin_down()
+        for i in self.sub_interfaces:
             i.remove_vpp_config()
 
         super(TestIPv6, self).tearDown()
@@ -918,6 +919,9 @@ class TestIPv6RD(TestIPv6ND):
             i.config_ip6()
 
     def tearDown(self):
+        for i in self.interfaces:
+            i.unconfig_ip6()
+            i.admin_down()
         super(TestIPv6RD, self).tearDown()
 
     def test_rd_send_router_solicitation(self):