Updated OpenStack references to "Library RequestsLibrary"

Change-Id: Icd721572ac26a767089c57cc84fcaac92e90a25c
Signed-off-by: Chaudhry Muhammad Usama <chaudhryusama@gmail.com>

diff --git a/test/csit/suites/openstack/neutron/010__networks.robot b/test/csit/suites/openstack/neutron/010__networks.robot
index ac5080a2e922cfe07b723c45e9d78257fcca9134..be527d916e922954d9a6c6bf9efcc5e1df942a42 100644 (file)
--- a/test/csit/suites/openstack/neutron/010__networks.robot
+++ b/test/csit/suites/openstack/neutron/010__networks.robot
@@ -1,58 +1,56 @@
 *** Settings ***
 Documentation     Checking Network created in OpenStack are pushed to OpenDaylight
-Suite Setup      Create Session    OSSession     http://${OPENSTACK}:9696    headers=${X-AUTH}    
+Suite Setup       Create Session    OSSession    http://${OPENSTACK}:9696    headers=${X-AUTH}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
 Library           OperatingSystem
-Library           ../../../libraries/RequestsLibrary.py
+Library           RequestsLibrary
 Library           ../../../libraries/Common.py
 Variables         ../../../variables/Variables.py
- 
+
 *** Variables ***
-${ODLREST}       /controller/nb/v2/neutron/networks
-${OSREST}        /v2.0/networks
-${postNet}     {"network":{"name":"odl_network","admin_state_up":true}}
- 
+${ODLREST}        /controller/nb/v2/neutron/networks
+${OSREST}         /v2.0/networks
+${postNet}        {"network":{"name":"odl_network","admin_state_up":true}}
+
 *** Test Cases ***
 Check OpenStack Networks
-       [Documentation]     Checking OpenStack Neutron for known networks
-       [Tags]              Network Neutron OpenStack
-        Log    ${X-AUTH}
-        ${resp}                get     OSSession       ${OSREST}   
-       Should be Equal As Strings      ${resp.status_code}     200
-        ${OSResult}    To Json         ${resp.content}
-        Set Suite Variable     ${OSResult}
-        Log    ${OSResult}
+    [Documentation]    Checking OpenStack Neutron for known networks
+    [Tags]    Network Neutron OpenStack
+    Log    ${X-AUTH}
+    ${resp}    get    OSSession    ${OSREST}
+    Should be Equal As Strings    ${resp.status_code}    200
+    ${OSResult}    To Json    ${resp.content}
+    Set Suite Variable    ${OSResult}
+    Log    ${OSResult}
 
 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}    
-       Should be Equal As Strings      ${resp.status_code}     200
-        ${ODLResult}   To Json         ${resp.content}
-        Set Suite Variable     ${ODLResult}
-        Log    ${ODLResult}
+    [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}
+    Should be Equal As Strings    ${resp.status_code}    200
+    ${ODLResult}    To Json    ${resp.content}
+    Set Suite Variable    ${ODLResult}
+    Log    ${ODLResult}
 
-Create Network 
-       [Documentation]    Create new network in OpenStack
-       [Tags]             Create Network OpenStack Neutron
-        Log    ${postNet}
-        ${resp}                post    OSSession       ${OSREST}  data=${postNet}  
-        Should be Equal As Strings     ${resp.status_code}     201
-       ${result}       To JSON         ${resp.content}
-       ${result}       Get From Dictionary     ${result}       network 
-        ${NETID}       Get From Dictionary     ${result}       id
-        Log    ${result}
-       Log     ${NETID}
-        Set Global Variable    ${NETID}
-        sleep    2
+Create Network
+    [Documentation]    Create new network in OpenStack
+    [Tags]    Create Network OpenStack Neutron
+    Log    ${postNet}
+    ${resp}    post    OSSession    ${OSREST}    data=${postNet}
+    Should be Equal As Strings    ${resp.status_code}    201
+    ${result}    To JSON    ${resp.content}
+    ${result}    Get From Dictionary    ${result}    network
+    ${NETID}    Get From Dictionary    ${result}    id
+    Log    ${result}
+    Log    ${NETID}
+    Set Global Variable    ${NETID}
+    sleep    2
 
 Check Network
-       [Documentation]   Check Network created in OpenDaylight
-       [Tags]          Check  Network OpenDaylight
-       ${resp}         get     ODLSession      ${ODLREST}/${NetID}
-        Should be Equal As Strings     ${resp.status_code}     200
-
-
+    [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/test/csit/suites/openstack/neutron/020__subnets.robot b/test/csit/suites/openstack/neutron/020__subnets.robot
index b5eec1579671854365a9d9580636a7b3d96dcf22..0b4c78cca7623ef871f7567ebe7d43ca6c6480fa 100644 (file)
--- a/test/csit/suites/openstack/neutron/020__subnets.robot
+++ b/test/csit/suites/openstack/neutron/020__subnets.robot
@@ -1,58 +1,56 @@
 *** Settings ***
-Documentation     Checking Subnets  created in OpenStack are pushed to OpenDaylight
-Suite Setup      Create Session    OSSession     http://${OPENSTACK}:9696    headers=${X-AUTH}    
+Documentation     Checking Subnets created in OpenStack are pushed to OpenDaylight
+Suite Setup       Create Session    OSSession    http://${OPENSTACK}:9696    headers=${X-AUTH}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
 Library           OperatingSystem
-Library           ../../../libraries/RequestsLibrary.py
+Library           RequestsLibrary
 Library           ../../../libraries/Common.py
 Variables         ../../../variables/Variables.py
- 
+
 *** Variables ***
-${ODLREST}       /controller/nb/v2/neutron/subnets
-${OSREST}        /v2.0/subnets
-${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"}]}}
- 
+${ODLREST}        /controller/nb/v2/neutron/subnets
+${OSREST}         /v2.0/subnets
+${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 ***
 Check OpenStack Subnets
-       [Documentation]     Checking OpenStack Neutron for known Subnets
-       [Tags]              Subnets Neutron OpenStack
-        Log    ${X-AUTH}
-        ${resp}                get     OSSession       ${OSREST}    
-       Should be Equal As Strings      ${resp.status_code}     200
-        ${OSResult}    To Json         ${resp.content}
-        Set Suite Variable     ${OSResult}
-        Log    ${OSResult}
+    [Documentation]    Checking OpenStack Neutron for known Subnets
+    [Tags]    Subnets Neutron OpenStack
+    Log    ${X-AUTH}
+    ${resp}    get    OSSession    ${OSREST}
+    Should be Equal As Strings    ${resp.status_code}    200
+    ${OSResult}    To Json    ${resp.content}
+    Set Suite Variable    ${OSResult}
+    Log    ${OSResult}
 
 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}    
-       Should be Equal As Strings      ${resp.status_code}     200
-        ${ODLResult}   To Json         ${resp.content}
-        Set Suite Variable     ${ODLResult}
-        Log    ${ODLResult}
+    [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}
+    Should be Equal As Strings    ${resp.status_code}    200
+    ${ODLResult}    To Json    ${resp.content}
+    Set Suite Variable    ${ODLResult}
+    Log    ${ODLResult}
 
 Create New subnet
-       [Documentation]    Create new subnet in OpenStack
-       [Tags]             Create Subnet OpenStack Neutron
-        Log    ${data}
-        ${resp}                post    OSSession       ${OSREST}       data=${data}  
-        Should be Equal As Strings     ${resp.status_code}     201
-       ${result}       To JSON         ${resp.content}
-       ${result}       Get From Dictionary     ${result}       subnet  
-        ${SUBNETID}    Get From Dictionary     ${result}       id
-        Log    ${result}
-       Log     ${SUBNETID}
-        Set Global Variable    ${SUBNETID}
-        sleep    2
+    [Documentation]    Create new subnet in OpenStack
+    [Tags]    Create Subnet OpenStack Neutron
+    Log    ${data}
+    ${resp}    post    OSSession    ${OSREST}    data=${data}
+    Should be Equal As Strings    ${resp.status_code}    201
+    ${result}    To JSON    ${resp.content}
+    ${result}    Get From Dictionary    ${result}    subnet
+    ${SUBNETID}    Get From Dictionary    ${result}    id
+    Log    ${result}
+    Log    ${SUBNETID}
+    Set Global Variable    ${SUBNETID}
+    sleep    2
 
 Check New subnet
-       [Documentation]   Check new subnet created in OpenDaylight
-       [Tags]          Check  subnet OpenDaylight
-       ${resp}         get     ODLSession      ${ODLREST}/${SUBNETID}
-        Should be Equal As Strings     ${resp.status_code}     200
-
-
+    [Documentation]    Check new subnet created in OpenDaylight
+    [Tags]    Check    subnet OpenDaylight
+    ${resp}    get    ODLSession    ${ODLREST}/${SUBNETID}
+    Should be Equal As Strings    ${resp.status_code}    200

diff --git a/test/csit/suites/openstack/neutron/030__ports.robot b/test/csit/suites/openstack/neutron/030__ports.robot
index d455d6f4cd096abaeb3bc62a4945f45d6d165d5a..b3ba03f15daa7c641b7d9813d8603d75b8f6a128 100644 (file)
--- a/test/csit/suites/openstack/neutron/030__ports.robot
+++ b/test/csit/suites/openstack/neutron/030__ports.robot
@@ -1,58 +1,56 @@
 *** Settings ***
-Documentation     Checking Port  created in OpenStack are pushed to OpenDaylight
-Suite Setup      Create Session    OSSession     http://${OPENSTACK}:9696    headers=${X-AUTH}    
+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           SSHLibrary
 Library           Collections
 Library           OperatingSystem
-Library           ../../../libraries/RequestsLibrary.py
+Library           RequestsLibrary
 Library           ../../../libraries/Common.py
 Variables         ../../../variables/Variables.py
- 
+
 *** Variables ***
-${ODLREST}       /controller/nb/v2/neutron/ports
-${OSREST}        /v2.0/ports
-${data}       {"port":{"network_id":"${NETID}","admin_state_up": true}}
- 
+${ODLREST}        /controller/nb/v2/neutron/ports
+${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
-        Log    ${X-AUTH}
-        ${resp}                get     OSSession       ${OSREST}    
-       Should be Equal As Strings      ${resp.status_code}     200
-        ${OSResult}    To Json         ${resp.content}
-        Set Suite Variable     ${OSResult}
-        Log    ${OSResult}
+    [Documentation]    Checking OpenStack Neutron for known ports
+    [Tags]    Ports Neutron OpenStack
+    Log    ${X-AUTH}
+    ${resp}    get    OSSession    ${OSREST}
+    Should be Equal As Strings    ${resp.status_code}    200
+    ${OSResult}    To Json    ${resp.content}
+    Set Suite Variable    ${OSResult}
+    Log    ${OSResult}
 
 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}    
-       Should be Equal As Strings      ${resp.status_code}     200
-        ${ODLResult}   To Json         ${resp.content}
-        Set Suite Variable     ${ODLResult}
-        Log    ${ODLResult}
+    [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}
+    Should be Equal As Strings    ${resp.status_code}    200
+    ${ODLResult}    To Json    ${resp.content}
+    Set Suite Variable    ${ODLResult}
+    Log    ${ODLResult}
 
 Create New Port
-       [Documentation]    Create new port in OpenStack
-       [Tags]             Create port OpenStack Neutron
-        Log    ${data}
-        ${resp}                post    OSSession       ${OSREST}       data=${data}  
-        Should be Equal As Strings     ${resp.status_code}     201
-       ${result}       To JSON         ${resp.content}
-       ${result}       Get From Dictionary     ${result}       port    
-        ${PORTID}      Get From Dictionary     ${result}       id
-        Log    ${result}
-       Log     ${PORTID}
-        Set Global Variable    ${PORTID}
-        sleep    2
+    [Documentation]    Create new port in OpenStack
+    [Tags]    Create port OpenStack Neutron
+    Log    ${data}
+    ${resp}    post    OSSession    ${OSREST}    data=${data}
+    Should be Equal As Strings    ${resp.status_code}    201
+    ${result}    To JSON    ${resp.content}
+    ${result}    Get From Dictionary    ${result}    port
+    ${PORTID}    Get From Dictionary    ${result}    id
+    Log    ${result}
+    Log    ${PORTID}
+    Set Global Variable    ${PORTID}
+    sleep    2
 
 Check New Port
-       [Documentation]   Check new subnet created in OpenDaylight
-       [Tags]          Check  subnet OpenDaylight
-       ${resp}         get     ODLSession      ${ODLREST}/${PORTID}
-        Should be Equal As Strings     ${resp.status_code}     200
-
-
+    [Documentation]    Check new subnet created in OpenDaylight
+    [Tags]    Check subnet OpenDaylight
+    ${resp}    get    ODLSession    ${ODLREST}/${PORTID}
+    Should be Equal As Strings    ${resp.status_code}    200

diff --git a/test/csit/suites/openstack/neutron/__init__.robot b/test/csit/suites/openstack/neutron/__init__.robot
index f57e2a9994198afd15d7d25ef4f7bc567f5ecb63..e1640c17ca8050a0f387fabb305500d18c3c7de0 100644 (file)
--- a/test/csit/suites/openstack/neutron/__init__.robot
+++ b/test/csit/suites/openstack/neutron/__init__.robot
@@ -1,27 +1,25 @@
 *** Settings ***
 Documentation     Test suite for Neutron Plugin
-Suite Setup       Start Suite
-Suite Teardown    Stop Suite
-Library     SSHLibrary
-Library     Collections
-Library     ../../../libraries/RequestsLibrary.py
-Library     ../../../libraries/Common.py
-Variables   ../../../variables/Variables.py
+Library           SSHLibrary
+Library           Collections
+Library           RequestsLibrary
+Library           ../../../libraries/Common.py
+Variables         ../../../variables/Variables.py
 
 *** Variables ***
-${UserInfo}=  {"auth": {"tenantName": "admin", "passwordCredentials": {"username": "admin", "password": "admin"}}}
+${UserInfo}       {"auth": {"tenantName": "admin", "passwordCredentials": {"username": "admin", "password": "admin"}}}
 
-** Keywords ***
+*** Keywords ***
 Start Suite
-    Create Session  KeyStoneSession    http://${OPENSTACK}:5000      headers=${HEADERS}
-    ${resp}      post    KeyStoneSession     /v2.0/tokens    ${UserInfo}
-    Should Be Equal As Strings    ${resp.status_code}     200
-    ${result}  To JSON   ${resp.content}
-    ${result}   Get From Dictionary   ${result}  access
-    ${result}   Get From Dictionary   ${result}  token
-    ${TOKEN}   Get From Dictionary   ${result}  id
-    ${X-AUTH}  Create Dictionary     X-Auth-Token      ${TOKEN}    Content-Type     application/json      
-    Set Global Variable   ${X-AUTH}
+    Create Session    KeyStoneSession    http://${OPENSTACK}:5000    headers=${HEADERS}
+    ${resp}    post    KeyStoneSession    /v2.0/tokens    ${UserInfo}
+    Should Be Equal As Strings    ${resp.status_code}    200
+    ${result}    To JSON    ${resp.content}
+    ${result}    Get From Dictionary    ${result}    access
+    ${result}    Get From Dictionary    ${result}    token
+    ${TOKEN}    Get From Dictionary    ${result}    id
+    ${X-AUTH}    Create Dictionary    X-Auth-Token=${TOKEN}    Content-Type=application/json
+    Set Global Variable    ${X-AUTH}
+
 Stop Suite
     Delete All Sessions
-