python3 changes in openstack scripts

[integration/test.git] / csit / suites / openstack / neutron / 030__ports.robot

diff --git a/csit/suites/openstack/neutron/030__ports.robot b/csit/suites/openstack/neutron/030__ports.robot
index 01c986727c743e598c0950a4641c49b5111d41f6..83db6eb9b21ab170004e190571fc5e3284aa4122 100644 (file)
--- a/csit/suites/openstack/neutron/030__ports.robot
+++ b/csit/suites/openstack/neutron/030__ports.robot
@@ -1,16 +1,12 @@
 *** Settings ***
 Documentation     Checking Port created in OpenStack are pushed to OpenDaylight
-Suite Setup       Create Session    OSSession    http://${OPENSTACK}:9696    headers=${X-AUTH}
+Suite Setup       Create Session    OSSession    ${NEUTRONURL}    headers=${X-AUTH}
 Suite Teardown    Delete All Sessions
-Library           SSHLibrary
 Library           Collections
-Library           OperatingSystem
 Library           RequestsLibrary
-Library           ../../../libraries/Common.py
-Variables         ../../../variables/Variables.py
+Resource          ../../../variables/Variables.robot
 
 *** Variables ***
-${ODLREST}        /controller/nb/v2/neutron/ports
 ${OSREST}         /v2.0/ports
 ${data}           {"port":{"network_id":"${NETID}","admin_state_up": true}}
 
@@ -19,29 +15,27 @@ 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}
+    ${OSResult}    To Json    ${resp.text}
     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://${ODL_SYSTEM_IP}:${PORT}    headers=${HEADERS}    auth=${AUTH}
-    ${resp}    get    ODLSession    ${ODLREST}
+    ${resp}    get request    ODLSession    ${NEUTRON_PORTS_API}
     Should be Equal As Strings    ${resp.status_code}    200
-    ${ODLResult}    To Json    ${resp.content}
-    Set Suite Variable    ${ODLResult}
+    ${ODLResult}    To Json    ${resp.text}
     Log    ${ODLResult}
 
 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}    To JSON    ${resp.text}
     ${result}    Get From Dictionary    ${result}    port
     ${PORTID}    Get From Dictionary    ${result}    id
     Log    ${result}
@@ -50,7 +44,7 @@ Create New Port
     sleep    2
 
 Check New Port
-    [Documentation]    Check new subnet created in OpenDaylight
-    [Tags]    Check subnet OpenDaylight
-    ${resp}    get    ODLSession    ${ODLREST}/${PORTID}
+    [Documentation]    Check new port created in OpenDaylight
+    [Tags]    Check port OpenDaylight
+    ${resp}    get request    ODLSession    ${NEUTRON_PORTS_API}/${PORTID}
     Should be Equal As Strings    ${resp.status_code}    200