From: Peter Bandzi <pbandzi@cisco.com>
Date: Fri, 29 May 2015 12:44:38 +0000 (+0200)
Subject: Fix relative path issue in custom test
X-Git-Tag: arno.2015.1.0~11
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=486dfd57300d74d0a9f058951112393bf6bc210a;p=functest.git

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>
---

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