Update master revision to 17.07

[vpp.git] / test / test_bfd.py

diff --git a/test/test_bfd.py b/test/test_bfd.py
index 5460a2b..4e3f688 100644 (file)
--- a/test/test_bfd.py
+++ b/test/test_bfd.py
@@ -1090,6 +1090,9 @@ class BFD4TestCase(VppTestCase):
                     self.assertNotEqual(p[IP].src, self.loopback0.local_ip4,
                                         "BFD ECHO src IP equal to loopback IP")
                     self.logger.debug(ppp("Looping back packet:", p))
+                    self.assert_equal(p[Ether].dst, self.pg0.remote_mac,
+                                      "ECHO packet destination MAC address")
+                    p[Ether].dst = self.pg0.local_mac
                     self.pg0.add_stream(p)
                     self.pg_start()
                 elif p.haslayer(BFD):
@@ -1159,6 +1162,7 @@ class BFD4TestCase(VppTestCase):
             self.logger.debug(ppp("Got packet:", p))
             if p[UDP].dport == BFD.udp_dport_echo:
                 self.logger.debug(ppp("Looping back packet:", p))
+                p[Ether].dst = self.pg0.local_mac
                 self.pg0.add_stream(p)
                 self.pg_start()
                 break
@@ -1190,6 +1194,7 @@ class BFD4TestCase(VppTestCase):
             self.logger.debug(ppp("Got packet:", p))
             if p[UDP].dport == BFD.udp_dport_echo:
                 self.logger.debug(ppp("Looping back packet:", p))
+                p[Ether].dst = self.pg0.local_mac
                 self.pg0.add_stream(p)
                 self.pg_start()
                 break
@@ -1230,6 +1235,7 @@ class BFD4TestCase(VppTestCase):
                 else:
                     self.logger.debug(ppp("Got followup echo packet:", p))
                 self.logger.debug(ppp("Looping back first echo packet:", p))
+                echo_packet[Ether].dst = self.pg0.local_mac
                 self.pg0.add_stream(echo_packet)
                 self.pg_start()
             elif p.haslayer(BFD):
@@ -1278,6 +1284,7 @@ class BFD4TestCase(VppTestCase):
                     timeout_at = time.time() + self.vpp_session.detect_mult * \
                         self.test_session.required_min_echo_rx / USEC_IN_SEC
                 p[BFD_vpp_echo].checksum = getrandbits(64)
+                p[Ether].dst = self.pg0.local_mac
                 self.logger.debug(ppp("Looping back modified echo packet:", p))
                 self.pg0.add_stream(p)
                 self.pg_start()
@@ -1523,7 +1530,6 @@ class BFD6TestCase(VppTestCase):
         self.assert_equal(udp_sport_tx, udp_sport_rx, "UDP source port (== "
                           "ECHO packet identifier for test purposes)")
 
-    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_echo(self):
         """ echo function used """
         bfd_session_up(self)
@@ -1554,6 +1560,9 @@ class BFD6TestCase(VppTestCase):
                     self.assertNotEqual(p[IPv6].src, self.loopback0.local_ip6,
                                         "BFD ECHO src IP equal to loopback IP")
                     self.logger.debug(ppp("Looping back packet:", p))
+                    self.assert_equal(p[Ether].dst, self.pg0.remote_mac,
+                                      "ECHO packet destination MAC address")
+                    p[Ether].dst = self.pg0.local_mac
                     self.pg0.add_stream(p)
                     self.pg_start()
                 elif p.haslayer(BFD):