DPB-ACL scale tests (#30)

* DPB-ACL scale tests and code-review comments addressed

* Remove sleeps that were put earlier

Co-authored-by: Vasant <[email protected]>

Author: vasant17

tests/port_dpb.py

@@ -154,7 +154,7 @@ def write_to_config_db(self):
                                           ("speed", speed_str),
                                           ("index", index_str)])
         self._cfg_db_ptbl.set(self.get_name(), fvs)
-        time.sleep(1)
+        time.sleep(2)
 
     def get_fvs_dict(self, fvs):
         fvs_dict = {}
@@ -221,8 +221,6 @@ def breakin(self, dvs, port_names):
             #dvs.runcmd("ip link delete " + cp.get_name())
         #print "Deleted child ports:%s from config DB"%port_names
 
-        time.sleep(6)
-
         for cp in child_ports:
             assert(cp.exists_in_config_db() == False)
         for cp in child_ports:
@@ -235,7 +233,6 @@ def breakin(self, dvs, port_names):
         p.port_merge(child_ports)
         p.write_to_config_db()
         #print "Added port:%s to config DB"%p.get_name()
-        time.sleep(2)
 
         p.verify_config_db()
         #print "Config DB verification passed!"
@@ -254,7 +251,6 @@ def create_child_ports(self, dvs, p, num_child_ports):
             cp.write_to_config_db()
             child_port_names.append(cp.get_name())
         #print "Added child ports:%s to config DB"%child_port_names
-        time.sleep(6)
 
         for cp in child_ports:
             assert(cp.exists_in_config_db() == True)
@@ -279,7 +275,7 @@ def breakout(self, dvs, port_name, num_child_ports):
         # TBD, need vs lib to support hostif removal
         #dvs.runcmd("ip link delete " + p.get_name())
         #print "Deleted port:%s from config DB"%port_name
-        time.sleep(6)
+        time.sleep(2)
 
         # Verify port is deleted from all DBs
         assert(p.exists_in_config_db() == False)

tests/test_port_dpb_acl.py

@@ -8,6 +8,11 @@
 import re
 from port_dpb import DPB
 
+maxPorts = 32
+maxBreakout = 4
+maxRootPorts = maxPorts/maxBreakout
+maxAclTables = 16
+
 @pytest.mark.usefixtures('dpb_setup_fixture')
 class TestPortDPBAcl(object):
 
@@ -116,7 +121,7 @@ def test_one_acl_table_many_ports(self, dvs):
 
         # Breakout Ethernet0
         dpb = DPB()
-        dpb.breakout(dvs, "Ethernet0", 4)
+        dpb.breakout(dvs, "Ethernet0", maxBreakout)
         time.sleep(2)
 
         #Update bind list and verify
@@ -163,7 +168,106 @@ def test_one_acl_table_many_ports(self, dvs):
         time.sleep(2)
         dvs.verify_acl_group_num(0)
 
+    '''
     @pytest.mark.skip()
+    '''
     def test_one_port_many_acl_tables(self, dvs):
-        #TBD
-        return
+        dvs.setup_db()
+
+        # Create 4 ACL tables and bind them to Ethernet0
+        bind_ports = ["Ethernet0"]
+        dvs.create_acl_table("test1", "L3", bind_ports)
+        dvs.create_acl_table("test2", "L3", bind_ports)
+        dvs.create_acl_table("test3", "L3", bind_ports)
+        dvs.create_acl_table("test4", "L3", bind_ports)
+
+        acl_table_ids = dvs.get_acl_table_ids()
+        assert len(acl_table_ids) == 4
+        dvs.verify_acl_group_num(1)
+        acl_group_ids = dvs.get_acl_group_ids()
+        dvs.verify_acl_group_member(acl_group_ids[0], acl_table_ids[0])
+        dvs.verify_acl_group_member(acl_group_ids[0], acl_table_ids[1])
+        dvs.verify_acl_group_member(acl_group_ids[0], acl_table_ids[2])
+        dvs.verify_acl_group_member(acl_group_ids[0], acl_table_ids[3])
+        dvs.verify_acl_port_binding(bind_ports)
+
+        # Update bind list and verify
+        bind_ports = []
+        fvs = swsscommon.FieldValuePairs([("ports", ",".join(bind_ports))])
+        dvs.update_acl_table("test1", fvs)
+        dvs.update_acl_table("test2", fvs)
+        dvs.update_acl_table("test3", fvs)
+        dvs.update_acl_table("test4", fvs)
+        dvs.verify_acl_group_num(0)
+
+        # Breakout Ethernet0
+        dpb = DPB()
+        dpb.breakout(dvs, "Ethernet0", maxBreakout)
+
+        #Breakin Ethernet0, 1, 2, 3
+        dpb.breakin(dvs, ["Ethernet0", "Ethernet1", "Ethernet2", "Ethernet3"])
+
+        dvs.remove_acl_table("test1")
+        dvs.remove_acl_table("test2")
+        dvs.remove_acl_table("test3")
+        dvs.remove_acl_table("test4")
+
+    '''
+    @pytest.mark.skip()
+    '''
+    def test_many_ports_many_acl_tables(self, dvs):
+        dvs.setup_db()
+
+        # Prepare ACL table names
+        aclTableNames = []
+        for i in range(maxAclTables):
+            aclTableNames.append("aclTable" + str(i+1))
+
+        # Prepare all port names
+        portNames = []
+        for i in range(maxPorts):
+            portNames.append("Ethernet" + str(i))
+
+        # Prepare root port names
+        rootPortNames = []
+        for i in range(0, maxPorts, maxBreakout):
+            rootPortNames.append("Ethernet" + str(i))
+
+        # Create ACL tables and bind root ports
+        for aclTable in aclTableNames:
+            dvs.create_acl_table(aclTable, "L3", rootPortNames)
+        dvs.verify_acl_group_num(maxRootPorts)
+
+        # Remove the dependency on all root ports by
+        # unbinding them from all ACL tables.
+        bind_ports = []
+        fvs = swsscommon.FieldValuePairs([("ports", ",".join(bind_ports))])
+        for aclTable in aclTableNames:
+            dvs.update_acl_table(aclTable, fvs)
+        dvs.verify_acl_group_num(0)
+
+        # Breakout all root ports
+        dpb = DPB()
+        for pName in rootPortNames:
+            #print "Breaking out %s"%pName
+            dpb.breakout(dvs, pName, maxBreakout)
+
+        # Add all ports to aclTable1
+        fvs = swsscommon.FieldValuePairs([("ports", ",".join(portNames))])
+        dvs.update_acl_table(aclTableNames[0], fvs)
+        dvs.verify_acl_group_num(maxPorts)
+
+        # Remove all ports from aclTable1
+        bind_ports = []
+        fvs = swsscommon.FieldValuePairs([("ports", ",".join(bind_ports))])
+        dvs.update_acl_table(aclTableNames[0], fvs)
+        dvs.verify_acl_group_num(0)
+
+        # Breakin all ports
+        for i in range(0, maxPorts, maxBreakout):
+            #print "Breaking in %s"%portNames[i:i+maxBreakout]
+            dpb.breakin(dvs, portNames[i:i+maxBreakout])
+
+        for aclTable in aclTableNames:
+            dvs.remove_acl_table(aclTable)
+        dvs.verify_acl_group_num(0)