diff options
author | 2016-06-17 16:54:25 +0200 | |
---|---|---|
committer | 2016-06-17 16:59:00 +0200 | |
commit | 2581c18b1f3625a22f1e7d7ccde70226b5dffb53 (patch) | |
tree | 0f24a321d8cc8b0f2514bbc024d4365497920c0b /testcases/Controllers | |
parent | 7f9fc4eb4d3e5690e82997c8593481c9b090b71e (diff) |
Check resources exist before testing delete
It checks if network, subnet or port exists before calling the delete
operation. It also replaces NetID by NETID to conform robotframework
best practices.
Change-Id: Ie13f41e2b29c0a0cbfba3115dd8189a805fcf056
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'testcases/Controllers')
3 files changed, 37 insertions, 7 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} |