summaryrefslogtreecommitdiffstats
path: root/testcases/Controllers/ODL/custom_tests/neutron
diff options
context:
space:
mode:
Diffstat (limited to 'testcases/Controllers/ODL/custom_tests/neutron')
-rw-r--r--testcases/Controllers/ODL/custom_tests/neutron/001__reachability.robot2
-rw-r--r--testcases/Controllers/ODL/custom_tests/neutron/010__networks.robot6
-rw-r--r--testcases/Controllers/ODL/custom_tests/neutron/020__subnets.robot6
-rw-r--r--testcases/Controllers/ODL/custom_tests/neutron/030__ports.robot6
-rw-r--r--testcases/Controllers/ODL/custom_tests/neutron/040__delete_ports.robot5
-rw-r--r--testcases/Controllers/ODL/custom_tests/neutron/050__delete_subnets.robot5
-rw-r--r--testcases/Controllers/ODL/custom_tests/neutron/060__delete_networks.robot5
7 files changed, 13 insertions, 22 deletions
diff --git a/testcases/Controllers/ODL/custom_tests/neutron/001__reachability.robot b/testcases/Controllers/ODL/custom_tests/neutron/001__reachability.robot
index e9fdfe645..c2714c691 100644
--- a/testcases/Controllers/ODL/custom_tests/neutron/001__reachability.robot
+++ b/testcases/Controllers/ODL/custom_tests/neutron/001__reachability.robot
@@ -5,7 +5,7 @@ ${SubnetNorthbound} ${NeutronNorthbound}/subnets
${PortNorthbound} ${NeutronNorthbound}/ports
*** Settings ***
-Suite Setup Create Session ODL http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH}
+Suite Setup Create Session ODL http://${ODL_SYSTEM_IP}:${PORT} headers=${HEADERS} auth=${AUTH}
Suite Teardown Delete All Sessions
Library RequestsLibrary
Variables ../../../variables/Variables.py
diff --git a/testcases/Controllers/ODL/custom_tests/neutron/010__networks.robot b/testcases/Controllers/ODL/custom_tests/neutron/010__networks.robot
index 2341f3dcf..de00dd44d 100644
--- a/testcases/Controllers/ODL/custom_tests/neutron/010__networks.robot
+++ b/testcases/Controllers/ODL/custom_tests/neutron/010__networks.robot
@@ -1,6 +1,6 @@
*** Settings ***
Documentation Checking Network created in OpenStack are pushed to OpenDaylight
-Suite Setup Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH}
+Suite Setup Create Session OSSession http://${OPENSTACK}:9696 headers=${X-AUTH}
Suite Teardown Delete All Sessions
Library Collections
Library RequestsLibrary
@@ -19,17 +19,15 @@ Check OpenStack Networks
${resp} get request 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}
+ Create Session ODLSession http://${ODL_SYSTEM_IP}:${PORT} headers=${HEADERS} auth=${AUTH}
${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}
Create Network
diff --git a/testcases/Controllers/ODL/custom_tests/neutron/020__subnets.robot b/testcases/Controllers/ODL/custom_tests/neutron/020__subnets.robot
index 2d0932366..fa7c1e679 100644
--- a/testcases/Controllers/ODL/custom_tests/neutron/020__subnets.robot
+++ b/testcases/Controllers/ODL/custom_tests/neutron/020__subnets.robot
@@ -1,6 +1,6 @@
*** Settings ***
Documentation Checking Subnets created in OpenStack are pushed to OpenDaylight
-Suite Setup Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH}
+Suite Setup Create Session OSSession http://${OPENSTACK}:9696 headers=${X-AUTH}
Suite Teardown Delete All Sessions
Library Collections
Library RequestsLibrary
@@ -19,17 +19,15 @@ Check OpenStack Subnets
${resp} get request 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}
+ Create Session ODLSession http://${ODL_SYSTEM_IP}:${PORT} headers=${HEADERS} auth=${AUTH}
${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}
Create New subnet
diff --git a/testcases/Controllers/ODL/custom_tests/neutron/030__ports.robot b/testcases/Controllers/ODL/custom_tests/neutron/030__ports.robot
index 384f607ab..17a469210 100644
--- a/testcases/Controllers/ODL/custom_tests/neutron/030__ports.robot
+++ b/testcases/Controllers/ODL/custom_tests/neutron/030__ports.robot
@@ -1,6 +1,6 @@
*** Settings ***
Documentation Checking Port created in OpenStack are pushed to OpenDaylight
-Suite Setup Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH}
+Suite Setup Create Session OSSession http://${OPENSTACK}:9696 headers=${X-AUTH}
Suite Teardown Delete All Sessions
Library Collections
Library RequestsLibrary
@@ -19,17 +19,15 @@ Check OpenStack ports
${resp} get request 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}
+ Create Session ODLSession http://${ODL_SYSTEM_IP}:${PORT} headers=${HEADERS} auth=${AUTH}
${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}
Create New Port
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 b934ca5d3..7cdd9e9c0 100644
--- a/testcases/Controllers/ODL/custom_tests/neutron/040__delete_ports.robot
+++ b/testcases/Controllers/ODL/custom_tests/neutron/040__delete_ports.robot
@@ -26,7 +26,6 @@ Check Port Deleted
${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 request ODLSession ${ODLREST}/${PORTID}
Should be Equal As Strings ${resp.status_code} 404
@@ -38,6 +37,6 @@ Check Port Exists
Should be Equal As Strings ${resp.status_code} 200
Start Suite
- Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH}
- Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH}
+ Create Session OSSession http://${OPENSTACK}:9696 headers=${X-AUTH}
+ Create Session ODLSession http://${ODL_SYSTEM_IP}:${PORT} headers=${HEADERS} auth=${AUTH}
Check Port Exists ${PORTID}
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 16e396fd0..233030df9 100644
--- a/testcases/Controllers/ODL/custom_tests/neutron/050__delete_subnets.robot
+++ b/testcases/Controllers/ODL/custom_tests/neutron/050__delete_subnets.robot
@@ -26,7 +26,6 @@ Check New subnet deleted
${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 request ODLSession ${ODLREST}/${SUBNETID}
Should be Equal As Strings ${resp.status_code} 404
@@ -38,6 +37,6 @@ Check Subnet Exists
Should be Equal As Strings ${resp.status_code} 200
Start Suite
- Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH}
- Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH}
+ Create Session OSSession http://${OPENSTACK}:9696 headers=${X-AUTH}
+ Create Session ODLSession http://${ODL_SYSTEM_IP}:${PORT} headers=${HEADERS} auth=${AUTH}
Check Subnet Exists ${SUBNETID}
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 574e13248..11620690b 100644
--- a/testcases/Controllers/ODL/custom_tests/neutron/060__delete_networks.robot
+++ b/testcases/Controllers/ODL/custom_tests/neutron/060__delete_networks.robot
@@ -26,7 +26,6 @@ Check Network deleted
${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 request ODLSession ${ODLREST}/${NETID}
Should be Equal As Strings ${resp.status_code} 404
@@ -38,6 +37,6 @@ Check Network Exists
Should be Equal As Strings ${resp.status_code} 200
Start Suite
- Create Session OSSession http://${NEUTRON}:9696 headers=${X-AUTH}
- Create Session ODLSession http://${CONTROLLER}:${PORT} headers=${HEADERS} auth=${AUTH}
+ Create Session OSSession http://${OPENSTACK}:9696 headers=${X-AUTH}
+ Create Session ODLSession http://${ODL_SYSTEM_IP}:${PORT} headers=${HEADERS} auth=${AUTH}
Check Network Exists ${NETID}