vxlan: vxlan/vxlan.api API cleanup

[vpp.git] / test / vpp_devices.py

diff --git a/test/vpp_devices.py b/test/vpp_devices.py
index 2fd0057..7e18eca 100644 (file)
--- a/test/vpp_devices.py
+++ b/test/vpp_devices.py
@@ -1,35 +1,35 @@
 from vpp_interface import VppInterface
 
 
-class VppAFPacketInterface(VppInterface):
+class VppTAPInterface(VppInterface):
 
     @property
-    def host_if_name(self):
-        """Host interface name"""
-        return self._host_if_name
+    def tap_id(self):
+        """TAP id"""
+        return self._tap_id
 
-    def __init__(self, test, host_if_name, mac_addr=None):
+    def __init__(self, test, tap_id=0xffffffff, mac_addr=None):
         self._test = test
-        self._host_if_name = host_if_name
+        self._tap_id = tap_id
         self._mac_addr = mac_addr
 
     def get_vpp_dump(self):
-        dump = self._test.vapi.af_packet_dump()
+        dump = self._test.vapi.sw_interface_tap_v2_dump()
         for entry in dump:
             if entry.sw_if_index == self.sw_if_index:
                 return entry
 
     def add_vpp_config(self):
         use_random_mac = True if self._mac_addr else False
-        reply = self._test.vapi.af_packet_create(
-            host_if_name=self._host_if_name,
-            use_random_hw_addr=use_random_mac,
-            hw_addr=self._mac_addr)
+        reply = self._test.vapi.tap_create_v2(
+            id=self._tap_id,
+            use_random_mac=use_random_mac,
+            mac_address=self._mac_addr)
         self.set_sw_if_index(reply.sw_if_index)
         self._test.registry.register(self, self.test.logger)
 
     def remove_vpp_config(self):
-        self._test.vapi.af_packet_delete(host_if_name=self._host_if_name)
+        self._test.vapi.tap_delete_v2(sw_if_index=self.sw_if_index)
 
     def query_vpp_config(self):
         dump = self.get_vpp_dump()
@@ -38,4 +38,4 @@ class VppAFPacketInterface(VppInterface):
         return False
 
     def object_id(self):
-        return "af_packet-%s" % self._host_if_name
+        return "tap-%s" % self._tap_id