Revert "API: Cleanup APIs interface.api"

This reverts commit e63325e3ca.

Allow time for CSIT to accommodate.

Change-Id: I59435e4ab5e05e36a2796c3bf44889b5d4823cc2
Signed-off-by: ot@cisco.com
This commit is contained in:
Ole Trøan
2019-03-15 16:14:41 +00:00
parent 3fef8f811a
commit 3b0d7e42f6
31 changed files with 376 additions and 440 deletions

View File

@@ -4,7 +4,6 @@ import six
from vpp_pg_interface import VppPGInterface
from vpp_papi_provider import L2_VTR_OP
from vpp_interface import VppInterface
from vpp_papi import VppEnum
@six.add_metaclass(abc.ABCMeta)
@@ -172,13 +171,10 @@ class VppDot1ADSubint(VppSubInterface):
def __init__(self, test, parent, sub_id, outer_vlan, inner_vlan):
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)
inner_vlan_id=inner_vlan, two_tags=1,
dot1ad=1, exact_match=1)
self.set_sw_if_index(r.sw_if_index)
self._outer_vlan = outer_vlan
self._inner_vlan = inner_vlan