diff --git a/setup.cfg b/setup.cfg index b57628c..a2ecae6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -45,3 +45,7 @@ input_file = solum_tempest_plugin/locale/solum_tempest_plugin.pot keywords = _ gettext ngettext l_ lazy_gettext mapping_file = babel.cfg output_file = solum_tempest_plugin/locale/solum_tempest_plugin.pot + +[entry_points] +tempest.test_plugins = + solum_tests = solum_tempest_plugin.plugin:SolumTempestPlugin diff --git a/solum_tempest_plugin/config.py b/solum_tempest_plugin/config.py new file mode 100644 index 0000000..2126ea8 --- /dev/null +++ b/solum_tempest_plugin/config.py @@ -0,0 +1,20 @@ +# 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_config import cfg + + +service_option = cfg.BoolOpt("solum", + default=True, + help="Whether or not solum is expected to be " + "available") diff --git a/solum_tempest_plugin/plugin.py b/solum_tempest_plugin/plugin.py new file mode 100644 index 0000000..616f958 --- /dev/null +++ b/solum_tempest_plugin/plugin.py @@ -0,0 +1,35 @@ +# 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.test_discover import plugins + +from solum_tempest_plugin import config as solum_config + + +class SolumTempestPlugin(plugins.TempestPlugin): + def load_tests(self): + base_path = os.path.split(os.path.dirname( + os.path.abspath(__file__)))[0] + test_dir = "solum_tempest_plugin/tests" + full_test_dir = os.path.join(base_path, test_dir) + return full_test_dir, base_path + + def register_opts(self, conf): + conf.register_opt(solum_config.service_option, + group='service_available') + + def get_opt_lists(self): + return [('service_available', [solum_config.service_option])] diff --git a/solum_tempest_plugin/camp/__init__.py b/solum_tempest_plugin/tests/__init__.py similarity index 100% rename from solum_tempest_plugin/camp/__init__.py rename to solum_tempest_plugin/tests/__init__.py diff --git a/solum_tempest_plugin/camp/v1_1/__init__.py b/solum_tempest_plugin/tests/application_deployment/__init__.py similarity index 100% rename from solum_tempest_plugin/camp/v1_1/__init__.py rename to solum_tempest_plugin/tests/application_deployment/__init__.py diff --git a/solum_tempest_plugin/v1/__init__.py b/solum_tempest_plugin/tests/application_deployment/camp/__init__.py similarity index 100% rename from solum_tempest_plugin/v1/__init__.py rename to solum_tempest_plugin/tests/application_deployment/camp/__init__.py diff --git a/solum_tempest_plugin/camp/test_platform_endpoints.py b/solum_tempest_plugin/tests/application_deployment/camp/test_platform_endpoints.py similarity index 100% rename from solum_tempest_plugin/camp/test_platform_endpoints.py rename to solum_tempest_plugin/tests/application_deployment/camp/test_platform_endpoints.py diff --git a/solum_tempest_plugin/v1/public/__init__.py b/solum_tempest_plugin/tests/application_deployment/camp/v1_1/__init__.py similarity index 100% rename from solum_tempest_plugin/v1/public/__init__.py rename to solum_tempest_plugin/tests/application_deployment/camp/v1_1/__init__.py diff --git a/solum_tempest_plugin/camp/v1_1/test_assemblies.py b/solum_tempest_plugin/tests/application_deployment/camp/v1_1/test_assemblies.py similarity index 98% rename from solum_tempest_plugin/camp/v1_1/test_assemblies.py rename to solum_tempest_plugin/tests/application_deployment/camp/v1_1/test_assemblies.py index a57f983..a99a309 100644 --- a/solum_tempest_plugin/camp/v1_1/test_assemblies.py +++ b/solum_tempest_plugin/tests/application_deployment/camp/v1_1/test_assemblies.py @@ -17,7 +17,8 @@ from tempest.lib import exceptions as tempest_exceptions import yaml from solum_tempest_plugin import base -from solum_tempest_plugin.camp.v1_1 import test_plans +from solum_tempest_plugin.tests.application_deployment.camp.v1_1 \ + import test_plans class TestAssembliesController(base.TestCase): diff --git a/solum_tempest_plugin/camp/v1_1/test_formats.py b/solum_tempest_plugin/tests/application_deployment/camp/v1_1/test_formats.py similarity index 100% rename from solum_tempest_plugin/camp/v1_1/test_formats.py rename to solum_tempest_plugin/tests/application_deployment/camp/v1_1/test_formats.py diff --git a/solum_tempest_plugin/camp/v1_1/test_parameter_definitions.py b/solum_tempest_plugin/tests/application_deployment/camp/v1_1/test_parameter_definitions.py similarity index 100% rename from solum_tempest_plugin/camp/v1_1/test_parameter_definitions.py rename to solum_tempest_plugin/tests/application_deployment/camp/v1_1/test_parameter_definitions.py diff --git a/solum_tempest_plugin/camp/v1_1/test_plans.py b/solum_tempest_plugin/tests/application_deployment/camp/v1_1/test_plans.py similarity index 99% rename from solum_tempest_plugin/camp/v1_1/test_plans.py rename to solum_tempest_plugin/tests/application_deployment/camp/v1_1/test_plans.py index 29724a0..0ebcaba 100644 --- a/solum_tempest_plugin/camp/v1_1/test_plans.py +++ b/solum_tempest_plugin/tests/application_deployment/camp/v1_1/test_plans.py @@ -18,7 +18,8 @@ from tempest.lib import exceptions as tempest_exceptions import yaml from solum_tempest_plugin import base -from solum_tempest_plugin.v1 import test_plan as solum_tests +from solum_tempest_plugin.tests.application_deployment.v1 import test_plan \ + as solum_tests sample_data = {"camp_version": "CAMP 1.1", diff --git a/solum_tempest_plugin/camp/v1_1/test_platform.py b/solum_tempest_plugin/tests/application_deployment/camp/v1_1/test_platform.py similarity index 100% rename from solum_tempest_plugin/camp/v1_1/test_platform.py rename to solum_tempest_plugin/tests/application_deployment/camp/v1_1/test_platform.py diff --git a/solum_tempest_plugin/camp/v1_1/test_type_definitions.py b/solum_tempest_plugin/tests/application_deployment/camp/v1_1/test_type_definitions.py similarity index 100% rename from solum_tempest_plugin/camp/v1_1/test_type_definitions.py rename to solum_tempest_plugin/tests/application_deployment/camp/v1_1/test_type_definitions.py diff --git a/solum_tempest_plugin/test_release.py b/solum_tempest_plugin/tests/application_deployment/test_release.py similarity index 100% rename from solum_tempest_plugin/test_release.py rename to solum_tempest_plugin/tests/application_deployment/test_release.py diff --git a/solum_tempest_plugin/test_versions.py b/solum_tempest_plugin/tests/application_deployment/test_versions.py similarity index 100% rename from solum_tempest_plugin/test_versions.py rename to solum_tempest_plugin/tests/application_deployment/test_versions.py diff --git a/solum_tempest_plugin/tests/application_deployment/v1/__init__.py b/solum_tempest_plugin/tests/application_deployment/v1/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/solum_tempest_plugin/tests/application_deployment/v1/public/__init__.py b/solum_tempest_plugin/tests/application_deployment/v1/public/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/solum_tempest_plugin/v1/public/test_trigger.py b/solum_tempest_plugin/tests/application_deployment/v1/public/test_trigger.py similarity index 100% rename from solum_tempest_plugin/v1/public/test_trigger.py rename to solum_tempest_plugin/tests/application_deployment/v1/public/test_trigger.py diff --git a/solum_tempest_plugin/v1/test_app.py b/solum_tempest_plugin/tests/application_deployment/v1/test_app.py similarity index 100% rename from solum_tempest_plugin/v1/test_app.py rename to solum_tempest_plugin/tests/application_deployment/v1/test_app.py diff --git a/solum_tempest_plugin/v1/test_assembly.py b/solum_tempest_plugin/tests/application_deployment/v1/test_assembly.py similarity index 100% rename from solum_tempest_plugin/v1/test_assembly.py rename to solum_tempest_plugin/tests/application_deployment/v1/test_assembly.py diff --git a/solum_tempest_plugin/v1/test_component.py b/solum_tempest_plugin/tests/application_deployment/v1/test_component.py similarity index 100% rename from solum_tempest_plugin/v1/test_component.py rename to solum_tempest_plugin/tests/application_deployment/v1/test_component.py diff --git a/solum_tempest_plugin/v1/test_extension.py b/solum_tempest_plugin/tests/application_deployment/v1/test_extension.py similarity index 100% rename from solum_tempest_plugin/v1/test_extension.py rename to solum_tempest_plugin/tests/application_deployment/v1/test_extension.py diff --git a/solum_tempest_plugin/v1/test_language_pack.py b/solum_tempest_plugin/tests/application_deployment/v1/test_language_pack.py similarity index 100% rename from solum_tempest_plugin/v1/test_language_pack.py rename to solum_tempest_plugin/tests/application_deployment/v1/test_language_pack.py diff --git a/solum_tempest_plugin/v1/test_operation.py b/solum_tempest_plugin/tests/application_deployment/v1/test_operation.py similarity index 100% rename from solum_tempest_plugin/v1/test_operation.py rename to solum_tempest_plugin/tests/application_deployment/v1/test_operation.py diff --git a/solum_tempest_plugin/v1/test_plan.py b/solum_tempest_plugin/tests/application_deployment/v1/test_plan.py similarity index 100% rename from solum_tempest_plugin/v1/test_plan.py rename to solum_tempest_plugin/tests/application_deployment/v1/test_plan.py diff --git a/solum_tempest_plugin/v1/test_root.py b/solum_tempest_plugin/tests/application_deployment/v1/test_root.py similarity index 100% rename from solum_tempest_plugin/v1/test_root.py rename to solum_tempest_plugin/tests/application_deployment/v1/test_root.py diff --git a/solum_tempest_plugin/v1/test_sensor.py b/solum_tempest_plugin/tests/application_deployment/v1/test_sensor.py similarity index 100% rename from solum_tempest_plugin/v1/test_sensor.py rename to solum_tempest_plugin/tests/application_deployment/v1/test_sensor.py diff --git a/solum_tempest_plugin/v1/test_service.py b/solum_tempest_plugin/tests/application_deployment/v1/test_service.py similarity index 100% rename from solum_tempest_plugin/v1/test_service.py rename to solum_tempest_plugin/tests/application_deployment/v1/test_service.py