From f78d30e1c696ffe575524d2547cba843f2ebd7be Mon Sep 17 00:00:00 2001 From: Chandan Kumar Date: Thu, 25 May 2017 23:43:01 +0530 Subject: [PATCH] Remove tricircle tempest plugin * The tricircle projects contains the skeletion of tempest plugin and there is nothing implemented with in the plugin and the existing plugin extension is breaking the tempest cli. So it is better to completely remove the plugin. * In future, if we need tempest plugin for tricircle, we need to implement in a seperate repo. Change-Id: I2dbf532ae9b33035187f92b9092af6d26eaba338 Closes-Bug: #1693546 --- setup.cfg | 3 -- test-requirements.txt | 1 - tricircle/tempestplugin/README.rst | 6 --- tricircle/tempestplugin/__init__.py | 0 tricircle/tempestplugin/config.py | 16 -------- tricircle/tempestplugin/plugin.py | 38 ------------------- tricircle/tempestplugin/services/__init__.py | 0 tricircle/tempestplugin/tests/__init__.py | 0 tricircle/tempestplugin/tests/api/__init__.py | 0 tricircle/tempestplugin/tests/api/base.py | 29 -------------- .../tempestplugin/tests/api/test_sample.py | 32 ---------------- .../tempestplugin/tests/scenario/__init__.py | 0 12 files changed, 125 deletions(-) delete mode 100644 tricircle/tempestplugin/README.rst delete mode 100644 tricircle/tempestplugin/__init__.py delete mode 100644 tricircle/tempestplugin/config.py delete mode 100644 tricircle/tempestplugin/plugin.py delete mode 100644 tricircle/tempestplugin/services/__init__.py delete mode 100644 tricircle/tempestplugin/tests/__init__.py delete mode 100644 tricircle/tempestplugin/tests/api/__init__.py delete mode 100644 tricircle/tempestplugin/tests/api/base.py delete mode 100644 tricircle/tempestplugin/tests/api/test_sample.py delete mode 100644 tricircle/tempestplugin/tests/scenario/__init__.py diff --git a/setup.cfg b/setup.cfg index 4c8aae0f..3bdfa964 100644 --- a/setup.cfg +++ b/setup.cfg @@ -57,9 +57,6 @@ oslo.config.opts = tricircle.network = tricircle.network.opts:list_opts tricircle.xjob = tricircle.xjob.opts:list_opts -tempest.test_plugins = - tricircle_tests = tricircle.tempestplugin.plugin:TricircleTempestPlugin - tricircle.network.type_drivers = local = tricircle.network.drivers.type_local:LocalTypeDriver vlan = tricircle.network.drivers.type_vlan:VLANTypeDriver diff --git a/test-requirements.txt b/test-requirements.txt index d9e8b89a..475e2a50 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -17,6 +17,5 @@ testresources>=0.2.4 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD oslotest>=1.10.0 # Apache-2.0 os-testr>=0.8.0 # Apache-2.0 -tempest-lib>=0.14.0 # Apache-2.0 ddt>=1.0.1 # MIT reno>=1.8.0 # Apache-2.0 diff --git a/tricircle/tempestplugin/README.rst b/tricircle/tempestplugin/README.rst deleted file mode 100644 index 8668a709..00000000 --- a/tricircle/tempestplugin/README.rst +++ /dev/null @@ -1,6 +0,0 @@ -=============================================== -Tempest Integration of Tricircle -=============================================== - -This directory contains Tempest tests to cover the Tricircle project. - diff --git a/tricircle/tempestplugin/__init__.py b/tricircle/tempestplugin/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tricircle/tempestplugin/config.py b/tricircle/tempestplugin/config.py deleted file mode 100644 index 51e4b7e7..00000000 --- a/tricircle/tempestplugin/config.py +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2016 Huawei Technologies Co., Ltd. -# All Rights Reserved. -# -# 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 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from tricircle.common import config as t_config # noqa diff --git a/tricircle/tempestplugin/plugin.py b/tricircle/tempestplugin/plugin.py deleted file mode 100644 index e0b48382..00000000 --- a/tricircle/tempestplugin/plugin.py +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2015 -# All Rights Reserved. -# -# 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 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - - -import os - -from tempest import config # noqa -from tempest.test_discover import plugins - -from tricircle.tempestplugin import config as project_config # noqa - - -class TricircleTempestPlugin(plugins.TempestPlugin): - - def load_tests(self): - base_path = os.path.split(os.path.dirname( - os.path.abspath(__file__)))[0] - test_dir = "tempestplugin/tests" - full_test_dir = os.path.join(base_path, test_dir) - return full_test_dir, base_path - - def register_opts(self, conf): - pass - - def get_opt_lists(self): - pass diff --git a/tricircle/tempestplugin/services/__init__.py b/tricircle/tempestplugin/services/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tricircle/tempestplugin/tests/__init__.py b/tricircle/tempestplugin/tests/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tricircle/tempestplugin/tests/api/__init__.py b/tricircle/tempestplugin/tests/api/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tricircle/tempestplugin/tests/api/base.py b/tricircle/tempestplugin/tests/api/base.py deleted file mode 100644 index 7e093e0a..00000000 --- a/tricircle/tempestplugin/tests/api/base.py +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2016 Huawei Technologies Co., Ltd. -# All Rights Reserved. -# -# 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 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from oslo_log import log as logging - -from tempest import config -from tempest import test - -CONF = config.CONF -LOG = logging.getLogger(__name__) - - -class BaseTricircleTest(test.BaseTestCase): - - @classmethod - def skip_checks(cls): - pass diff --git a/tricircle/tempestplugin/tests/api/test_sample.py b/tricircle/tempestplugin/tests/api/test_sample.py deleted file mode 100644 index 86413a91..00000000 --- a/tricircle/tempestplugin/tests/api/test_sample.py +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (c) 2016 Huawei Technologies Co., Ltd. -# All Rights Reserved. -# -# 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 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from tempest.lib import decorators -from tricircle.tempestplugin.tests.api import base - - -class TestTricircleSample(base.BaseTricircleTest): - - @classmethod - def resource_setup(cls): - super(TestTricircleSample, cls).resource_setup() - - @decorators.attr(type="smoke") - def test_sample(self): - self.assertEqual('Tricircle Sample Test!', 'Tricircle Sample Test!') - - @classmethod - def resource_cleanup(cls): - super(TestTricircleSample, cls).resource_cleanup() diff --git a/tricircle/tempestplugin/tests/scenario/__init__.py b/tricircle/tempestplugin/tests/scenario/__init__.py deleted file mode 100644 index e69de29b..00000000