From ca5f6106bc2a07a960cfa607ad1c35a8d93c69ce Mon Sep 17 00:00:00 2001 From: Morgan Richomme Date: Tue, 26 Jan 2016 15:03:44 +0100 Subject: Patch ODL scenario to support joid (different keystone and neutron API IP) JIRA: FUNCTEST-124 Change-Id: I84834fcb78e652f3b39696f0e17bf54cb5804559 Signed-off-by: Morgan Richomme (cherry picked from commit 1a40722cd446af5416029dc0f3b371a835fa444c) --- testcases/Controllers/ODL/CI/start_tests.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'testcases/Controllers/ODL/CI/start_tests.sh') diff --git a/testcases/Controllers/ODL/CI/start_tests.sh b/testcases/Controllers/ODL/CI/start_tests.sh index 4d600224e..5b45a2e92 100755 --- a/testcases/Controllers/ODL/CI/start_tests.sh +++ b/testcases/Controllers/ODL/CI/start_tests.sh @@ -51,6 +51,7 @@ ODL_PORT=${ODL_PORT:-8081} USR_NAME=${USR_NAME:-'neutron'} PASS=${PASS:-'octopus'} NEUTRON_IP=${NEUTRON_IP:-192.168.0.68} +KEYSTONE_IP=${NEUTRON_IP:-192.168.0.69} set +x init_file=${REPO_DIR}/test/csit/suites/openstack/neutron/__init__.robot @@ -80,7 +81,7 @@ do ((test_num++)) echo -e "${light_green}Starting test: $line ${nc}" - pybot -v OPENSTACK:${NEUTRON_IP} -v PORT:${ODL_PORT} -v CONTROLLER:${ODL_IP} ${REPO_DIR}/$line + pybot -v OPENSTACK:${KEYSTONE_IP} -v NEUTRON:${NEUTRON_IP} -v PORT:${ODL_PORT} -v CONTROLLER:${ODL_IP} ${REPO_DIR}/$line mkdir -p $RESULTS_DIR/logs/${test_num} mv log.html $RESULTS_DIR/logs/${test_num}/ mv report.html $RESULTS_DIR/logs/${test_num}/ -- cgit 1.2.3-korg