From 473e52c73ca4fb65a2feb10d55b8032c8e50a8ca Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Wed, 26 Oct 2016 09:41:19 +0200
Subject: Delete the reachability tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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)
---
 testcases/Controllers/ODL/OpenDaylightTesting.py   | 17 +-----------
 .../custom_tests/neutron/001__reachability.robot   | 30 ----------------------
 2 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 testcases/Controllers/ODL/custom_tests/neutron/001__reachability.robot

(limited to 'testcases')

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
 
@@ -48,19 +47,6 @@ class ODLTestCases:
     res_dir = '/home/opnfv/functest/results/odl/'
     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'
@@ -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
-- 
cgit 1.2.3-korg