summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2020-02-03 10:55:09 +0000
committerDamjan Marion <dmarion@me.com>2020-02-04 09:44:58 +0000
commit03ce46219cd0fabfd4918822c5b9fed9ef880de8 (patch)
treef33c291dba25bcbe856602e6c63ce9d8ef4cc96c /test
parent0860b2e19365c092f10dd1ce639caaded0e87ded (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')
-rw-r--r--test/test_gre.py18
-rw-r--r--test/test_ipip.py10
-rw-r--r--test/vpp_teib.py (renamed from test/vpp_nhrp.py)12
3 files changed, 20 insertions, 20 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,
diff --git a/test/test_ipip.py b/test/test_ipip.py
index 511164f11ac..1cc4a7df803 100644
--- a/test/test_ipip.py
+++ b/test/test_ipip.py
@@ -8,7 +8,7 @@ from framework import VppTestCase, VppTestRunner
from vpp_ip import DpoProto
from vpp_ip_route import VppIpRoute, VppRoutePath, VppIpTable, FibPathProto
from vpp_ipip_tun_interface import VppIpIpTunInterface
-from vpp_nhrp import VppNhrp
+from vpp_teib import VppNhrp
from vpp_papi import VppEnum
from socket import AF_INET, AF_INET6, inet_pton
from util import reassemble4
@@ -530,10 +530,10 @@ class TestIPIP(VppTestCase):
#
# Add a NHRP entry resolves the peer
#
- nhrp = VppNhrp(self, ipip_if,
+ teib = VppNhrp(self, ipip_if,
ipip_if._remote_hosts[ii].ip4,
itf._remote_hosts[ii].ip4)
- nhrp.add_vpp_config()
+ teib.add_vpp_config()
self.logger.info(self.vapi.cli("sh adj nbr ipip0 %s" %
ipip_if._remote_hosts[ii].ip4))
@@ -568,11 +568,11 @@ class TestIPIP(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)
for rx in rxs:
self.assertEqual(rx[IP].src, itf.local_ip4)
diff --git a/test/vpp_nhrp.py b/test/vpp_teib.py
index e04e3054fd2..e117ac39302 100644
--- a/test/vpp_nhrp.py
+++ b/test/vpp_teib.py
@@ -6,8 +6,8 @@
from vpp_object import VppObject
-def find_nhrp(test, ne):
- ns = test.vapi.nhrp_dump()
+def find_teib(test, ne):
+ ns = test.vapi.teib_dump()
for n in ns:
if ne.peer == str(n.entry.peer) \
and ne.itf._sw_if_index == n.entry.sw_if_index:
@@ -25,7 +25,7 @@ class VppNhrp(VppObject):
self.nh = nh
def add_vpp_config(self):
- r = self._test.vapi.nhrp_entry_add_del(
+ r = self._test.vapi.teib_entry_add_del(
is_add=1,
entry={
'nh_table_id': self.table_id,
@@ -36,7 +36,7 @@ class VppNhrp(VppObject):
self._test.registry.register(self, self._test.logger)
def remove_vpp_config(self):
- r = self._test.vapi.nhrp_entry_add_del(
+ r = self._test.vapi.teib_entry_add_del(
is_add=0,
entry={
'nh_table_id': self.table_id,
@@ -45,7 +45,7 @@ class VppNhrp(VppObject):
})
def query_vpp_config(self):
- return find_nhrp(self._test, self)
+ return find_teib(self._test, self)
def object_id(self):
- return ("nhrp-%s-%s" % (self.itf, self.peer))
+ return ("teib-%s-%s" % (self.itf, self.peer))