Update Robot Framework format - step 13

[integration/test.git] / csit / suites / openstack / neutron / 050__delete_subnets.robot

diff --git a/csit/suites/openstack/neutron/050__delete_subnets.robot b/csit/suites/openstack/neutron/050__delete_subnets.robot
index 839df52a03eb6fab38b0e09bad9bc91d74b9a8c5..dad6a85245d1ed9f1d09dfb7628d0423d03bef78 100644 (file)
--- a/csit/suites/openstack/neutron/050__delete_subnets.robot
+++ b/csit/suites/openstack/neutron/050__delete_subnets.robot
@@ -1,42 +1,47 @@
 *** Settings ***
-Documentation     Checking Subnets deleted in OpenStack are deleted also in OpenDaylight
-Suite Setup       Start Suite
-Suite Teardown    Delete All Sessions
-Library           RequestsLibrary
-Variables         ../../../variables/Variables.py
+Documentation       Checking Subnets deleted in OpenStack are deleted also in OpenDaylight
+
+Library             RequestsLibrary
+Resource            ../../../variables/Variables.robot
+
+Suite Setup         Start Suite
+Suite Teardown      Delete All Sessions
+
 
 *** Variables ***
-${ODLREST}        /controller/nb/v2/neutron/subnets
-${OSREST}         /v2.0/subnets/${SUBNETID}
-${data}           {"subnet":{"network_id":"${NETID}","ip_version":4,"cidr":"172.16.64.0/24","allocation_pools":[{"start":"172.16.64.20","end":"172.16.64.120"}]}}
+${OSREST}       /v2.0/subnets/${SUBNETID}
+${data}
+...             {"subnet":{"network_id":"${NETID}","ip_version":4,"cidr":"172.16.64.0/24","allocation_pools":[{"start":"172.16.64.20","end":"172.16.64.120"}]}}
+
 
 *** Test Cases ***
 Delete New subnet
     [Documentation]    Delete previously created subnet in OpenStack
-    [Tags]    Delete Subnet OpenStack Neutron
+    [Tags]    delete subnet openstack neutron
     Log    ${data}
     ${resp}    delete request    OSSession    ${OSREST}
     Should be Equal As Strings    ${resp.status_code}    204
-    Log    ${resp.content}
+    Log    ${resp.text}
     sleep    2
 
 Check New subnet deleted
     [Documentation]    Check subnet deleted in OpenDaylight
-    [Tags]    Check subnet deleted OpenDaylight
-    ${resp}    get request    ODLSession    ${ODLREST}
+    [Tags]    check subnet deleted opendaylight
+    ${resp}    get request    ODLSession    ${NEUTRON_SUBNETS_API}
     Should be Equal As Strings    ${resp.status_code}    200
-    ${ODLResult}    To Json    ${resp.content}
+    ${ODLResult}    To Json    ${resp.text}
     Log    ${ODLResult}
-    ${resp}    get request    ODLSession    ${ODLREST}/${SUBNETID}
+    ${resp}    get request    ODLSession    ${NEUTRON_SUBNETS_API}/${SUBNETID}
     Should be Equal As Strings    ${resp.status_code}    404
 
+
 *** Keywords ***
 Check Subnet Exists
     [Arguments]    ${subnetid}
-    ${resp}    get request    ODLSession    ${ODLREST}/${subnetid}
+    ${resp}    get request    ODLSession    ${NEUTRON_SUBNETS_API}/${subnetid}
     Should be Equal As Strings    ${resp.status_code}    200
 
 Start Suite
-    Create Session    OSSession    http://${NEUTRON}:9696    headers=${X-AUTH}
+    Create Session    OSSession    ${NEUTRONURL}    headers=${X-AUTH-NOCONTENT}
     Create Session    ODLSession    http://${ODL_SYSTEM_IP}:${PORT}    headers=${HEADERS}    auth=${AUTH}
     Check Subnet Exists    ${SUBNETID}