diff options
| -rwxr-xr-x | testcases/Controllers/ODL/OpenDaylightTesting.py | 17 | ||||
| -rw-r--r-- | testcases/Controllers/ODL/custom_tests/neutron/001__reachability.robot | 30 |
2 files changed, 1 insertions, 46 deletions
diff --git a/testcases/Controllers/ODL/OpenDaylightTesting.py b/testcases/Controllers/ODL/OpenDaylightTesting.py index 35a2ee117..40871eeca 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 c2714c691..000000000 --- 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 |