diff options
| author |   Klement Sekera <ksekera@cisco.com> | 2018-06-22 13:54:07 +0200 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2018-06-22 16:20:47 +0000 |
| commit | d5c60b96a3fd93916fc4af5c8d6d25625c28242e (patch) | |
| tree | 78f5b5c614d6a3496e7acd995a42278c6f79d92a /test/vpp_sub_interface.py | |
| parent | 3e2d57d8773e1d03577048f497dc7ed567fd9344 (diff) | |
make test: fix broken interfaces
Change-Id: I2e092774f81503e04b53cc6c6b5d357fe3fc52ab
Signed-off-by: Klement Sekera <ksekera@cisco.com>
Diffstat (limited to 'test/vpp_sub_interface.py')
| -rw-r--r-- | test/vpp_sub_interface.py | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/test/vpp_sub_interface.py b/test/vpp_sub_interface.py index 38d24041e81..3c726b29d3f 100644 --- a/test/vpp_sub_interface.py +++ b/test/vpp_sub_interface.py @@ -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 @@ -47,18 +50,12 @@ class VppSubInterface(VppPGInterface): def create_ndp_req(self): pass - def resolve_arp(self): - super(VppSubInterface, self).resolve_arp(self.parent) - - def resolve_ndp(self): - super(VppSubInterface, self).resolve_ndp(self.parent) - @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 @@ -129,12 +126,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 +163,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 +190,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 |