diff options
author | Neale Ranns <nranns@cisco.com> | 2020-02-03 10:55:09 +0000 |
---|---|---|
committer | Damjan Marion <dmarion@me.com> | 2020-02-04 09:44:58 +0000 |
commit | 03ce46219cd0fabfd4918822c5b9fed9ef880de8 (patch) | |
tree | f33c291dba25bcbe856602e6c63ce9d8ef4cc96c /test/test_gre.py | |
parent | 0860b2e19365c092f10dd1ce639caaded0e87ded (diff) |
teib: Rename NHRP to TEIB
Type: refactor
The Tunnel Endpoint Informatiob Base (TEIB) is a better
description of what it is (a mapping between tunnel endpoint
address, in the overlay, and next-hop address, in the underlay)
whereas NHRP is one instanc eof a control protocol that might add
such endpoints.
Signed-off-by: Neale Ranns <nranns@cisco.com>
Change-Id: Idcb2ad0b6543d3e5d9f6e96f9d14dafb5ce2aa85
Diffstat (limited to 'test/test_gre.py')
-rw-r--r-- | test/test_gre.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/test/test_gre.py b/test/test_gre.py index e73ba2f99a6..c604378f2b5 100644 --- a/test/test_gre.py +++ b/test/test_gre.py @@ -12,7 +12,7 @@ from scapy.volatile import RandMAC, RandIP from framework import VppTestCase, VppTestRunner from vpp_sub_interface import L2_VTR_OP, VppDot1QSubint from vpp_gre_interface import VppGreInterface -from vpp_nhrp import VppNhrp +from vpp_teib import VppNhrp from vpp_ip import DpoProto from vpp_ip_route import VppIpRoute, VppRoutePath, VppIpTable, FibPathProto from util import ppp, ppc @@ -1069,10 +1069,10 @@ class TestGRE(VppTestCase): # # Add a NHRP entry resolves the peer # - nhrp = VppNhrp(self, gre_if, + teib = VppNhrp(self, gre_if, gre_if._remote_hosts[ii].ip4, itf._remote_hosts[ii].ip4) - nhrp.add_vpp_config() + teib.add_vpp_config() # # Send a packet stream that is routed into the tunnel @@ -1095,11 +1095,11 @@ class TestGRE(VppTestCase): # # delete and re-add the NHRP # - nhrp.remove_vpp_config() + teib.remove_vpp_config() self.send_and_assert_no_replies(self.pg0, tx_e) self.send_and_assert_no_replies(self.pg0, tx_i) - nhrp.add_vpp_config() + teib.add_vpp_config() rx = self.send_and_expect(self.pg0, tx_e, itf) self.verify_tunneled_4o4(self.pg0, rx, tx_e, itf.local_ip4, @@ -1154,10 +1154,10 @@ class TestGRE(VppTestCase): # # Add a NHRP entry resolves the peer # - nhrp = VppNhrp(self, gre_if, + teib = VppNhrp(self, gre_if, gre_if._remote_hosts[ii].ip6, itf._remote_hosts[ii].ip6) - nhrp.add_vpp_config() + teib.add_vpp_config() # # route traffic via the peer @@ -1190,10 +1190,10 @@ class TestGRE(VppTestCase): # # delete and re-add the NHRP # - nhrp.remove_vpp_config() + teib.remove_vpp_config() self.send_and_assert_no_replies(self.pg0, tx_e) - nhrp.add_vpp_config() + teib.add_vpp_config() rx = self.send_and_expect(self.pg0, tx_e, itf) self.verify_tunneled_6o6(self.pg0, rx, tx_e, itf.local_ip6, |