From d44ed0fc0cbcb73f68494aee56615bdbe5dc419b Mon Sep 17 00:00:00 2001 From: Yang Yu Date: Wed, 20 Dec 2017 17:03:39 +0800 Subject: bug-fix: fix neutron quota setting JIRA: BOTTLENECK-215 also fix the bug for type error: converted string Change-Id: Ic56b5ab5c49d8fdbcf49ba4571c2286d5f7bc422 Signed-off-by: Yang Yu --- testsuites/posca/testcase_dashboard/posca_stress_ping.py | 2 +- testsuites/posca/testcase_dashboard/posca_vnf_scale_out.py | 2 +- testsuites/posca/testcase_dashboard/system_bandwidth.py | 2 +- testsuites/run_testsuite.py | 2 +- utils/env_prepare/quota_prepare.py | 4 +++- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/testsuites/posca/testcase_dashboard/posca_stress_ping.py b/testsuites/posca/testcase_dashboard/posca_stress_ping.py index 7a5a8fb8..64ce3835 100644 --- a/testsuites/posca/testcase_dashboard/posca_stress_ping.py +++ b/testsuites/posca/testcase_dashboard/posca_stress_ping.py @@ -32,7 +32,7 @@ def dashboard_send_data(runner_config, test_data): doc_type=test_data["testcase"], body=test_data["data_body"]) if res['created'] == "False": - LOG.error("date send to kibana have errors ", test_data["data_body"]) + LOG.error("date send to kibana have errors %s", test_data["data_body"]) def posca_stress_ping(runner_config): diff --git a/testsuites/posca/testcase_dashboard/posca_vnf_scale_out.py b/testsuites/posca/testcase_dashboard/posca_vnf_scale_out.py index 7c894b88..6720b7f0 100755 --- a/testsuites/posca/testcase_dashboard/posca_vnf_scale_out.py +++ b/testsuites/posca/testcase_dashboard/posca_vnf_scale_out.py @@ -31,5 +31,5 @@ def dashboard_send_data(runner_config, test_data): doc_type="vnf_scale_out", body=i) if res['created'] == "False": - LOG.error("date send to kibana have errors ", + LOG.error("date send to kibana have errors %s", test_data["data_body"]) diff --git a/testsuites/posca/testcase_dashboard/system_bandwidth.py b/testsuites/posca/testcase_dashboard/system_bandwidth.py index 4501dee7..5479b670 100755 --- a/testsuites/posca/testcase_dashboard/system_bandwidth.py +++ b/testsuites/posca/testcase_dashboard/system_bandwidth.py @@ -31,7 +31,7 @@ def dashboard_send_data(runner_config, test_data): doc_type=test_data["testcase"], body=test_data["data_body"]) if res['created'] == "False": - LOG.error("date send to kibana have errors ", test_data["data_body"]) + LOG.error("date send to kibana have errors %s", test_data["data_body"]) def dashboard_system_bandwidth(runner_config): diff --git a/testsuites/run_testsuite.py b/testsuites/run_testsuite.py index e7276689..2e82b205 100644 --- a/testsuites/run_testsuite.py +++ b/testsuites/run_testsuite.py @@ -110,7 +110,7 @@ def testsuite_run(test_level, test_name, REPORT="False"): try: posca_testcase_run(tester_parser[0], testcase, config[testcase]) except Exception, e: - LOG.warning('e.message:\t', e.message) + LOG.warning('e.message:\t%s', e.message) stop_date = datetime.datetime.now() LOG.info("End of %s testcase in POSCA testsuite", testcase) criteria = "FAIL" diff --git a/utils/env_prepare/quota_prepare.py b/utils/env_prepare/quota_prepare.py index 24015954..267e70ab 100644 --- a/utils/env_prepare/quota_prepare.py +++ b/utils/env_prepare/quota_prepare.py @@ -22,7 +22,9 @@ neutron_quota = {"subnet": -1, "subnetpool": -1, "router": -1, "port": -1, - "security_group": -1} + "security_group": -1, + "security_group_rule": -1, + "rbac_policy": -1} nova_quota = {"ram": -1, "cores": -1, -- cgit 1.2.3-korg