diff options
Diffstat (limited to 'testcases/Controllers')
5 files changed, 40 insertions, 10 deletions
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 7260d78d..b934ca5d 100644 --- a/testcases/Controllers/ODL/custom_tests/neutron/040__delete_ports.robot +++ b/testcases/Controllers/ODL/custom_tests/neutron/040__delete_ports.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Checking Port deleted in OpenStack are deleted also in OpenDaylight -Suite Setup Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH} +Suite Setup Start Suite Suite Teardown Delete All Sessions Library RequestsLibrary Variables ../../../variables/Variables.py @@ -23,7 +23,6 @@ Delete New Port Check Port Deleted [Documentation] Check port deleted in OpenDaylight [Tags] Check port deleted OpenDaylight - Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH} ${resp} get request ODLSession ${ODLREST} Should be Equal As Strings ${resp.status_code} 200 ${ODLResult} To Json ${resp.content} @@ -31,3 +30,14 @@ Check Port Deleted Log ${ODLResult} ${resp} get request ODLSession ${ODLREST}/${PORTID} Should be Equal As Strings ${resp.status_code} 404 + +*** Keywords *** +Check Port Exists + [Arguments] ${portid} + ${resp} get request ODLSession ${ODLREST}/${portid} + 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} + 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 ede9123f..16e396fd 100644 --- a/testcases/Controllers/ODL/custom_tests/neutron/050__delete_subnets.robot +++ b/testcases/Controllers/ODL/custom_tests/neutron/050__delete_subnets.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Checking Subnets deleted in OpenStack are deleted also in OpenDaylight -Suite Setup Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH} +Suite Setup Start Suite Suite Teardown Delete All Sessions Library RequestsLibrary Variables ../../../variables/Variables.py @@ -23,7 +23,6 @@ Delete New subnet Check New subnet deleted [Documentation] Check subnet deleted in OpenDaylight [Tags] Check subnet deleted OpenDaylight - Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH} ${resp} get request ODLSession ${ODLREST} Should be Equal As Strings ${resp.status_code} 200 ${ODLResult} To Json ${resp.content} @@ -31,3 +30,14 @@ Check New subnet deleted Log ${ODLResult} ${resp} get request ODLSession ${ODLREST}/${SUBNETID} Should be Equal As Strings ${resp.status_code} 404 + +*** Keywords *** +Check Subnet Exists + [Arguments] ${subnetid} + ${resp} get request ODLSession ${ODLREST}/${subnetid} + 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} + 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 d917632b..574e1324 100644 --- a/testcases/Controllers/ODL/custom_tests/neutron/060__delete_networks.robot +++ b/testcases/Controllers/ODL/custom_tests/neutron/060__delete_networks.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Checking Network deleted in OpenStack are deleted also in OpenDaylight -Suite Setup Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH} +Suite Setup Start Suite Suite Teardown Delete All Sessions Library RequestsLibrary Variables ../../../variables/Variables.py @@ -23,11 +23,21 @@ Delete Network Check Network deleted [Documentation] Check network deleted in OpenDaylight [Tags] Check Network OpenDaylight - Create Session ODLSession http://${CONTROLLER}:${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} - ${resp} get request ODLSession ${ODLREST}/${NetID} + ${resp} get request ODLSession ${ODLREST}/${NETID} Should be Equal As Strings ${resp.status_code} 404 + +*** Keywords *** +Check Network Exists + [Arguments] ${netid} + ${resp} get request ODLSession ${ODLREST}/${netid} + 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} + Check Network Exists ${NETID} diff --git a/testcases/Controllers/ODL/odlreport2db.py b/testcases/Controllers/ODL/odlreport2db.py index 075de5a8..0c9f341c 100644 --- a/testcases/Controllers/ODL/odlreport2db.py +++ b/testcases/Controllers/ODL/odlreport2db.py @@ -115,7 +115,7 @@ def main(argv): data['description'] = all_data['suite']['@name'] data['version'] = all_data['@generator'] data['test_project'] = "functest" - data['case_name'] = "ODL" + data['case_name'] = "odl" data['pod_name'] = pod data['installer'] = installer @@ -144,7 +144,7 @@ def main(argv): if (tests_failed < 1): status = "PASS" - functest_utils.push_results_to_db("functest", + functest_utils.push_results_to_db(data['test_project'], data['case_name'], None, start_time, diff --git a/testcases/Controllers/ONOS/Teston/onosfunctest.py b/testcases/Controllers/ONOS/Teston/onosfunctest.py index 38935c5d..058114bd 100644 --- a/testcases/Controllers/ONOS/Teston/onosfunctest.py +++ b/testcases/Controllers/ONOS/Teston/onosfunctest.py @@ -192,7 +192,7 @@ def main(): logger.error("Unable to set ONOS criteria") functest_utils.push_results_to_db("functest", - "ONOS", + "onos", logger, start_time, stop_time, |