X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_ip6.py;h=21d8025d583f13c9f5e52c1e8daedd850dbc4eb2;hb=refs%2Fchanges%2F32%2F12832%2F2;hp=c9efcbbc51c606f8a901bd38e9c6ff37522f284f;hpb=c03742346f0f3f08b83b0d2944bf72e19ea26191;p=vpp.git

diff --git a/test/test_ip6.py b/test/test_ip6.py
index c9efcbbc51c..21d8025d583 100644
--- a/test/test_ip6.py
+++ b/test/test_ip6.py
@@ -84,7 +84,7 @@ class TestIPv6ND(VppTestCase):
         dst_ip = inet_ntop(AF_INET6, nsma)
 
         # NS is broadcast
-        self.assertEqual(rx[Ether].dst, "ff:ff:ff:ff:ff:ff")
+        self.assertEqual(rx[Ether].dst, in6_getnsmac(nsma))
 
         # and from the router's MAC
         self.assertEqual(rx[Ether].src, intf.local_mac)
@@ -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):