summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Bandzi <pbandzi@cisco.com>2015-05-29 14:44:38 +0200
committerPeter Bandzi <pbandzi@cisco.com>2015-05-29 14:50:40 +0200
commit486dfd57300d74d0a9f058951112393bf6bc210a (patch)
tree29e245d17e49669ed6b8cd2c6f0db88dd673b25c
parentc067ffd273f866eb7e2b6c34f46bd266486d04fa (diff)
Fix relative path issue in custom test
Plus changed expected response from 404 to 204. Current response from ODL is 404 but it is because network,subnet,port are not deleted in ODL. It is ODL bug and response should be 204. JIRA: FUNCTEST-5 Change-Id: I1a6ed78355b697b455d089e51007900c5ba721a6 Signed-off-by: Peter Bandzi <pbandzi@cisco.com>
-rw-r--r--testcases/Controllers/ODL/CI/custom_tests/neutron/040__delete_ports.txt8
-rw-r--r--testcases/Controllers/ODL/CI/custom_tests/neutron/050__delete_subnets.txt8
-rw-r--r--testcases/Controllers/ODL/CI/custom_tests/neutron/060__delete_networks.txt8
3 files changed, 12 insertions, 12 deletions
diff --git a/testcases/Controllers/ODL/CI/custom_tests/neutron/040__delete_ports.txt b/testcases/Controllers/ODL/CI/custom_tests/neutron/040__delete_ports.txt
index ec9d8c4b5..1fc3fc41d 100644
--- a/testcases/Controllers/ODL/CI/custom_tests/neutron/040__delete_ports.txt
+++ b/testcases/Controllers/ODL/CI/custom_tests/neutron/040__delete_ports.txt
@@ -5,9 +5,9 @@ Suite Teardown Delete All Sessions
Library SSHLibrary
Library Collections
Library OperatingSystem
-Library ../integration/test/csit/libraries/RequestsLibrary.py
-Library ../integration/test/csit/libraries/Common.py
-Variables ../integration/test/csit/variables/Variables.py
+Library ../../../libraries/RequestsLibrary.py
+Library ../../../libraries/Common.py
+Variables ../../../variables/Variables.py
*** Variables ***
${ODLREST} /controller/nb/v2/neutron/ports
@@ -34,4 +34,4 @@ Check Port Deleted
Set Suite Variable ${ODLResult}
Log ${ODLResult}
${resp} get ODLSession ${ODLREST}/${PORTID}
- Should be Equal As Strings ${resp.status_code} 404
+ Should be Equal As Strings ${resp.status_code} 204
diff --git a/testcases/Controllers/ODL/CI/custom_tests/neutron/050__delete_subnets.txt b/testcases/Controllers/ODL/CI/custom_tests/neutron/050__delete_subnets.txt
index 943fe3183..338786368 100644
--- a/testcases/Controllers/ODL/CI/custom_tests/neutron/050__delete_subnets.txt
+++ b/testcases/Controllers/ODL/CI/custom_tests/neutron/050__delete_subnets.txt
@@ -5,9 +5,9 @@ Suite Teardown Delete All Sessions
Library SSHLibrary
Library Collections
Library OperatingSystem
-Library ../integration/test/csit/libraries/RequestsLibrary.py
-Library ../integration/test/csit/libraries/Common.py
-Variables ../integration/test/csit/variables/Variables.py
+Library ../../../libraries/RequestsLibrary.py
+Library ../../../libraries/Common.py
+Variables ../../../variables/Variables.py
*** Variables ***
${ODLREST} /controller/nb/v2/neutron/subnets
@@ -34,4 +34,4 @@ Check New subnet deleted
Set Suite Variable ${ODLResult}
Log ${ODLResult}
${resp} get ODLSession ${ODLREST}/${SUBNETID}
- Should be Equal As Strings ${resp.status_code} 404
+ Should be Equal As Strings ${resp.status_code} 204
diff --git a/testcases/Controllers/ODL/CI/custom_tests/neutron/060__delete_networks.txt b/testcases/Controllers/ODL/CI/custom_tests/neutron/060__delete_networks.txt
index f486af149..106ac80e7 100644
--- a/testcases/Controllers/ODL/CI/custom_tests/neutron/060__delete_networks.txt
+++ b/testcases/Controllers/ODL/CI/custom_tests/neutron/060__delete_networks.txt
@@ -5,9 +5,9 @@ Suite Teardown Delete All Sessions
Library SSHLibrary
Library Collections
Library OperatingSystem
-Library ../integration/test/csit/libraries/RequestsLibrary.py
-Library ../integration/test/csit/libraries/Common.py
-Variables ../integration/test/csit/variables/Variables.py
+Library ../../../libraries/RequestsLibrary.py
+Library ../../../libraries/Common.py
+Variables ../../../variables/Variables.py
*** Variables ***
${ODLREST} /controller/nb/v2/neutron/networks
@@ -34,4 +34,4 @@ Check Network deleted
Set Suite Variable ${ODLResult}
Log ${ODLResult}
${resp} get ODLSession ${ODLREST}/${NetID}
- Should be Equal As Strings ${resp.status_code} 404
+ Should be Equal As Strings ${resp.status_code} 204