diff --git a/novajoin_tempest_plugin/config.py b/novajoin_tempest_plugin/config.py new file mode 100644 index 0000000..3f4cd06 --- /dev/null +++ b/novajoin_tempest_plugin/config.py @@ -0,0 +1,34 @@ +# Copyright 2016 Red Hat +# 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_config import cfg + +service_option = cfg.BoolOpt("novajoin", + default=True, + help="Whether or not novajoin is expected to be " + "available") + +ipa_group = cfg.OptGroup( + name="ipa", + title="IPA connection information") + +IpaGroup = [ + cfg.StrOpt('username', + default='admin', + help='User to connect to IPA'), + cfg.StrOpt('password', + default='password', + help='Password to connect to IPA'), +] diff --git a/novajoin_tempest_plugin/plugin.py b/novajoin_tempest_plugin/plugin.py index 666ba3b..e5f4828 100644 --- a/novajoin_tempest_plugin/plugin.py +++ b/novajoin_tempest_plugin/plugin.py @@ -18,6 +18,8 @@ import os from tempest.test_discover import plugins +from novajoin_tempest_plugin import config as project_config + class NovajoinTempestPlugin(plugins.TempestPlugin): def load_tests(self): @@ -28,7 +30,14 @@ class NovajoinTempestPlugin(plugins.TempestPlugin): return full_test_dir, base_path def register_opts(self, conf): - pass + conf.register_opt(project_config.service_option, + group='service_available') + + # Register ipa connection options + conf.register_group(project_config.ipa_group) + conf.register_opts(project_config.IpaGroup, + project_config.ipa_group) def get_opt_lists(self): - pass + return [('service_available', [project_config.service_option]), + (project_config.ipa_group.name, project_config.IpaGroup)]