from scapy.volatile import RandMAC, RandIP
from framework import VppTestCase, VppTestRunner
-from vpp_sub_interface import VppDot1QSubint
+from vpp_sub_interface import L2_VTR_OP, VppDot1QSubint
from vpp_gre_interface import VppGreInterface, VppGre6Interface
from vpp_ip import DpoProto
from vpp_ip_route import VppIpRoute, VppRoutePath, VppIpTable
-from vpp_papi_provider import L2_VTR_OP
from util import ppp, ppc
def setUpClass(cls):
super(TestGRE, cls).setUpClass()
+ @classmethod
+ def tearDownClass(cls):
+ super(TestGRE, cls).tearDownClass()
+
def setUp(self):
super(TestGRE, self).setUp()
#
# Send a packet stream that is routed into the tunnel
- # - they are all dropped since the tunnel's desintation IP
+ # - they are all dropped since the tunnel's destintation IP
# is unresolved - or resolves via the default route - which
# which is a drop.
#
#
# Send a packet stream that is routed into the tunnel
- # - they are all dropped since the tunnel's desintation IP
+ # - they are all dropped since the tunnel's destintation IP
# is unresolved - or resolves via the default route - which
# which is a drop.
#
# Configure both to pop thier respective VLAN tags,
# so that during the x-coonect they will subsequently push
#
- self.vapi.l2_interface_vlan_tag_rewrite(gre_if_12.sw_if_index,
- L2_VTR_OP.L2_POP_1,
- 12)
- self.vapi.l2_interface_vlan_tag_rewrite(gre_if_11.sw_if_index,
- L2_VTR_OP.L2_POP_1,
- 11)
+ self.vapi.l2_interface_vlan_tag_rewrite(
+ sw_if_index=gre_if_12.sw_if_index, vtr_op=L2_VTR_OP.L2_POP_1,
+ push_dot1q=12)
+ self.vapi.l2_interface_vlan_tag_rewrite(
+ sw_if_index=gre_if_11.sw_if_index, vtr_op=L2_VTR_OP.L2_POP_1,
+ push_dot1q=11)
#
# Send traffic in both directiond - expect the VLAN tags to