diff options
| author |   liyin <liyin11@huawei.com> | 2016-12-01 20:35:38 +0800 |
|---|---|---|
| committer | liyin <liyin11@huawei.com> | 2016-12-01 20:57:31 +0800 |
| commit | 344802365d02a5524a4dd1ea743adefdc8e943fb (patch) | |
| tree | 9da52867f88fd882d758597ef318929ca322c893 | |
| parent | 0c8b2ef0c9749dc26d88e302a53ecc06c1258d36 (diff) | |
bug fix patch
JIRA: BOTTLENECK-113
this patch fix a problem that docker can't run
because of lacking pyroute2.
the next is docker-compose file have some error that yardstick can't
pull inluxdb container.
the next is fix some bug incode.
Change-Id: I238b69b456d2810e84bae5c134e6b05a8fc5da63
Signed-off-by: liyin <liyin11@huawei.com>
| -rw-r--r-- | docker/bottleneck-compose/docker-compose.yml | 4 | ||||
| -rw-r--r-- | requirements.txt | 1 | ||||
| -rw-r--r-- | testsuites/posca/testcase_script/common_script.py | 6 | ||||
| -rw-r--r-- | testsuites/posca/testcase_script/posca_factor_system_bandwidth.py | 1 |
4 files changed, 7 insertions, 5 deletions
diff --git a/docker/bottleneck-compose/docker-compose.yml b/docker/bottleneck-compose/docker-compose.yml index 0b256b5b..99ff1f6e 100644 --- a/docker/bottleneck-compose/docker-compose.yml +++ b/docker/bottleneck-compose/docker-compose.yml @@ -18,10 +18,10 @@ yardstick: restart: always build: yardstick/ volumes: - - /var/run/docker/sock:/var/run/docker/sock + - /var/run/docker.sock:/var/run/docker.sock ports: - "8888:5000" bottlenecks: restart: always - build: bottlenecks/
\ No newline at end of file + build: bottlenecks/ diff --git a/requirements.txt b/requirements.txt index e07a0c65..28f7736e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -77,3 +77,4 @@ unicodecsv==0.14.1 unittest2==1.1.0 warlock==1.2.0 wrapt==1.10.6 +pyroute2==0.4.10 diff --git a/testsuites/posca/testcase_script/common_script.py b/testsuites/posca/testcase_script/common_script.py index b9954a7d..063e1f3a 100644 --- a/testsuites/posca/testcase_script/common_script.py +++ b/testsuites/posca/testcase_script/common_script.py @@ -77,7 +77,7 @@ def posca_output_result(file_config, data_reply): def posca_get_reply(con_dic, task_id, time_test=1): reply_url = "http://%s/yardstick/results?action=getResult&task_id=%s\ -&measurement=tc100" % (con_dic["test_ip"], task_id) +&measurement=netperf_bottlenecks" % (con_dic["test_ip"], task_id) time.sleep(float(con_dic["test_time"])) reply_response = requests.get(reply_url) reply_data = json.loads(reply_response.text) @@ -95,7 +95,7 @@ def posca_get_reply(con_dic, task_id, time_test=1): def posca_send_data(con_dic, test_config, file_config): - base_url = "http://%s/yardstick/testcases/release/action" % (con_dic['test_ip']) + base_url = "http://%s/yardstick/testcases/samples/action" % (con_dic['test_ip']) print(con_dic["test_ip"]) test_dict = { "action":"runTestCase", @@ -109,7 +109,7 @@ def posca_send_data(con_dic, test_config, file_config): 'target': 'node4.LF' } }, - "testcase":"tc100" + "testcase":"netperf_bottlenecks" } } reponse = requests.post( diff --git a/testsuites/posca/testcase_script/posca_factor_system_bandwidth.py b/testsuites/posca/testcase_script/posca_factor_system_bandwidth.py index 74bea8ff..f6e66f42 100644 --- a/testsuites/posca/testcase_script/posca_factor_system_bandwidth.py +++ b/testsuites/posca/testcase_script/posca_factor_system_bandwidth.py @@ -129,6 +129,7 @@ def main(): config = ConfigParser.ConfigParser() con_dic = common_script.posca_config_read(testcase_cfg, con_str, config) common_script.posca_create_incluxdb(con_dic) + time.sleep(30) posca_env_check() posca_run(con_dic) endtime = datetime.datetime.now() |