Merge "Remove tricircle tempest plugin"

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

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

tricircle/tempestplugin/README.rst

@@ -1,6 +0,0 @@
-===============================================
-Tempest Integration of Tricircle
-===============================================
-
-This directory contains Tempest tests to cover the Tricircle project.
-

tricircle/tempestplugin/config.py

@@ -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

tricircle/tempestplugin/plugin.py

@@ -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

tricircle/tempestplugin/tests/api/base.py

@@ -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

tricircle/tempestplugin/tests/api/test_sample.py

@@ -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()