vxlan: vxlan/vxlan.api API cleanup

[vpp.git] / test / vpp_sub_interface.py

diff --git a/test/vpp_sub_interface.py b/test/vpp_sub_interface.py
index 3c726b2..8f422d8 100644 (file)
--- a/test/vpp_sub_interface.py
+++ b/test/vpp_sub_interface.py
@@ -1,12 +1,25 @@
 from scapy.layers.l2 import Dot1Q
-from abc import abstractmethod, ABCMeta
-from vpp_interface import VppInterface
+import abc
+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
+
 
+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
 
+
+@six.add_metaclass(abc.ABCMeta)
 class VppSubInterface(VppPGInterface):
-    __metaclass__ = ABCMeta
 
     @property
     def parent(self):
@@ -42,15 +55,21 @@ class VppSubInterface(VppPGInterface):
         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
 
-    @abstractmethod
+    def resolve_arp(self):
+        super(VppSubInterface, self).resolve_arp(self.parent)
+
+    def resolve_ndp(self):
+        super(VppSubInterface, self).resolve_ndp(self.parent)
+
+    @abc.abstractmethod
     def add_dot1_layer(self, pkt):
         pass
 
@@ -112,8 +131,8 @@ class VppSubInterface(VppPGInterface):
             self._tag2 = inner
             self._push1q = push1q
 
-        self.test.vapi.sw_interface_set_l2_tag_rewrite(
-            self.sw_if_index, vtr, push=self._push1q,
+        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
 
@@ -164,9 +183,13 @@ class VppDot1ADSubint(VppSubInterface):
 
     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)
+        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
@@ -191,8 +214,8 @@ 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)
+        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