summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2016-10-26 09:41:19 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-02-13 18:34:00 +0100
commit473e52c73ca4fb65a2feb10d55b8032c8e50a8ca (patch)
tree791198725a6cab1f5ef6c4fa561043997135f82a
parentada757449b768bf4fe7c140c394e149f116b2b24 (diff)
Delete the reachability testsstable/colorado
It removes 001__reachability.robot as it is now part of OpenDaylight integration/test. It completes the commit which pushes upstream the reachability tests [1]. [1] https://git.opendaylight.org/gerrit/#/c/46910/ Conflicts: testcases/Controllers/ODL/OpenDaylightTesting.py unit_tests/odl/test_odl.py Change-Id: I72926cd4ab77e12ba4aeabf03bdd35619d43ffd3 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit d3042a7aa885d7761289661fb728f4d7b5e7c94b)
-rwxr-xr-xtestcases/Controllers/ODL/OpenDaylightTesting.py17
-rw-r--r--testcases/Controllers/ODL/custom_tests/neutron/001__reachability.robot30
2 files changed, 1 insertions, 46 deletions
diff --git a/testcases/Controllers/ODL/OpenDaylightTesting.py b/testcases/Controllers/ODL/OpenDaylightTesting.py
index 35a2ee1..40871ee 100755
--- a/testcases/Controllers/ODL/OpenDaylightTesting.py
+++ b/testcases/Controllers/ODL/OpenDaylightTesting.py
@@ -4,7 +4,6 @@ import argparse
import fileinput
import os
import re
-import shutil
import sys
import urlparse
@@ -49,19 +48,6 @@ class ODLTestCases:
logger = ft_logger.Logger("opendaylight").getLogger()
@classmethod
- def copy_opnf_testcases(cls):
- opnfv_testcases_dir = (os.path.dirname(os.path.abspath(__file__)) +
- "/custom_tests/neutron/")
- file = opnfv_testcases_dir + "001__reachability.robot"
- try:
- shutil.copy(file, cls.neutron_suite_dir)
- except IOError as e:
- cls.logger.error(
- "Cannot copy OPNFV's testcase to ODL directory: %s" % str(e))
- return False
- return True
-
- @classmethod
def set_robotframework_vars(cls, odlusername="admin", odlpassword="admin"):
odl_variables_files = cls.odl_test_repo + 'csit/variables/Variables.py'
try:
@@ -94,8 +80,7 @@ class ODLTestCases:
cls.logger.error("Cannot run ODL testcases. Please check "
"%s" % str(e))
return False
- if (cls.copy_opnf_testcases() and
- cls.set_robotframework_vars(odlusername, odlpassword)):
+ if cls.set_robotframework_vars(odlusername, odlpassword):
try:
os.makedirs(cls.res_dir)
except OSError:
diff --git a/testcases/Controllers/ODL/custom_tests/neutron/001__reachability.robot b/testcases/Controllers/ODL/custom_tests/neutron/001__reachability.robot
deleted file mode 100644
index c2714c6..0000000
--- a/testcases/Controllers/ODL/custom_tests/neutron/001__reachability.robot
+++ /dev/null
@@ -1,30 +0,0 @@
-*** Variables ***
-${NeutronNorthbound} /controller/nb/v2/neutron
-${NetworkNorthbound} ${NeutronNorthbound}/networks
-${SubnetNorthbound} ${NeutronNorthbound}/subnets
-${PortNorthbound} ${NeutronNorthbound}/ports
-
-*** Settings ***
-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
-
-*** Test Cases ***
-Get the complete list of networks
- [Documentation] Get the complete list of networks
- [Tags] reachability
- ${resp} get request ODL ${NetworkNorthbound}
- Should be Equal As Strings ${resp.status_code} 200
-
-Get the complete list of subnets
- [Documentation] Get the complete list of subnets
- [Tags] reachability
- ${resp} get request ODL ${SubnetNorthbound}
- Should be Equal As Strings ${resp.status_code} 200
-
-Get the complete list of ports
- [Documentation] Get the complete list of ports
- [Tags] reachability
- ${resp} get request ODL ${PortNorthbound}
- Should be Equal As Strings ${resp.status_code} 200