Increase http timout inMdsalLowLevelPy

[integration/test.git] / csit / libraries / MdsalLowlevelPy.py

diff --git a/csit/libraries/MdsalLowlevelPy.py b/csit/libraries/MdsalLowlevelPy.py
index eda8654df9463e2eaf283dde4b515f81a4bf8733..a75f3eeaf4786e4c18c49de167417566c25d817e 100644 (file)
--- a/csit/libraries/MdsalLowlevelPy.py
+++ b/csit/libraries/MdsalLowlevelPy.py
@@ -53,7 +53,7 @@ def _initiate_rpcs(host_list, prefix_list, url_templ, data_templ, subst_dict):
         subst_dict.update({'ID': '{}{}'.format(subst_dict['ID_PREFIX'], prefix_list[i])})
         url = url_templ.substitute({'HOST': host})
         data = data_templ.substitute(subst_dict)
-        timeout = int(subst_dict['DURATION'])+60
+        timeout = int(subst_dict['DURATION'])+150
         logger.info('url: {}, data: {}, timeout: {}'.format(url, data, timeout))
         t = threading.Thread(target=_send_http_request_thread_impl,
                              args=(resqueue, url, data, timeout))
@@ -64,7 +64,8 @@ def _initiate_rpcs(host_list, prefix_list, url_templ, data_templ, subst_dict):
     _globals.update({'threads': lthreads, 'result_queue': resqueue})
 
 
-def start_write_transactions_on_nodes(host_list, prefix_list, id_prefix, duration, rate, chained_flag=False):
+def start_write_transactions_on_nodes(host_list, prefix_list, id_prefix, duration, rate, chained_flag=False,
+                                      reset_globals=True):
     """Invoke write-transactions rpc on given nodes.
 
     :param host_list: list of ip address of odl nodes
@@ -79,7 +80,12 @@ def start_write_transactions_on_nodes(host_list, prefix_list, id_prefix, duratio
     :type rate: int
     :param chained_flag: specify chained vs. simple transactions
     :type chained_flag: bool
+    :param reset_globals: reset global variable dict
+    :type reset_globals: bool
     """
+    if reset_globals:
+        _globals.clear()
+
     logger.info(
         "Input parameters: host_list:{}, prefix_list:{}, id_prefix:{}, duration:{}, rate:{}, chained_flag:{}".format(
             host_list, prefix_list, id_prefix, duration, rate, chained_flag))
@@ -95,7 +101,7 @@ def start_write_transactions_on_nodes(host_list, prefix_list, id_prefix, duratio
 
 
 def start_produce_transactions_on_nodes(host_list, prefix_list, id_prefix,
-                                        duration, rate, isolated_transactions_flag=True):
+                                        duration, rate, isolated_transactions_flag=False, reset_globals=True):
     """Invoke produce-transactions rpcs on given nodes.
 
     :param host_list: list of ip address of odl nodes
@@ -110,7 +116,12 @@ def start_produce_transactions_on_nodes(host_list, prefix_list, id_prefix,
     :type rate: int
     :param isolated_transactions_flag: isolated transactions flag
     :type isolated_transactions_flag: bool
+    :param reset_globals: reset global variable dict
+    :type reset_globals: bool
     """
+    if reset_globals:
+        _globals.clear()
+
     msg = "host_list:{}, prefix_list:{} ,id_prefix:{}, duration:{}, rate:{}, isolated_transactions:{}".format(
             host_list, prefix_list, id_prefix, duration, rate, isolated_transactions_flag)
     msg = "Input parameters: " + msg