Change barometer module to load

As [1] is merged, the way to call the barometer test case is
different as it is hosted in Barometer repo instead of Functest.
The former files are also simply removed too.

baro-tests is no longer a requirement. It is installed as any
third party project.

[1] https://gerrit.opnfv.org/gerrit/#/c/35927/

Co-Authored-By: Cédric Ollivier <cedric.ollivier@orange.com>

Change-Id: Iea56b48fa781600eb3a6ac74662ea8a29f556f99
Signed-off-by: Jose Lausuch <jose.lausuch@ericsson.com>
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

5 files changed, 1 insertions, 73 deletions

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 7d518324..c30292bc 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -447,7 +447,7 @@ tiers:
                     installer: 'fuel'
                     scenario: 'kvm_ovs_dpdk_bar'
                 run:
-                     module: 'functest.opnfv_tests.features.barometer'
+                     module: 'baro_tests.barometer'
                      class: 'BarometerCollectd'
 
     -
diff --git a/functest/opnfv_tests/features/__init__.py b/functest/opnfv_tests/features/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/functest/opnfv_tests/features/__init__.py
+++ /dev/null
diff --git a/functest/opnfv_tests/features/barometer.py b/functest/opnfv_tests/features/barometer.py
deleted file mode 100644
index e210f333..00000000
--- a/functest/opnfv_tests/features/barometer.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-
-import logging
-
-from baro_tests import collectd
-
-import functest.core.feature as base
-
-
-class BarometerCollectd(base.Feature):
-    '''
-    Class for executing barometercollectd testcase.
-    '''
-
-    __logger = logging.getLogger(__name__)
-
-    def execute(self):
-        return collectd.main(self.__logger)
diff --git a/functest/tests/unit/features/__init__.py b/functest/tests/unit/features/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/functest/tests/unit/features/__init__.py
+++ /dev/null
diff --git a/functest/tests/unit/features/test_barometer.py b/functest/tests/unit/features/test_barometer.py
deleted file mode 100644
index 8c2585d9..00000000
--- a/functest/tests/unit/features/test_barometer.py
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2017 Orange and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-
-# pylint: disable=missing-docstring
-
-import logging
-import sys
-import unittest
-
-import mock
-
-from functest.core import testcase
-with mock.patch('functest.utils.functest_utils.get_parameter_from_yaml'):
-    from functest.opnfv_tests.features import barometer
-
-
-class BarometerTesting(unittest.TestCase):
-
-    _case_name = "barometercollectd"
-    _project_name = "barometer"
-
-    def setUp(self):
-        self.barometer = barometer.BarometerCollectd(
-            case_name=self._case_name, project_name=self._project_name)
-
-    def test_init(self):
-        self.assertEqual(self.barometer.project_name, self._project_name)
-        self.assertEqual(self.barometer.case_name, self._case_name)
-
-    def test_run_ko(self):
-        sys.modules['baro_tests'].collectd.main = mock.Mock(return_value=1)
-        self.assertEqual(self.barometer.run(),
-                         testcase.TestCase.EX_RUN_ERROR)
-
-    def test_run(self):
-        sys.modules['baro_tests'].collectd.main = mock.Mock(return_value=0)
-        self.assertEqual(self.barometer.run(), testcase.TestCase.EX_OK)
-
-
-if __name__ == "__main__":
-    logging.disable(logging.CRITICAL)
-    unittest.main(verbosity=2)