diff options
Diffstat (limited to 'testcases')
11 files changed, 19 insertions, 28 deletions
diff --git a/testcases/Controllers/ODL/custom_tests/neutron/001__reachability.robot b/testcases/Controllers/ODL/custom_tests/neutron/001__reachability.robot index e9fdfe64..c2714c69 100644 --- a/testcases/Controllers/ODL/custom_tests/neutron/001__reachability.robot +++ b/testcases/Controllers/ODL/custom_tests/neutron/001__reachability.robot @@ -5,7 +5,7 @@ ${SubnetNorthbound} ${NeutronNorthbound}/subnets ${PortNorthbound} ${NeutronNorthbound}/ports *** Settings *** -Suite Setup Create Session ODL http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH} +Suite Setup Create Session ODL http://${ODL_SYSTEM_IP}:${PORT} headers=${HEADERS} auth=${AUTH} Suite Teardown Delete All Sessions Library RequestsLibrary Variables ../../../variables/Variables.py diff --git a/testcases/Controllers/ODL/custom_tests/neutron/010__networks.robot b/testcases/Controllers/ODL/custom_tests/neutron/010__networks.robot index 2341f3dc..de00dd44 100644 --- a/testcases/Controllers/ODL/custom_tests/neutron/010__networks.robot +++ b/testcases/Controllers/ODL/custom_tests/neutron/010__networks.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Checking Network created in OpenStack are pushed to OpenDaylight -Suite Setup Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH} +Suite Setup Create Session OSSession http://${OPENSTACK}:9696 headers=${X-AUTH} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary @@ -19,17 +19,15 @@ Check OpenStack Networks ${resp} get request OSSession ${OSREST} Should be Equal As Strings ${resp.status_code} 200 ${OSResult} To Json ${resp.content} - Set Suite Variable ${OSResult} Log ${OSResult} Check OpenDaylight Networks [Documentation] Checking OpenDaylight Neutron API for known networks [Tags] Network Neutron OpenDaylight - Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH} + Create Session ODLSession http://${ODL_SYSTEM_IP}:${PORT} headers=${HEADERS} auth=${AUTH} ${resp} get request ODLSession ${ODLREST} Should be Equal As Strings ${resp.status_code} 200 ${ODLResult} To Json ${resp.content} - Set Suite Variable ${ODLResult} Log ${ODLResult} Create Network diff --git a/testcases/Controllers/ODL/custom_tests/neutron/020__subnets.robot b/testcases/Controllers/ODL/custom_tests/neutron/020__subnets.robot index 2d093236..fa7c1e67 100644 --- a/testcases/Controllers/ODL/custom_tests/neutron/020__subnets.robot +++ b/testcases/Controllers/ODL/custom_tests/neutron/020__subnets.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Checking Subnets created in OpenStack are pushed to OpenDaylight -Suite Setup Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH} +Suite Setup Create Session OSSession http://${OPENSTACK}:9696 headers=${X-AUTH} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary @@ -19,17 +19,15 @@ Check OpenStack Subnets ${resp} get request OSSession ${OSREST} Should be Equal As Strings ${resp.status_code} 200 ${OSResult} To Json ${resp.content} - Set Suite Variable ${OSResult} Log ${OSResult} Check OpenDaylight subnets [Documentation] Checking OpenDaylight Neutron API for known subnets [Tags] Subnets Neutron OpenDaylight - Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH} + Create Session ODLSession http://${ODL_SYSTEM_IP}:${PORT} headers=${HEADERS} auth=${AUTH} ${resp} get request ODLSession ${ODLREST} Should be Equal As Strings ${resp.status_code} 200 ${ODLResult} To Json ${resp.content} - Set Suite Variable ${ODLResult} Log ${ODLResult} Create New subnet diff --git a/testcases/Controllers/ODL/custom_tests/neutron/030__ports.robot b/testcases/Controllers/ODL/custom_tests/neutron/030__ports.robot index 384f607a..17a46921 100644 --- a/testcases/Controllers/ODL/custom_tests/neutron/030__ports.robot +++ b/testcases/Controllers/ODL/custom_tests/neutron/030__ports.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Checking Port created in OpenStack are pushed to OpenDaylight -Suite Setup Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH} +Suite Setup Create Session OSSession http://${OPENSTACK}:9696 headers=${X-AUTH} Suite Teardown Delete All Sessions Library Collections Library RequestsLibrary @@ -19,17 +19,15 @@ Check OpenStack ports ${resp} get request OSSession ${OSREST} Should be Equal As Strings ${resp.status_code} 200 ${OSResult} To Json ${resp.content} - Set Suite Variable ${OSResult} Log ${OSResult} Check OpenDaylight ports [Documentation] Checking OpenDaylight Neutron API for known ports [Tags] Ports Neutron OpenDaylight - Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH} + Create Session ODLSession http://${ODL_SYSTEM_IP}:${PORT} headers=${HEADERS} auth=${AUTH} ${resp} get request ODLSession ${ODLREST} Should be Equal As Strings ${resp.status_code} 200 ${ODLResult} To Json ${resp.content} - Set Suite Variable ${ODLResult} Log ${ODLResult} Create New Port diff --git a/testcases/Controllers/ODL/custom_tests/neutron/040__delete_ports.robot b/testcases/Controllers/ODL/custom_tests/neutron/040__delete_ports.robot index b934ca5d..7cdd9e9c 100644 --- a/testcases/Controllers/ODL/custom_tests/neutron/040__delete_ports.robot +++ b/testcases/Controllers/ODL/custom_tests/neutron/040__delete_ports.robot @@ -26,7 +26,6 @@ Check Port Deleted ${resp} get request ODLSession ${ODLREST} Should be Equal As Strings ${resp.status_code} 200 ${ODLResult} To Json ${resp.content} - Set Suite Variable ${ODLResult} Log ${ODLResult} ${resp} get request ODLSession ${ODLREST}/${PORTID} Should be Equal As Strings ${resp.status_code} 404 @@ -38,6 +37,6 @@ Check Port Exists Should be Equal As Strings ${resp.status_code} 200 Start Suite - Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH} - Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH} + Create Session OSSession http://${OPENSTACK}:9696 headers=${X-AUTH} + Create Session ODLSession http://${ODL_SYSTEM_IP}:${PORT} headers=${HEADERS} auth=${AUTH} Check Port Exists ${PORTID} diff --git a/testcases/Controllers/ODL/custom_tests/neutron/050__delete_subnets.robot b/testcases/Controllers/ODL/custom_tests/neutron/050__delete_subnets.robot index 16e396fd..233030df 100644 --- a/testcases/Controllers/ODL/custom_tests/neutron/050__delete_subnets.robot +++ b/testcases/Controllers/ODL/custom_tests/neutron/050__delete_subnets.robot @@ -26,7 +26,6 @@ Check New subnet deleted ${resp} get request ODLSession ${ODLREST} Should be Equal As Strings ${resp.status_code} 200 ${ODLResult} To Json ${resp.content} - Set Suite Variable ${ODLResult} Log ${ODLResult} ${resp} get request ODLSession ${ODLREST}/${SUBNETID} Should be Equal As Strings ${resp.status_code} 404 @@ -38,6 +37,6 @@ Check Subnet Exists Should be Equal As Strings ${resp.status_code} 200 Start Suite - Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH} - Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH} + Create Session OSSession http://${OPENSTACK}:9696 headers=${X-AUTH} + Create Session ODLSession http://${ODL_SYSTEM_IP}:${PORT} headers=${HEADERS} auth=${AUTH} Check Subnet Exists ${SUBNETID} diff --git a/testcases/Controllers/ODL/custom_tests/neutron/060__delete_networks.robot b/testcases/Controllers/ODL/custom_tests/neutron/060__delete_networks.robot index 574e1324..11620690 100644 --- a/testcases/Controllers/ODL/custom_tests/neutron/060__delete_networks.robot +++ b/testcases/Controllers/ODL/custom_tests/neutron/060__delete_networks.robot @@ -26,7 +26,6 @@ Check Network deleted ${resp} get request ODLSession ${ODLREST} Should be Equal As Strings ${resp.status_code} 200 ${ODLResult} To Json ${resp.content} - Set Suite Variable ${ODLResult} Log ${ODLResult} ${resp} get request ODLSession ${ODLREST}/${NETID} Should be Equal As Strings ${resp.status_code} 404 @@ -38,6 +37,6 @@ Check Network Exists Should be Equal As Strings ${resp.status_code} 200 Start Suite - Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH} - Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH} + Create Session OSSession http://${OPENSTACK}:9696 headers=${X-AUTH} + Create Session ODLSession http://${ODL_SYSTEM_IP}:${PORT} headers=${HEADERS} auth=${AUTH} Check Network Exists ${NETID} diff --git a/testcases/Controllers/ODL/start_tests.sh b/testcases/Controllers/ODL/start_tests.sh index 7f5f121b..8e655cfc 100755 --- a/testcases/Controllers/ODL/start_tests.sh +++ b/testcases/Controllers/ODL/start_tests.sh @@ -81,7 +81,7 @@ do ((test_num++)) echo -e "${light_green}Starting test: $line ${nc}" - pybot -v OPENSTACK:${KEYSTONE_IP} -v NEUTRON:${NEUTRON_IP} -v PORT:${ODL_PORT} -v CONTROLLER:${ODL_IP} ${REPO_DIR}/$line + pybot -v OPENSTACK:${NEUTRON_IP} -v PORT:${ODL_PORT} -v ODL_SYSTEM_IP:${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}/ diff --git a/testcases/OpenStack/healthcheck/healthcheck.sh b/testcases/OpenStack/healthcheck/healthcheck.sh index d9a83a2a..9fe17565 100755 --- a/testcases/OpenStack/healthcheck/healthcheck.sh +++ b/testcases/OpenStack/healthcheck/healthcheck.sh @@ -160,7 +160,7 @@ debug "subnet '${subnet_1}' created." neutron subnet-create --name ${subnet_2} --allocation-pool start=10.7.0.2,end=10.7.0.253 --gateway 10.7.0.254 ${net_2} 10.7.0.0/24 debug "subnet '${subnet_2}' created." -info "4. Create Routers..." +info "3. Create Routers..." neutron router-create ${router_1} debug "router '${router_1}' created." neutron router-create ${router_2} diff --git a/testcases/OpenStack/rally/run_rally-cert.py b/testcases/OpenStack/rally/run_rally-cert.py index 8afbccaa..78393224 100755 --- a/testcases/OpenStack/rally/run_rally-cert.py +++ b/testcases/OpenStack/rally/run_rally-cert.py @@ -355,10 +355,10 @@ def run_task(test_name): json_data = json.load(json_file) """ parse JSON operation result """ - status = "failed" + status = "FAIL" if task_succeed(json_results): logger.info('Test scenario: "{}" OK.'.format(test_name) + "\n") - status = "passed" + status = "PASS" else: logger.info('Test scenario: "{}" Failed.'.format(test_name) + "\n") diff --git a/testcases/OpenStack/vPing/vPing_userdata.py b/testcases/OpenStack/vPing/vPing_userdata.py index ff7158ee..cdc41194 100644 --- a/testcases/OpenStack/vPing/vPing_userdata.py +++ b/testcases/OpenStack/vPing/vPing_userdata.py @@ -347,10 +347,10 @@ def main(): logger.debug("Pinging %s. Waiting for response..." % test_ip) sec += 1 - test_status = "NOK" + test_status = "FAIL" if EXIT_CODE == 0: logger.info("vPing OK") - test_status = "OK" + test_status = "PASS" elif EXIT_CODE == -2: duration = 0 logger.info("Userdata is not supported in nova boot. Aborting test...") |