From 486dfd57300d74d0a9f058951112393bf6bc210a Mon Sep 17 00:00:00 2001 From: Peter Bandzi Date: Fri, 29 May 2015 14:44:38 +0200 Subject: [PATCH] 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 --- .../Controllers/ODL/CI/custom_tests/neutron/040__delete_ports.txt | 8 ++++---- .../ODL/CI/custom_tests/neutron/050__delete_subnets.txt | 8 ++++---- .../ODL/CI/custom_tests/neutron/060__delete_networks.txt | 8 ++++---- 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 ec9d8c4b..1fc3fc41 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 943fe318..33878636 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 f486af14..106ac80e 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 -- 2.16.6