Merge "Delete the reachability tests"

2 files changed, 1 insertions, 46 deletions

diff --git a/testcases/Controllers/ODL/OpenDaylightTesting.py b/testcases/Controllers/ODL/OpenDaylightTesting.py
index c44be626..8c003abf 100755
--- a/testcases/Controllers/ODL/OpenDaylightTesting.py
+++ b/testcases/Controllers/ODL/OpenDaylightTesting.py
@@ -12,7 +12,6 @@ import errno
 import fileinput
 import os
 import re
-import shutil
 import sys
 import urlparse
 
@@ -60,19 +59,6 @@ class ODLTestCases(TestCasesBase.TestCasesBase):
         self.case_name = "odl"
 
     @classmethod
-    def copy_opnf_testcases(cls):
-        opnfv_testcases_dir = (os.path.dirname(os.path.abspath(__file__)) +
-                               "/custom_tests/neutron/")
-        f = opnfv_testcases_dir + "001__reachability.robot"
-        try:
-            shutil.copy(f, 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:
@@ -115,8 +101,7 @@ class ODLTestCases(TestCasesBase.TestCasesBase):
             self.logger.error("Cannot run ODL testcases. Please check "
                               "%s" % str(e))
             return self.EX_RUN_ERROR
-        if (self.copy_opnf_testcases() and
-                self.set_robotframework_vars(odlusername, odlpassword)):
+        if self.set_robotframework_vars(odlusername, odlpassword):
             try:
                 os.makedirs(self.res_dir)
             except OSError as e:
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 c2714c69..00000000
--- 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