X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Fopenstack%2Fneutron%2F030__ports.robot;h=8638ede1551c1514a20b2f65e6a7ebd8577226a9;hb=c35e89803a9c5593d19215b87da3e305c8293142;hp=17a46921034dda2f05ae8bc35b69308491638566;hpb=69656144b2367a916e146748b9889f176996fe12;p=integration%2Ftest.git

diff --git a/csit/suites/openstack/neutron/030__ports.robot b/csit/suites/openstack/neutron/030__ports.robot
index 17a4692103..8638ede155 100644
--- a/csit/suites/openstack/neutron/030__ports.robot
+++ b/csit/suites/openstack/neutron/030__ports.robot
@@ -1,42 +1,45 @@
 *** Settings ***
-Documentation     Checking Port created in OpenStack are pushed to OpenDaylight
-Suite Setup       Create Session    OSSession    http://${OPENSTACK}:9696    headers=${X-AUTH}
-Suite Teardown    Delete All Sessions
-Library           Collections
-Library           RequestsLibrary
-Variables         ../../../variables/Variables.py
+Documentation       Checking Port created in OpenStack are pushed to OpenDaylight
+
+Library             Collections
+Library             RequestsLibrary
+Resource            ../../../variables/Variables.robot
+
+Suite Setup         Create Session    OSSession    ${NEUTRONURL}    headers=${X-AUTH}
+Suite Teardown      Delete All Sessions
+
 
 *** Variables ***
-${ODLREST}        /controller/nb/v2/neutron/ports
-${OSREST}         /v2.0/ports
-${data}           {"port":{"network_id":"${NETID}","admin_state_up": true}}
+${OSREST}       /v2.0/ports
+${data}         {"port":{"network_id":"${NETID}","admin_state_up": true}}
+
 
 *** Test Cases ***
 Check OpenStack ports
     [Documentation]    Checking OpenStack Neutron for known ports
-    [Tags]    Ports Neutron OpenStack
+    [Tags]    ports neutron openstack
     Log    ${X-AUTH}
     ${resp}    get request    OSSession    ${OSREST}
     Should be Equal As Strings    ${resp.status_code}    200
-    ${OSResult}    To Json    ${resp.content}
+    ${OSResult}    To Json    ${resp.text}
     Log    ${OSResult}
 
 Check OpenDaylight ports
     [Documentation]    Checking OpenDaylight Neutron API for known ports
-    [Tags]    Ports Neutron OpenDaylight
+    [Tags]    ports neutron opendaylight
     Create Session    ODLSession    http://${ODL_SYSTEM_IP}:${PORT}    headers=${HEADERS}    auth=${AUTH}
-    ${resp}    get request    ODLSession    ${ODLREST}
+    ${resp}    get request    ODLSession    ${NEUTRON_PORTS_API}
     Should be Equal As Strings    ${resp.status_code}    200
-    ${ODLResult}    To Json    ${resp.content}
+    ${ODLResult}    To Json    ${resp.text}
     Log    ${ODLResult}
 
 Create New Port
     [Documentation]    Create new port in OpenStack
-    [Tags]    Create port OpenStack Neutron
+    [Tags]    create port openstack neutron
     Log    ${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}
@@ -46,6 +49,6 @@ Create New Port
 
 Check New Port
     [Documentation]    Check new port created in OpenDaylight
-    [Tags]    Check subnet OpenDaylight
-    ${resp}    get request    ODLSession    ${ODLREST}/${PORTID}
+    [Tags]    check port opendaylight
+    ${resp}    get request    ODLSession    ${NEUTRON_PORTS_API}/${PORTID}
     Should be Equal As Strings    ${resp.status_code}    200