summaryrefslogtreecommitdiffstats
path: root/test/test_gre.py
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2019-12-29 23:55:18 +0000
committerDamjan Marion <dmarion@me.com>2020-01-27 20:40:30 +0000
commit14053c9dbd75182f5302f7388d17508f3930f7ce (patch)
tree527f7675cfe18b13cc7c1923cd7959ec80459a7c /test/test_gre.py
parent59ff918ea5b86112ffc89054aa38107703354585 (diff)
ipip: Multi-point interface
Type: feature plus fixes for gre Signed-off-by: Neale Ranns <nranns@cisco.com> Change-Id: I0eca5f94b8b8ea0fcfb058162cafea4491708db6
Diffstat (limited to 'test/test_gre.py')
-rw-r--r--test/test_gre.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/test/test_gre.py b/test/test_gre.py
index f8c410050e1..e3e21c0ad99 100644
--- a/test/test_gre.py
+++ b/test/test_gre.py
@@ -1066,7 +1066,7 @@ class TestGRE(VppTestCase):
rx = self.send_and_expect(self.pg0, tx_e, itf)
self.verify_tunneled_4o4(self.pg0, rx, tx_e,
itf.local_ip4,
- gre_if._remote_hosts[ii].ip4)
+ itf._remote_hosts[ii].ip4)
tx_i = self.create_tunnel_stream_4o4(self.pg0,
itf._remote_hosts[ii].ip4,
@@ -1087,7 +1087,7 @@ class TestGRE(VppTestCase):
rx = self.send_and_expect(self.pg0, tx_e, itf)
self.verify_tunneled_4o4(self.pg0, rx, tx_e,
itf.local_ip4,
- gre_if._remote_hosts[ii].ip4)
+ itf._remote_hosts[ii].ip4)
rx = self.send_and_expect(self.pg0, tx_i, self.pg0)
self.verify_decapped_4o4(self.pg0, rx, tx_i)
@@ -1131,6 +1131,14 @@ class TestGRE(VppTestCase):
route_addr = "4::%d" % ii
#
+ # Add a NHRP entry resolves the peer
+ #
+ nhrp = VppNhrp(self, gre_if,
+ gre_if._remote_hosts[ii].ip6,
+ itf._remote_hosts[ii].ip6)
+ nhrp.add_vpp_config()
+
+ #
# route traffic via the peer
#
route_via_tun = VppIpRoute(
@@ -1140,14 +1148,6 @@ class TestGRE(VppTestCase):
route_via_tun.add_vpp_config()
#
- # Add a NHRP entry resolves the peer
- #
- nhrp = VppNhrp(self, gre_if,
- gre_if._remote_hosts[ii].ip6,
- itf._remote_hosts[ii].ip6)
- nhrp.add_vpp_config()
-
- #
# Send a packet stream that is routed into the tunnel
# - packets are GRE encapped
#
@@ -1155,7 +1155,7 @@ class TestGRE(VppTestCase):
rx = self.send_and_expect(self.pg0, tx_e, itf)
self.verify_tunneled_6o6(self.pg0, rx, tx_e,
itf.local_ip6,
- gre_if._remote_hosts[ii].ip6)
+ itf._remote_hosts[ii].ip6)
tx_i = self.create_tunnel_stream_6o6(self.pg0,
itf._remote_hosts[ii].ip6,
itf.local_ip6,
@@ -1174,7 +1174,7 @@ class TestGRE(VppTestCase):
rx = self.send_and_expect(self.pg0, tx_e, itf)
self.verify_tunneled_6o6(self.pg0, rx, tx_e,
itf.local_ip6,
- gre_if._remote_hosts[ii].ip6)
+ itf._remote_hosts[ii].ip6)
rx = self.send_and_expect(self.pg0, tx_i, self.pg0)
self.verify_decapped_6o6(self.pg0, rx, tx_i)