FIX: Remove PAPI_MAX_API_BULK

- it's not needed anymore as PapiSocketExecutor is used

Change-Id: Ia9fad1d18991821d14e9261d27f7f26fca03c14a
Signed-off-by: Jan Gelety <jgelety@cisco.com>

diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py
index ce48863..d8550ab 100644 (file)
--- a/resources/libraries/python/Constants.py
+++ b/resources/libraries/python/Constants.py
@@ -106,9 +106,6 @@ class Constants(object):
     # Equivalent to ~0 used in vpp code
     BITWISE_NON_ZERO = 0xffffffff
 
     # Equivalent to ~0 used in vpp code
     BITWISE_NON_ZERO = 0xffffffff
 

-    # Maximum number of API calls per PapiExecutor execution
-    PAPI_MAX_API_BULK = 250
-

     # Mapping from NIC name to its bps limit.
     # TODO: Implement logic to lower limits to TG NIC or software. Or PCI.
     NIC_NAME_TO_LIMIT = {
     # Mapping from NIC name to its bps limit.
     # TODO: Implement logic to lower limits to TG NIC or software. Or PCI.
     NIC_NAME_TO_LIMIT = {

diff --git a/resources/libraries/python/IPUtil.py b/resources/libraries/python/IPUtil.py
index f88e234..901d2ed 100644 (file)
--- a/resources/libraries/python/IPUtil.py
+++ b/resources/libraries/python/IPUtil.py
@@ -593,8 +593,6 @@ class IPUtil(object):
                     IPUtil.union_addr(net_addr + i)
                 history = False if 1 < i < kwargs.get('count', 1) else True
                 papi_exec.add(cmd, history=history, **args)
                     IPUtil.union_addr(net_addr + i)
                 history = False if 1 < i < kwargs.get('count', 1) else True
                 papi_exec.add(cmd, history=history, **args)

-                if i > 0 and i % Constants.PAPI_MAX_API_BULK == 0:
-                    papi_exec.get_replies(err_msg)

             papi_exec.get_replies(err_msg)
 
     @staticmethod
             papi_exec.get_replies(err_msg)
 
     @staticmethod

diff --git a/resources/libraries/python/TestConfig.py b/resources/libraries/python/TestConfig.py
index 98e1818..787f27b 100644 (file)
--- a/resources/libraries/python/TestConfig.py
+++ b/resources/libraries/python/TestConfig.py
@@ -188,8 +188,6 @@ class TestConfig(object):
                 papi_exec.add(cmd1, history=history, **args1).\
                     add(cmd2, history=history, **args2).\
                     add(cmd3, history=history, **args3)
                 papi_exec.add(cmd1, history=history, **args1).\
                     add(cmd2, history=history, **args2).\
                     add(cmd3, history=history, **args3)

-                if i > 0 and i % (Constants.PAPI_MAX_API_BULK / 3) == 0:
-                    papi_exec.get_replies(err_msg)

             papi_exec.get_replies()
 
         return vxlan_count
             papi_exec.get_replies()
 
         return vxlan_count


@@ -296,8 +294,6 @@ class TestConfig(object):
                 history = False if 1 < i < vxlan_count else True
                 papi_exec.add(cmd, history=history, **args1). \
                     add(cmd, history=history, **args2)
                 history = False if 1 < i < vxlan_count else True
                 papi_exec.add(cmd, history=history, **args1). \
                     add(cmd, history=history, **args2)

-                if i > 0 and i % (Constants.PAPI_MAX_API_BULK / 2) == 0:
-                    papi_exec.get_replies(err_msg)

                 papi_exec.add(cmd, **args1).add(cmd, **args2)
             papi_exec.get_replies()
 
                 papi_exec.add(cmd, **args1).add(cmd, **args2)
             papi_exec.get_replies()
 


@@ -420,6 +416,4 @@ class TestConfig(object):
                     add(cmd2, history=history, **args2). \
                     add(cmd3, history=history, **args3). \
                     add(cmd3, history=history, **args4)
                     add(cmd2, history=history, **args2). \
                     add(cmd3, history=history, **args3). \
                     add(cmd3, history=history, **args4)

-                if i > 0 and i % (Constants.PAPI_MAX_API_BULK / 4) == 0:
-                    papi_exec.get_replies(err_msg)

             papi_exec.get_replies()
             papi_exec.get_replies()