X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=testsuites%2Fposca%2Ftestcase_script%2Fposca_factor_system_bandwidth.py;h=7a0fd27b2ed9d6454097ef26dc039a9e429a378a;hb=refs%2Fchanges%2F19%2F26219%2F3;hp=74bea8ff322ec8095d7bc043b75d018cab3ef2a0;hpb=4d0b88875e3717e8c8db79cc8027f2fafdeddac8;p=bottlenecks.git

diff --git a/testsuites/posca/testcase_script/posca_factor_system_bandwidth.py b/testsuites/posca/testcase_script/posca_factor_system_bandwidth.py
index 74bea8ff..7a0fd27b 100644
--- a/testsuites/posca/testcase_script/posca_factor_system_bandwidth.py
+++ b/testsuites/posca/testcase_script/posca_factor_system_bandwidth.py
@@ -48,7 +48,7 @@ def posca_env_check():
 
 def system_pkt_bandwidth(test_id, data, file_config, con_dic):
     date_id = test_id
-    print("package test is is begin from %d" % test_id)
+    print("test is is begin from %d" % test_id)
     cur_role_result = 1
     pre_role_result = 1
     pre_reply = {}
@@ -60,24 +60,24 @@ def system_pkt_bandwidth(test_id, data, file_config, con_dic):
         bandwidth_tmp = 1
         for test_y in data["rx_pkt_sizes"]:
             test_config = {
-                        "tx_msg_size": float(test_x),
-                        "rx_msg_size": float(test_y),
-                    }
+                "tx_msg_size": float(test_x),
+                "rx_msg_size": float(test_y),
+            }
             date_id = date_id + 1
             file_config["test_id"] = date_id
             data_reply = common_script.posca_send_data(
-                   con_dic, test_config, file_config)
+                con_dic, test_config, file_config)
             bandwidth = data_reply["throughput"]
             if (data_max["throughput"] < bandwidth):
                 data_max = data_reply
-            if (abs(bandwidth_tmp - bandwidth)/bandwidth_tmp < 0.025):
+            if (abs(bandwidth_tmp - bandwidth) / bandwidth_tmp < 0.025):
                 print(pre_reply)
                 break
             else:
                 pre_reply = data_reply
                 bandwidth_tmp = bandwidth
         cur_role_result = pre_reply["throughput"]
-        if (abs(pre_role_result - cur_role_result)/pre_role_result < 0.025):
+        if (abs(pre_role_result - cur_role_result) / pre_role_result < 0.025):
             print("date_id is %d,package return at line 111\n" % date_id)
             # return data_return
         if data_return["throughput"] < data_max["throughput"]:
@@ -107,8 +107,8 @@ test_result/factor_system_system_bandwidth_%s.json" % (time_new)
     print("######find system bandwidth######")
     print("rx_msg_size:%d  tx_msg_size:%d\n" %
           (pkt_reply["rx_msg_size"], pkt_reply["tx_msg_size"]))
-    date_tran = common_script.posca_tran_data(
-                            con_dic['ES_ip'], file_config["file_path"])
+    common_script.posca_tran_data(
+        con_dic['ES_ip'], file_config["file_path"])
     return True
 
 
@@ -121,27 +121,26 @@ def main():
         testcase_cfg = args.conf
 
     con_str = [
-            'test_ip', 'tool', 'test_time', 'protocol',
-            'tx_pkt_sizes', 'rx_pkt_sizes', 'cpu_load',
-            'latency', 'ES_ip', 'dashboard'
+        'test_ip', 'tool', 'test_time', 'protocol',
+        'tx_pkt_sizes', 'rx_pkt_sizes', 'cpu_load',
+        'latency', 'ES_ip', 'dashboard'
     ]
+    posca_env_check()
     starttime = datetime.datetime.now()
     config = ConfigParser.ConfigParser()
     con_dic = common_script.posca_config_read(testcase_cfg, con_str, config)
     common_script.posca_create_incluxdb(con_dic)
-    posca_env_check()
     posca_run(con_dic)
     endtime = datetime.datetime.now()
     if con_dic["dashboard"] == "y":
         cmd = '/home/opnfv/bottlenecks/testsuites/posca/testcase_dashboard/\
 system_bandwidth.py'
         pargs = [INTERPRETER, cmd]
-        print("Begin to establish dashboard, False means already exist.\n")
+        print("\nBegin to establish dashboard.")
         sub_result = subprocess.Popen(pargs)
         sub_result.wait()
-    print("System Bandwidth testing time : %s" %(endtime - starttime))
+    print("System Bandwidth testing time : %s" % (endtime - starttime))
     time.sleep(5)
 
 if __name__ == '__main__':
     main()
-