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
self.pg_start()
# no tunnel created, gre-input not registered
err = self.statistics.get_counter(
- '/err/ip4-input/unknown ip protocol')[0]
+ '/err/ip4-local/unknown ip protocol')[0]
self.assertEqual(err, 1)
err_count = err
self.pg_start()
# tunnel created, gre-input registered
err = self.statistics.get_counter(
- '/err/ip4-input/unknown ip protocol')[0]
+ '/err/ip4-local/unknown ip protocol')[0]
# expect no new errors
self.assertEqual(err, err_count)
#
# 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
#
# 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,
#
# 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
#
# 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,