aboutsummaryrefslogtreecommitdiffstats
path: root/testcases/Controllers
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2016-06-28 15:43:44 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2016-06-28 15:51:51 +0200
commit0fbe33b58e8b2ef9ffc7c44d57e97424f4fa0431 (patch)
tree0928cf87163db7dac22cbe8a36f432dc9c7d747d /testcases/Controllers
parenta0f23ff8022734786f1f411974da9c8973a72450 (diff)
Switch to ODL_SYSTEM_IP and OPENSTACK vars
It follows the last updates of ODL's robotframework files [1]. Useless Set Suite Variable calls are also removed. [1] https://git.opendaylight.org/gerrit/#/c/36569/ Change-Id: I98ec20ded7978cd56e6de6b62bce04b8c6ba1e9a Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'testcases/Controllers')
-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
-rwxr-xr-xtestcases/Controllers/ODL/start_tests.sh2
8 files changed, 14 insertions, 23 deletions
diff --git a/testcases/Controllers/ODL/custom_tests/neutron/001__reachability.robot b/testcases/Controllers/ODL/custom_tests/neutron/001__reachability.robot
index e9fdfe64..c2714c69 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 2341f3dc..de00dd44 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 2d093236..fa7c1e67 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 384f607a..17a46921 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 b934ca5d..7cdd9e9c 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 16e396fd..233030df 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 574e1324..11620690 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}
diff --git a/testcases/Controllers/ODL/start_tests.sh b/testcases/Controllers/ODL/start_tests.sh
index 7f5f121b..8e655cfc 100755
--- a/testcases/Controllers/ODL/start_tests.sh
+++ b/testcases/Controllers/ODL/start_tests.sh
@@ -81,7 +81,7 @@ do
((test_num++))
echo -e "${light_green}Starting test: $line ${nc}"
- pybot -v OPENSTACK:${KEYSTONE_IP} -v NEUTRON:${NEUTRON_IP} -v PORT:${ODL_PORT} -v CONTROLLER:${ODL_IP} ${REPO_DIR}/$line
+ pybot -v OPENSTACK:${NEUTRON_IP} -v PORT:${ODL_PORT} -v ODL_SYSTEM_IP:${ODL_IP} ${REPO_DIR}/$line
mkdir -p $RESULTS_DIR/logs/${test_num}
mv log.html $RESULTS_DIR/logs/${test_num}/
mv report.html $RESULTS_DIR/logs/${test_num}/