X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_l2.py;h=b606ff0077a5c47c1a531f945e2f1cc3f0a7d5f1;hb=3593a9174a8e9faddb8d4eb451d1b4632c1e0df1;hp=67fb996848baad3062577f40a50fcae2d5e68b76;hpb=a279d9cf615bd60439085ba103125e6f2fa3b27c;p=vpp.git

diff --git a/test/vpp_l2.py b/test/vpp_l2.py
index 67fb996848b..b606ff0077a 100644
--- a/test/vpp_l2.py
+++ b/test/vpp_l2.py
@@ -51,7 +51,7 @@ def find_bridge_domain_arp_entry(test, bd_id, mac, ip):
     for arp in arps:
         # do IP addr comparison too once .api is fixed...
         if vmac.packed == arp.mac_address and \
-           vip.bytes == arp.ip_address[:n]:
+                vip.bytes == arp.ip_address[:n]:
             return True
     return False
 
@@ -79,25 +79,20 @@ class VppBridgeDomain(VppObject):
         self.arp_term = arp_term
 
     def add_vpp_config(self):
-        self._test.vapi.bridge_domain_add_del(
-            self.bd_id,
-            is_add=1,
-            flood=self.flood,
-            uu_flood=self.uu_flood,
-            forward=self.forward,
-            learn=self.learn,
-            arp_term=self.arp_term)
+        self._test.vapi.bridge_domain_add_del(bd_id=self.bd_id,
+                                              flood=self.flood,
+                                              uu_flood=self.uu_flood,
+                                              forward=self.forward,
+                                              learn=self.learn,
+                                              arp_term=self.arp_term, is_add=1)
         self._test.registry.register(self, self._test.logger)
 
     def remove_vpp_config(self):
-        self._test.vapi.bridge_domain_add_del(self.bd_id, is_add=0)
+        self._test.vapi.bridge_domain_add_del(bd_id=self.bd_id, is_add=0)
 
     def query_vpp_config(self):
         return find_bridge_domain(self._test, self.bd_id)
 
-    def __str__(self):
-        return self.object_id()
-
     def object_id(self):
         return "bridge-domain-%d" % (self.bd_id)
 
@@ -113,27 +108,20 @@ class VppBridgeDomainPort(VppObject):
 
     def add_vpp_config(self):
         self._test.vapi.sw_interface_set_l2_bridge(
-            self.itf.sw_if_index,
-            self.bd.bd_id,
-            port_type=self.port_type,
-            enable=1)
+            rx_sw_if_index=self.itf.sw_if_index, bd_id=self.bd.bd_id,
+            port_type=self.port_type, enable=1)
         self._test.registry.register(self, self._test.logger)
 
     def remove_vpp_config(self):
         self._test.vapi.sw_interface_set_l2_bridge(
-            self.itf.sw_if_index,
-            self.bd.bd_id,
-            port_type=self.port_type,
-            enable=0)
+            rx_sw_if_index=self.itf.sw_if_index, bd_id=self.bd.bd_id,
+            port_type=self.port_type, enable=0)
 
     def query_vpp_config(self):
         return find_bridge_domain_port(self._test,
                                        self.bd.bd_id,
                                        self.itf.sw_if_index)
 
-    def __str__(self):
-        return self.object_id()
-
     def object_id(self):
         return "BD-Port-%s-%s" % (self.bd, self.itf)
 
@@ -147,19 +135,15 @@ class VppBridgeDomainArpEntry(VppObject):
         self.ip = VppIpAddress(ip)
 
     def add_vpp_config(self):
-        self._test.vapi.bd_ip_mac_add_del(
-            self.bd.bd_id,
-            self.mac.packed,
-            self.ip.encode(),
-            is_add=1)
+        self._test.vapi.bd_ip_mac_add_del(bd_id=self.bd.bd_id, is_add=1,
+                                          ip=self.ip.encode(),
+                                          mac=self.mac.packed)
         self._test.registry.register(self, self._test.logger)
 
     def remove_vpp_config(self):
-        self._test.vapi.bd_ip_mac_add_del(
-            self.bd.bd_id,
-            self.mac.packed,
-            self.ip.encode(),
-            is_add=0)
+        self._test.vapi.bd_ip_mac_add_del(bd_id=self.bd.bd_id, is_add=0,
+                                          ip=self.ip.encode(),
+                                          mac=self.mac.packed)
 
     def query_vpp_config(self):
         return find_bridge_domain_arp_entry(self._test,
@@ -167,9 +151,6 @@ class VppBridgeDomainArpEntry(VppObject):
                                             self.mac.packed,
                                             self.ip.address)
 
-    def __str__(self):
-        return self.object_id()
-
     def object_id(self):
         return "BD-Arp-Entry-%s-%s-%s" % (self.bd, self.mac, self.ip.address)
 
@@ -213,8 +194,31 @@ class VppL2FibEntry(VppObject):
                                  self.mac.packed,
                                  self.itf.sw_if_index)
 
-    def __str__(self):
-        return self.object_id()
-
     def object_id(self):
         return "L2-Fib-Entry-%s-%s-%s" % (self.bd, self.mac, self.itf)
+
+
+class VppL2Vtr(VppObject):
+
+    def __init__(self, test, itf, op):
+        self._test = test
+        self.itf = itf
+        self.op = op
+
+    def add_vpp_config(self):
+        self.itf.set_vtr(self.op)
+        self._test.registry.register(self, self._test.logger)
+
+    def remove_vpp_config(self):
+        self.itf.set_vtr(L2_VTR_OP.L2_DISABLED)
+
+    def query_vpp_config(self):
+        ds = self._test.vapi.sw_interface_dump()
+        d = self.itf.get_interface_config_from_dump(ds)
+
+        if d is not None:
+            return (d.vtr_op == self.op)
+        return False
+
+    def object_id(self):
+        return "L2-vtr-%s-%d" % (str(self.itf), self.op)