X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_sub_interface.py;h=b896a6efbe3a7f6c6f1ceb795d5fc1cd97bb407d;hb=0e8ec6468bf77c699210216a4952cd27e1b45166;hp=cabee88deb6e05189246cce6b81f91de1c3493fc;hpb=15ac81c16fba83033090299413a3a2dbb848a0f9;p=vpp.git diff --git a/test/vpp_sub_interface.py b/test/vpp_sub_interface.py index cabee88deb6..b896a6efbe3 100644 --- a/test/vpp_sub_interface.py +++ b/test/vpp_sub_interface.py @@ -1,13 +1,23 @@ from scapy.layers.l2 import Dot1Q -from abc import abstractmethod, ABCMeta -from vpp_interface import VppInterface +import abc from vpp_pg_interface import VppPGInterface -from vpp_papi_provider import L2_VTR_OP +from vpp_interface import VppInterface +from vpp_papi import VppEnum -class VppSubInterface(VppPGInterface): - __metaclass__ = ABCMeta +class L2_VTR_OP: + L2_DISABLED = 0 + L2_PUSH_1 = 1 + L2_PUSH_2 = 2 + L2_POP_1 = 3 + L2_POP_2 = 4 + L2_TRANSLATE_1_1 = 5 + L2_TRANSLATE_1_2 = 6 + L2_TRANSLATE_2_1 = 7 + L2_TRANSLATE_2_2 = 8 + +class VppSubInterface(VppPGInterface, metaclass=abc.ABCMeta): @property def parent(self): """Parent interface for this sub-interface""" @@ -35,16 +45,19 @@ class VppSubInterface(VppPGInterface): self._parent = parent self._parent.add_sub_if(self) self._sub_id = sub_id - self.set_vtr(L2_VTR_OP.L2_DISABLED) self.DOT1AD_TYPE = 0x88A8 self.DOT1Q_TYPE = 0x8100 - @abstractmethod + def set_sw_if_index(self, sw_if_index): + super(VppSubInterface, self).set_sw_if_index(sw_if_index) + self.set_vtr(L2_VTR_OP.L2_DISABLED) + + @abc.abstractmethod def create_arp_req(self): pass - @abstractmethod - def create_ndp_req(self): + @abc.abstractmethod + def create_ndp_req(self, addr=None): pass def resolve_arp(self): @@ -53,12 +66,12 @@ class VppSubInterface(VppPGInterface): def resolve_ndp(self): super(VppSubInterface, self).resolve_ndp(self.parent) - @abstractmethod + @abc.abstractmethod def add_dot1_layer(self, pkt): pass def remove_vpp_config(self): - self.test.vapi.delete_subif(self._sw_if_index) + self.test.vapi.delete_subif(self.sw_if_index) def _add_tag(self, packet, vlan, tag_type): payload = packet.payload @@ -103,45 +116,52 @@ class VppSubInterface(VppPGInterface): self._tag2 = 0 self._push1q = 0 - if (vtr == L2_VTR_OP.L2_PUSH_1 or - vtr == L2_VTR_OP.L2_TRANSLATE_1_1 or - vtr == L2_VTR_OP.L2_TRANSLATE_2_1): + if ( + vtr == L2_VTR_OP.L2_PUSH_1 + or vtr == L2_VTR_OP.L2_TRANSLATE_1_1 + or vtr == L2_VTR_OP.L2_TRANSLATE_2_1 + ): self._tag1 = tag self._push1q = push1q - if (vtr == L2_VTR_OP.L2_PUSH_2 or - vtr == L2_VTR_OP.L2_TRANSLATE_1_2 or - vtr == L2_VTR_OP.L2_TRANSLATE_2_2): + if ( + vtr == L2_VTR_OP.L2_PUSH_2 + or vtr == L2_VTR_OP.L2_TRANSLATE_1_2 + or vtr == L2_VTR_OP.L2_TRANSLATE_2_2 + ): self._tag1 = outer self._tag2 = inner self._push1q = push1q - self.test.vapi.sw_interface_set_l2_tag_rewrite( - self.sw_if_index, vtr, push=self._push1q, - tag1=self._tag1, tag2=self._tag2) + self.test.vapi.l2_interface_vlan_tag_rewrite( + sw_if_index=self.sw_if_index, + vtr_op=vtr, + push_dot1q=self._push1q, + tag1=self._tag1, + tag2=self._tag2, + ) self._vtr = vtr class VppDot1QSubint(VppSubInterface): - @property def vlan(self): """VLAN tag""" return self._vlan def __init__(self, test, parent, sub_id, vlan=None): + super(VppDot1QSubint, self).__init__(test, parent, sub_id) if vlan is None: vlan = sub_id self._vlan = vlan r = test.vapi.create_vlan_subif(parent.sw_if_index, vlan) - self._sw_if_index = r.sw_if_index - super(VppDot1QSubint, self).__init__(test, parent, sub_id) + self.set_sw_if_index(r.sw_if_index) def create_arp_req(self): packet = VppPGInterface.create_arp_req(self) return self.add_dot1_layer(packet) - def create_ndp_req(self): - packet = VppPGInterface.create_ndp_req(self) + def create_ndp_req(self, addr=None): + packet = VppPGInterface.create_ndp_req(self, addr) return self.add_dot1_layer(packet) # called before sending packet @@ -154,7 +174,6 @@ class VppDot1QSubint(VppSubInterface): class VppDot1ADSubint(VppSubInterface): - @property def outer_vlan(self): """Outer VLAN tag""" @@ -166,37 +185,45 @@ class VppDot1ADSubint(VppSubInterface): return self._inner_vlan def __init__(self, test, parent, sub_id, outer_vlan, inner_vlan): - r = test.vapi.create_subif(parent.sw_if_index, sub_id, outer_vlan, - inner_vlan, dot1ad=1, two_tags=1, - exact_match=1) - self._sw_if_index = r.sw_if_index + super(VppDot1ADSubint, self).__init__(test, parent, sub_id) + flags = ( + VppEnum.vl_api_sub_if_flags_t.SUB_IF_API_FLAG_DOT1AD + | VppEnum.vl_api_sub_if_flags_t.SUB_IF_API_FLAG_TWO_TAGS + | VppEnum.vl_api_sub_if_flags_t.SUB_IF_API_FLAG_EXACT_MATCH + ) + r = test.vapi.create_subif( + sw_if_index=parent.sw_if_index, + sub_id=sub_id, + outer_vlan_id=outer_vlan, + inner_vlan_id=inner_vlan, + sub_if_flags=flags, + ) + self.set_sw_if_index(r.sw_if_index) self._outer_vlan = outer_vlan self._inner_vlan = inner_vlan - super(VppDot1ADSubint, self).__init__(test, parent, sub_id) def create_arp_req(self): packet = VppPGInterface.create_arp_req(self) return self.add_dot1_layer(packet) - def create_ndp_req(self): - packet = VppPGInterface.create_ndp_req(self) + def create_ndp_req(self, addr=None): + packet = VppPGInterface.create_ndp_req(self, addr) return self.add_dot1_layer(packet) def add_dot1_layer(self, packet): return self.add_dot1ad_layer(packet, self.outer_vlan, self.inner_vlan) def remove_dot1_layer(self, packet): - return self.remove_dot1ad_layer(packet, self.outer_vlan, - self.inner_vlan) + return self.remove_dot1ad_layer(packet, self.outer_vlan, self.inner_vlan) class VppP2PSubint(VppSubInterface): - def __init__(self, test, parent, sub_id, remote_mac): - r = test.vapi.create_p2pethernet_subif(parent.sw_if_index, - remote_mac, sub_id) - self._sw_if_index = r.sw_if_index super(VppP2PSubint, self).__init__(test, parent, 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 def add_dot1_layer(self, packet): return packet @@ -208,6 +235,6 @@ class VppP2PSubint(VppSubInterface): packet = VppPGInterface.create_arp_req(self) return packet - def create_ndp_req(self): - packet = VppPGInterface.create_ndp_req(self) + def create_ndp_req(self, addr=None): + packet = VppPGInterface.create_ndp_req(self, addr) return packet