X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_sub_interface.py;h=255cfffd827a46a481830562aae37055a9b9e5a1;hb=13a08cc;hp=38d24041e81f06d72d04a8eb2f6684b7c3c3fb26;hpb=c8efa29b6f9a91381897b54f1147daf922ed7164;p=vpp.git

diff --git a/test/vpp_sub_interface.py b/test/vpp_sub_interface.py
index 38d24041e81..255cfffd827 100644
--- a/test/vpp_sub_interface.py
+++ b/test/vpp_sub_interface.py
@@ -1,8 +1,8 @@
 from scapy.layers.l2 import Dot1Q
 from abc import abstractmethod, ABCMeta
-from vpp_interface import VppInterface
 from vpp_pg_interface import VppPGInterface
 from vpp_papi_provider import L2_VTR_OP
+from vpp_interface import VppInterface
 
 
 class VppSubInterface(VppPGInterface):
@@ -35,10 +35,13 @@ 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
 
+    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)
+
     @abstractmethod
     def create_arp_req(self):
         pass
@@ -58,7 +61,7 @@ class VppSubInterface(VppPGInterface):
         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
@@ -129,12 +132,12 @@ class VppDot1QSubint(VppSubInterface):
         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)
@@ -166,13 +169,13 @@ class VppDot1ADSubint(VppSubInterface):
         return self._inner_vlan
 
     def __init__(self, test, parent, sub_id, outer_vlan, inner_vlan):
+        super(VppDot1ADSubint, self).__init__(test, parent, sub_id)
         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
+        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)
@@ -193,12 +196,12 @@ class VppDot1ADSubint(VppSubInterface):
 class VppP2PSubint(VppSubInterface):
 
     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)
-        self._sw_if_index = r.sw_if_index
+        self.set_sw_if_index(r.sw_if_index)
         self.parent_sw_if_index = parent.sw_if_index
         self.p2p_remote_mac = remote_mac
-        super(VppP2PSubint, self).__init__(test, parent, sub_id)
 
     def add_dot1_layer(self, packet):
         return packet