From 2d77ecdfe55a6cd20615fd9e5ddef96fecca20f7 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 2 Jun 2016 14:12:31 +0200 Subject: Replace subnet by port MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It also fixes several upper case letters and formats *delete*.robot Change-Id: I071be39860dd33296a067e4f3d0188d36e9b9660 Signed-off-by: Cédric Ollivier --- .../ODL/custom_tests/neutron/010__networks.robot | 4 +-- .../ODL/custom_tests/neutron/020__subnets.robot | 4 +-- .../ODL/custom_tests/neutron/030__ports.robot | 4 +-- .../custom_tests/neutron/040__delete_ports.robot | 36 ++++++++++---------- .../custom_tests/neutron/050__delete_subnets.robot | 36 ++++++++++---------- .../neutron/060__delete_networks.robot | 38 +++++++++++----------- 6 files changed, 61 insertions(+), 61 deletions(-) diff --git a/testcases/Controllers/ODL/custom_tests/neutron/010__networks.robot b/testcases/Controllers/ODL/custom_tests/neutron/010__networks.robot index 583a6a153..f5633ec50 100644 --- a/testcases/Controllers/ODL/custom_tests/neutron/010__networks.robot +++ b/testcases/Controllers/ODL/custom_tests/neutron/010__networks.robot @@ -26,7 +26,7 @@ Check OpenStack Networks Log ${OSResult} Check OpenDaylight Networks - [Documentation] Checking OpenDaylight Neutron API for Known Networks + [Documentation] Checking OpenDaylight Neutron API for known networks [Tags] Network Neutron OpenDaylight Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH} ${resp} get ODLSession ${ODLREST} @@ -50,7 +50,7 @@ Create Network sleep 2 Check Network - [Documentation] Check Network created in OpenDaylight + [Documentation] Check network created in OpenDaylight [Tags] Check Network OpenDaylight ${resp} get ODLSession ${ODLREST}/${NetID} Should be Equal As Strings ${resp.status_code} 200 diff --git a/testcases/Controllers/ODL/custom_tests/neutron/020__subnets.robot b/testcases/Controllers/ODL/custom_tests/neutron/020__subnets.robot index 5f5b82440..3eb87815b 100644 --- a/testcases/Controllers/ODL/custom_tests/neutron/020__subnets.robot +++ b/testcases/Controllers/ODL/custom_tests/neutron/020__subnets.robot @@ -16,7 +16,7 @@ ${data} {"subnet":{"network_id":"${NETID}","ip_version":4,"cidr":"172. *** Test Cases *** Check OpenStack Subnets - [Documentation] Checking OpenStack Neutron for known Subnets + [Documentation] Checking OpenStack Neutron for known subnets [Tags] Subnets Neutron OpenStack Log ${X-AUTH} ${resp} get OSSession ${OSREST} @@ -26,7 +26,7 @@ Check OpenStack Subnets Log ${OSResult} Check OpenDaylight subnets - [Documentation] Checking OpenDaylight Neutron API for Known Subnets + [Documentation] Checking OpenDaylight Neutron API for known subnets [Tags] Subnets Neutron OpenDaylight Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH} ${resp} get ODLSession ${ODLREST} diff --git a/testcases/Controllers/ODL/custom_tests/neutron/030__ports.robot b/testcases/Controllers/ODL/custom_tests/neutron/030__ports.robot index 8b75733b7..d1796c35a 100644 --- a/testcases/Controllers/ODL/custom_tests/neutron/030__ports.robot +++ b/testcases/Controllers/ODL/custom_tests/neutron/030__ports.robot @@ -26,7 +26,7 @@ Check OpenStack ports Log ${OSResult} Check OpenDaylight ports - [Documentation] Checking OpenDaylight Neutron API for Known Ports + [Documentation] Checking OpenDaylight Neutron API for known ports [Tags] Ports Neutron OpenDaylight Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH} ${resp} get ODLSession ${ODLREST} @@ -50,7 +50,7 @@ Create New Port sleep 2 Check New Port - [Documentation] Check new subnet created in OpenDaylight + [Documentation] Check new port created in OpenDaylight [Tags] Check subnet OpenDaylight ${resp} get ODLSession ${ODLREST}/${PORTID} Should be Equal As Strings ${resp.status_code} 200 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 f10298839..1f632ddad 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 Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections @@ -16,22 +16,22 @@ ${data} {"port":{"network_id":"${NETID}","admin_state_up": true}} *** Test Cases *** Delete New Port - [Documentation] Delete previously created port in OpenStack - [Tags] Delete port OpenStack Neutron - Log ${data} - ${resp} delete OSSession ${OSREST} - Should be Equal As Strings ${resp.status_code} 204 - Log ${resp.content} - sleep 2 + [Documentation] Delete previously created port in OpenStack + [Tags] Delete port OpenStack Neutron + Log ${data} + ${resp} delete OSSession ${OSREST} + Should be Equal As Strings ${resp.status_code} 204 + Log ${resp.content} + sleep 2 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 ODLSession ${ODLREST} - Should be Equal As Strings ${resp.status_code} 200 - ${ODLResult} To Json ${resp.content} - Set Suite Variable ${ODLResult} - Log ${ODLResult} - ${resp} get ODLSession ${ODLREST}/${PORTID} - Should be Equal As Strings ${resp.status_code} 404 + [Documentation] Check port deleted in OpenDaylight + [Tags] Check port deleted OpenDaylight + Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH} + ${resp} get ODLSession ${ODLREST} + Should be Equal As Strings ${resp.status_code} 200 + ${ODLResult} To Json ${resp.content} + Set Suite Variable ${ODLResult} + Log ${ODLResult} + ${resp} get ODLSession ${ODLREST}/${PORTID} + Should be Equal As Strings ${resp.status_code} 404 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 fb619825b..bfe2b9d69 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 Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections @@ -16,22 +16,22 @@ ${data} {"subnet":{"network_id":"${NETID}","ip_version":4,"cidr":"172.16.6 *** Test Cases *** Delete New subnet - [Documentation] Delete previously created subnet in OpenStack - [Tags] Delete Subnet OpenStack Neutron - Log ${data} - ${resp} delete OSSession ${OSREST} - Should be Equal As Strings ${resp.status_code} 204 - Log ${resp.content} - sleep 2 + [Documentation] Delete previously created subnet in OpenStack + [Tags] Delete Subnet OpenStack Neutron + Log ${data} + ${resp} delete OSSession ${OSREST} + Should be Equal As Strings ${resp.status_code} 204 + Log ${resp.content} + sleep 2 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 ODLSession ${ODLREST} - Should be Equal As Strings ${resp.status_code} 200 - ${ODLResult} To Json ${resp.content} - Set Suite Variable ${ODLResult} - Log ${ODLResult} - ${resp} get ODLSession ${ODLREST}/${SUBNETID} - Should be Equal As Strings ${resp.status_code} 404 + [Documentation] Check subnet deleted in OpenDaylight + [Tags] Check subnet deleted OpenDaylight + Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH} + ${resp} get ODLSession ${ODLREST} + Should be Equal As Strings ${resp.status_code} 200 + ${ODLResult} To Json ${resp.content} + Set Suite Variable ${ODLResult} + Log ${ODLResult} + ${resp} get ODLSession ${ODLREST}/${SUBNETID} + Should be Equal As Strings ${resp.status_code} 404 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 528fbfca2..12828e186 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 Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH} Suite Teardown Delete All Sessions Library SSHLibrary Library Collections @@ -12,26 +12,26 @@ Variables ../../../variables/Variables.py *** Variables *** ${ODLREST} /controller/nb/v2/neutron/networks ${OSREST} /v2.0/networks/${NETID} -${postNet} {"network":{"name":"odl_network","admin_state_up":true}} +${postNet} {"network":{"name":"odl_network","admin_state_up":true}} *** Test Cases *** Delete Network - [Documentation] Delete network in OpenStack - [Tags] Delete Network OpenStack Neutron - Log ${postNet} - ${resp} delete OSSession ${OSREST} - Should be Equal As Strings ${resp.status_code} 204 - Log ${resp.content} - sleep 2 + [Documentation] Delete network in OpenStack + [Tags] Delete Network OpenStack Neutron + Log ${postNet} + ${resp} delete OSSession ${OSREST} + Should be Equal As Strings ${resp.status_code} 204 + Log ${resp.content} + sleep 2 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 ODLSession ${ODLREST} - Should be Equal As Strings ${resp.status_code} 200 - ${ODLResult} To Json ${resp.content} - Set Suite Variable ${ODLResult} - Log ${ODLResult} - ${resp} get ODLSession ${ODLREST}/${NetID} - Should be Equal As Strings ${resp.status_code} 404 + [Documentation] Check network deleted in OpenDaylight + [Tags] Check Network OpenDaylight + Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH} + ${resp} get ODLSession ${ODLREST} + Should be Equal As Strings ${resp.status_code} 200 + ${ODLResult} To Json ${resp.content} + Set Suite Variable ${ODLResult} + Log ${ODLResult} + ${resp} get ODLSession ${ODLREST}/${NetID} + Should be Equal As Strings ${resp.status_code} 404 -- cgit 1.2.3-korg