From fc4e91028d7d90d5ecd1f7a0169dd7d8860ab79b Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Wed, 15 Jun 2016 17:15:28 +0200 Subject: Replace deprecated keywords MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It replaces get by get request, post by post request and delete by delete request. Change-Id: I6bfa6d8d53a1ec54416e3b8b2678e01f54bf7811 Signed-off-by: Cédric Ollivier --- .../Controllers/ODL/custom_tests/neutron/010__networks.robot | 8 ++++---- testcases/Controllers/ODL/custom_tests/neutron/020__subnets.robot | 8 ++++---- testcases/Controllers/ODL/custom_tests/neutron/030__ports.robot | 8 ++++---- .../Controllers/ODL/custom_tests/neutron/040__delete_ports.robot | 6 +++--- .../ODL/custom_tests/neutron/050__delete_subnets.robot | 6 +++--- .../ODL/custom_tests/neutron/060__delete_networks.robot | 6 +++--- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/testcases/Controllers/ODL/custom_tests/neutron/010__networks.robot b/testcases/Controllers/ODL/custom_tests/neutron/010__networks.robot index 59d5adcd1..2341f3dcf 100644 --- a/testcases/Controllers/ODL/custom_tests/neutron/010__networks.robot +++ b/testcases/Controllers/ODL/custom_tests/neutron/010__networks.robot @@ -16,7 +16,7 @@ Check OpenStack Networks [Documentation] Checking OpenStack Neutron for known networks [Tags] Network Neutron OpenStack Log ${X-AUTH} - ${resp} get OSSession ${OSREST} + ${resp} get request OSSession ${OSREST} Should be Equal As Strings ${resp.status_code} 200 ${OSResult} To Json ${resp.content} Set Suite Variable ${OSResult} @@ -26,7 +26,7 @@ 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} - ${resp} get ODLSession ${ODLREST} + ${resp} get request ODLSession ${ODLREST} Should be Equal As Strings ${resp.status_code} 200 ${ODLResult} To Json ${resp.content} Set Suite Variable ${ODLResult} @@ -36,7 +36,7 @@ Create Network [Documentation] Create new network in OpenStack [Tags] Create Network OpenStack Neutron Log ${postNet} - ${resp} post OSSession ${OSREST} data=${postNet} + ${resp} post request OSSession ${OSREST} data=${postNet} Should be Equal As Strings ${resp.status_code} 201 ${result} To JSON ${resp.content} ${result} Get From Dictionary ${result} network @@ -49,5 +49,5 @@ Create Network Check Network [Documentation] Check network created in OpenDaylight [Tags] Check Network OpenDaylight - ${resp} get ODLSession ${ODLREST}/${NetID} + ${resp} get request 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 54892b0f2..2d0932366 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 @@ Check OpenStack Subnets [Documentation] Checking OpenStack Neutron for known subnets [Tags] Subnets Neutron OpenStack Log ${X-AUTH} - ${resp} get OSSession ${OSREST} + ${resp} get request OSSession ${OSREST} Should be Equal As Strings ${resp.status_code} 200 ${OSResult} To Json ${resp.content} Set Suite Variable ${OSResult} @@ -26,7 +26,7 @@ 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} - ${resp} get ODLSession ${ODLREST} + ${resp} get request ODLSession ${ODLREST} Should be Equal As Strings ${resp.status_code} 200 ${ODLResult} To Json ${resp.content} Set Suite Variable ${ODLResult} @@ -36,7 +36,7 @@ Create New subnet [Documentation] Create new subnet in OpenStack [Tags] Create Subnet OpenStack Neutron Log ${data} - ${resp} post OSSession ${OSREST} data=${data} + ${resp} post request OSSession ${OSREST} data=${data} Should be Equal As Strings ${resp.status_code} 201 ${result} To JSON ${resp.content} ${result} Get From Dictionary ${result} subnet @@ -49,5 +49,5 @@ Create New subnet Check New subnet [Documentation] Check new subnet created in OpenDaylight [Tags] Check subnet OpenDaylight - ${resp} get ODLSession ${ODLREST}/${SUBNETID} + ${resp} get request ODLSession ${ODLREST}/${SUBNETID} Should be Equal As Strings ${resp.status_code} 200 diff --git a/testcases/Controllers/ODL/custom_tests/neutron/030__ports.robot b/testcases/Controllers/ODL/custom_tests/neutron/030__ports.robot index 797d4f3bc..384f607ab 100644 --- a/testcases/Controllers/ODL/custom_tests/neutron/030__ports.robot +++ b/testcases/Controllers/ODL/custom_tests/neutron/030__ports.robot @@ -16,7 +16,7 @@ Check OpenStack ports [Documentation] Checking OpenStack Neutron for known ports [Tags] Ports Neutron OpenStack Log ${X-AUTH} - ${resp} get OSSession ${OSREST} + ${resp} get request OSSession ${OSREST} Should be Equal As Strings ${resp.status_code} 200 ${OSResult} To Json ${resp.content} Set Suite Variable ${OSResult} @@ -26,7 +26,7 @@ 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} - ${resp} get ODLSession ${ODLREST} + ${resp} get request ODLSession ${ODLREST} Should be Equal As Strings ${resp.status_code} 200 ${ODLResult} To Json ${resp.content} Set Suite Variable ${ODLResult} @@ -36,7 +36,7 @@ Create New Port [Documentation] Create new port in OpenStack [Tags] Create port OpenStack Neutron Log ${data} - ${resp} post OSSession ${OSREST} data=${data} + ${resp} post request OSSession ${OSREST} data=${data} Should be Equal As Strings ${resp.status_code} 201 ${result} To JSON ${resp.content} ${result} Get From Dictionary ${result} port @@ -49,5 +49,5 @@ Create New Port Check New Port [Documentation] Check new port created in OpenDaylight [Tags] Check subnet OpenDaylight - ${resp} get ODLSession ${ODLREST}/${PORTID} + ${resp} get request 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 8935b10df..7260d78de 100644 --- a/testcases/Controllers/ODL/custom_tests/neutron/040__delete_ports.robot +++ b/testcases/Controllers/ODL/custom_tests/neutron/040__delete_ports.robot @@ -15,7 +15,7 @@ Delete New Port [Documentation] Delete previously created port in OpenStack [Tags] Delete port OpenStack Neutron Log ${data} - ${resp} delete OSSession ${OSREST} + ${resp} delete request OSSession ${OSREST} Should be Equal As Strings ${resp.status_code} 204 Log ${resp.content} sleep 2 @@ -24,10 +24,10 @@ 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} + ${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 ODLSession ${ODLREST}/${PORTID} + ${resp} get request 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 bf2fcbd35..ede9123f4 100644 --- a/testcases/Controllers/ODL/custom_tests/neutron/050__delete_subnets.robot +++ b/testcases/Controllers/ODL/custom_tests/neutron/050__delete_subnets.robot @@ -15,7 +15,7 @@ Delete New subnet [Documentation] Delete previously created subnet in OpenStack [Tags] Delete Subnet OpenStack Neutron Log ${data} - ${resp} delete OSSession ${OSREST} + ${resp} delete request OSSession ${OSREST} Should be Equal As Strings ${resp.status_code} 204 Log ${resp.content} sleep 2 @@ -24,10 +24,10 @@ 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} + ${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 ODLSession ${ODLREST}/${SUBNETID} + ${resp} get request 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 210957b83..d917632b5 100644 --- a/testcases/Controllers/ODL/custom_tests/neutron/060__delete_networks.robot +++ b/testcases/Controllers/ODL/custom_tests/neutron/060__delete_networks.robot @@ -15,7 +15,7 @@ Delete Network [Documentation] Delete network in OpenStack [Tags] Delete Network OpenStack Neutron Log ${postNet} - ${resp} delete OSSession ${OSREST} + ${resp} delete request OSSession ${OSREST} Should be Equal As Strings ${resp.status_code} 204 Log ${resp.content} sleep 2 @@ -24,10 +24,10 @@ 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} + ${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 ODLSession ${ODLREST}/${NetID} + ${resp} get request ODLSession ${ODLREST}/${NetID} Should be Equal As Strings ${resp.status_code} 404 -- cgit 1.2.3-korg