summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2016-11-28 16:10:59 +0000
committerEd Warnicke <hagbard@gmail.com>2016-11-28 17:42:32 +0000
commit39f9973f89fe6d44ee3be5d1dd4457d20530d4aa (patch)
tree4f7b789f14716ced745b675870d55fd17e0619f1
parent38fb44f51d73f631df82830b4a09681fb2e41a3c (diff)
GRE Tests update after postinit removal
Change-Id: I33df256ca07c99149465c896c7063a3153021a5a Signed-off-by: Neale Ranns <nranns@cisco.com>
-rw-r--r--test/test_gre.py2
-rw-r--r--test/vpp_gre_interface.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/test/test_gre.py b/test/test_gre.py
index b5a1e346eca..f54b6e01307 100644
--- a/test/test_gre.py
+++ b/test/test_gre.py
@@ -13,7 +13,7 @@ from vpp_papi_provider import L2_VTR_OP
from scapy.packet import Raw
from scapy.layers.l2 import Ether, Dot1Q, ARP, GRE
from scapy.layers.inet import IP, UDP
-from scapy.layers.inet6 import ICMPv6ND_NS, IPv6, UDP
+from scapy.layers.inet6 import ICMPv6ND_NS, ICMPv6ND_RA, IPv6, UDP
from scapy.contrib.mpls import MPLS
from scapy.volatile import RandMAC, RandIP
diff --git a/test/vpp_gre_interface.py b/test/vpp_gre_interface.py
index b6a66332a99..58a68290c60 100644
--- a/test/vpp_gre_interface.py
+++ b/test/vpp_gre_interface.py
@@ -10,6 +10,8 @@ class VppGreInterface(VppInterface):
def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, is_teb=0):
""" Create VPP loopback interface """
+ self._sw_if_index = 0
+ super(VppGreInterface, self).__init__(test)
self._test = test
self.t_src = src_ip
self.t_dst = dst_ip
@@ -23,7 +25,7 @@ class VppGreInterface(VppInterface):
outer_fib_id=self.t_outer_fib,
is_teb=self.t_is_teb)
self._sw_if_index = r.sw_if_index
- self.post_init_setup()
+ self.generate_remote_hosts()
def remove_vpp_config(self):
s = socket.inet_pton(socket.AF_INET, self.t_src)