[copp] Adding a parameter - send rate-limit (#3548)

What is the motivation for this PR? PR#3384 changed copp test by introducing send rate-limit pps value, which affects TC. Default is set to 2000 pps. Different server/DUT combination might require different value of this parameter. How did you do it? Added parameter --send_rate_limit to test run command example of use: copp/test_copp.py --send_rate_limit 2500 How did you verify/test it? Run: * copp/test_copp (without parameter) * copp/test_copp --send_rate_limit 2500 All pass Signed-off-by: Vladyslav Morokhovych <vladyslavx.morokhovych@intel.com>
sonic-net · Jun 28, 2021 · 6cc2135 · 6cc2135
1 parent 8c0ae8d
commit 6cc2135
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/ansible/roles/test/files/ptftests/copp_tests.py b/ansible/roles/test/files/ptftests/copp_tests.py
@@ -40,7 +40,6 @@ class ControlPlaneBaseTest(BaseTest):
     DEFAULT_PRE_SEND_INTERVAL_SEC = 1
     DEFAULT_SEND_INTERVAL_SEC = 10
     DEFAULT_RECEIVE_WAIT_TIME = 3
-    DEFAULT_SERVER_SEND_RATE_LIMIT_PPS = 2000
 
     def __init__(self):
         BaseTest.__init__(self)
@@ -55,6 +54,7 @@ def __init__(self):
 
         self.myip = test_params.get('myip', None)
         self.peerip = test_params.get('peerip', None)
+        self.default_server_send_rate_limit_pps = test_params.get('send_rate_limit', 2000)
 
         self.needPreSend = None
 
@@ -136,7 +136,7 @@ def copp_test(self, packet, send_intf, recv_intf):
 
             # Depending on the server/platform combination it is possible for the server to
             # overwhelm the DUT, so we add an artificial delay here to rate-limit the server.
-            time.sleep(1.0 / self.DEFAULT_SERVER_SEND_RATE_LIMIT_PPS)
+            time.sleep(1.0 / float(self.default_server_send_rate_limit_pps))
 
         self.log("Sent out %d packets in %ds" % (send_count, self.DEFAULT_SEND_INTERVAL_SEC))
 

diff --git a/tests/copp/conftest.py b/tests/copp/conftest.py
@@ -13,3 +13,9 @@ def pytest_addoption(parser):
         default=False,
         help="Swap syncd container with syncd-rpc container",
     )
+    parser.addoption(
+        "--send_rate_limit",
+        action="store",
+        default=2000,
+        help="Set custom server send rate limit",
+    )
diff --git a/tests/copp/test_copp.py b/tests/copp/test_copp.py
@@ -15,6 +15,7 @@
     Parameters:
         --copp_swap_syncd: Used to install the RPC syncd image before running the tests. Default
             is disabled.
+        --send_rate_limit: Used to set custom server send rate-limit pps. Default is 2000 pps
 
 """
 
@@ -44,7 +45,8 @@
                                   "myip",
                                   "peerip",
                                   "nn_target_interface",
-                                  "nn_target_namespace"])
+                                  "nn_target_namespace",
+                                  "send_rate_limit"])
 _SUPPORTED_PTF_TOPOS = ["ptf32", "ptf64"]
 _SUPPORTED_T1_TOPOS = ["t1", "t1-lag", "t1-64-lag"]
 _TOR_ONLY_PROTOCOL = ["DHCP"]
@@ -160,7 +162,8 @@ def _copp_runner(dut, ptf, protocol, test_params, dut_type):
     params = {"verbose": False,
               "target_port": test_params.nn_target_port,
               "myip": test_params.myip,
-              "peerip": test_params.peerip}
+              "peerip": test_params.peerip,
+              "send_rate_limit": test_params.send_rate_limit}
 
     dut_ip = dut.mgmt_ip
     device_sockets = ["0-{}@tcp://127.0.0.1:10900".format(test_params.nn_target_port),
@@ -187,6 +190,7 @@ def _gather_test_params(tbinfo, duthost, request):
     """
 
     swap_syncd = request.config.getoption("--copp_swap_syncd")
+    send_rate_limit = request.config.getoption("--send_rate_limit")
     topo = tbinfo["topo"]["name"]
     mg_facts = duthost.get_extended_minigraph_facts(tbinfo)
     port_index_map = {
@@ -215,7 +219,8 @@ def _gather_test_params(tbinfo, duthost, request):
                                myip=myip,
                                peerip = peerip,
                                nn_target_interface=nn_target_interface,
-                               nn_target_namespace=nn_target_namespace)
+                               nn_target_namespace=nn_target_namespace,
+                               send_rate_limit=send_rate_limit)
 
 def _setup_testbed(dut, creds, ptf, test_params, tbinfo):
     """