from scapy.layers.l2 import Dot1Q
-from abc import abstractmethod, ABCMeta
+import abc
+import six
from vpp_pg_interface import VppPGInterface
from vpp_papi_provider import L2_VTR_OP
from vpp_interface import VppInterface
+@six.add_metaclass(abc.ABCMeta)
class VppSubInterface(VppPGInterface):
- __metaclass__ = ABCMeta
@property
def parent(self):
super(VppSubInterface, self).set_sw_if_index(sw_if_index)
self.set_vtr(L2_VTR_OP.L2_DISABLED)
- @abstractmethod
+ @abc.abstractmethod
def create_arp_req(self):
pass
- @abstractmethod
+ @abc.abstractmethod
def create_ndp_req(self):
pass
def resolve_ndp(self):
super(VppSubInterface, self).resolve_ndp(self.parent)
- @abstractmethod
+ @abc.abstractmethod
def add_dot1_layer(self, pkt):
pass
self._tag2 = inner
self._push1q = push1q
- self.test.vapi.sw_interface_set_l2_tag_rewrite(
+ self.test.vapi.l2_interface_vlan_tag_rewrite(
self.sw_if_index, vtr, push=self._push1q,
tag1=self._tag1, tag2=self._tag2)
self._vtr = vtr
def __init__(self, test, parent, sub_id, remote_mac):
super(VppP2PSubint, self).__init__(test, parent, sub_id)
- r = test.vapi.create_p2pethernet_subif(parent.sw_if_index,
- remote_mac, sub_id)
+ r = test.vapi.p2p_ethernet_add(parent.sw_if_index,
+ remote_mac, sub_id)
self.set_sw_if_index(r.sw_if_index)
self.parent_sw_if_index = parent.sw_if_index
self.p2p_remote_mac = remote_mac