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>
restart: always
build: yardstick/
volumes:
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
ports:
- "8888:5000"
bottlenecks:
restart: always
- build: bottlenecks/
\ No newline at end of file
unittest2==1.1.0
warlock==1.2.0
wrapt==1.10.6
unittest2==1.1.0
warlock==1.2.0
wrapt==1.10.6
def posca_get_reply(con_dic, task_id, time_test=1):
reply_url = "http://%s/yardstick/results?action=getResult&task_id=%s\
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)
time.sleep(float(con_dic["test_time"]))
reply_response = requests.get(reply_url)
reply_data = json.loads(reply_response.text)
def posca_send_data(con_dic, test_config, file_config):
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",
print(con_dic["test_ip"])
test_dict = {
"action":"runTestCase",
'target': 'node4.LF'
}
},
'target': 'node4.LF'
}
},
+ "testcase":"netperf_bottlenecks"
}
}
reponse = requests.post(
}
}
reponse = requests.post(
config = ConfigParser.ConfigParser()
con_dic = common_script.posca_config_read(testcase_cfg, con_str, config)
common_script.posca_create_incluxdb(con_dic)
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()
posca_env_check()
posca_run(con_dic)
endtime = datetime.datetime.now()