X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_l2.py;h=90de91695f2e60dd0f24fffa42c7b8eb8964eb8d;hb=875158acd64244eeae431578e3b5a086d5e1f1c2;hp=72f14dcfa3c9e5920640733b7ebc887ca337e195;hpb=9a475373ed9b1ff9952acc06353ddaa50c2c96bd;p=vpp.git

diff --git a/test/vpp_l2.py b/test/vpp_l2.py
index 72f14dcfa3c..90de91695f2 100644
--- a/test/vpp_l2.py
+++ b/test/vpp_l2.py
@@ -7,6 +7,7 @@ from vpp_object import VppObject
 from vpp_ip import VppIpAddress
 from vpp_lo_interface import VppLoInterface
 from vpp_papi import MACAddress
+from vpp_sub_interface import L2_VTR_OP
 
 
 class L2_PORT_TYPE:
@@ -22,6 +23,7 @@ class BRIDGE_FLAGS:
     FLOOD = 4
     UU_FLOOD = 8
     ARP_TERM = 16
+    ARP_UFWD = 32
 
 
 def find_bridge_domain(test, bd_id):
@@ -69,7 +71,7 @@ class VppBridgeDomain(VppObject):
 
     def __init__(self, test, bd_id,
                  flood=1, uu_flood=1, forward=1,
-                 learn=1, arp_term=1):
+                 learn=1, arp_term=1, arp_ufwd=0):
         self._test = test
         self.bd_id = bd_id
         self.flood = flood
@@ -77,27 +79,25 @@ class VppBridgeDomain(VppObject):
         self.forward = forward
         self.learn = learn
         self.arp_term = arp_term
+        self.arp_ufwd = arp_ufwd
 
     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,
+                                              arp_ufwd=self.arp_ufwd,
+                                              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 +113,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)
 
@@ -163,9 +156,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)
 
@@ -209,8 +199,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)