Merge "Refactor options definitons"

This commit is contained in:
Zuul 2018-09-12 06:41:38 +00:00 committed by Gerrit Code Review
commit cccf230d10
2 changed files with 30 additions and 87 deletions

View File

@ -25,56 +25,29 @@ ports_pool_batch = cfg.IntOpt("ports_pool_batch",
help="The size of pool batch when "
"KURYR_USE_PORT_POOLS is enabled")
port_pool_enabled = cfg.BoolOpt("port_pool_enabled",
default=False,
help="Whether or not port pool feature is "
"enabled")
lb_build_timeout = cfg.IntOpt("lb_build_timeout",
default=900,
help="The max time (in seconds) it should take "
"to create LB")
namespace_enabled = cfg.BoolOpt("namespace_enabled",
default=False,
help="Whether or not namespace handler and "
"driver are enabled")
network_policy_enabled = cfg.BoolOpt("network_policy_enabled",
default=False,
help="Whether or not network policy "
"handler and driver are enabled")
service_tests_enabled = cfg.BoolOpt("service_tests_enabled",
default=True,
help="Whether or not service tests "
"will be running")
containerized = cfg.BoolOpt("containerized",
default=False,
help="Whether or not kuryr-controller and "
"kuryr-cni are containerized")
kube_system_namespace = cfg.StrOpt("kube_system_namespace",
default="kube-system",
help="Namespace where kuryr-controllers "
"and kuryr-cnis run")
run_tests_serial = cfg.BoolOpt("run_tests_serial",
default=False,
help="Whether or not test run serially or "
"in parallel")
kubernetes_project_name = cfg.StrOpt("kubernetes_project_name",
default="k8s",
help="The OpenStack project name "
"for Kubernetes")
npwg_multi_vif_enabled = cfg.BoolOpt("npwg_multi_vif_enabled",
default=False,
help="Whether or not NPWG multi-vif "
"feature is enabled")
ocp_router_fip = cfg.StrOpt("ocp_router_fip",
default=None,
help="OCP Router floating IP")
kuryr_k8s_opts = [
cfg.BoolOpt("port_pool_enabled", default=False,
help="Whether or not port pool feature is enabled"),
cfg.IntOpt("lb_build_timeout", default=900,
help="The max time (in seconds) it should take to create LB"),
cfg.BoolOpt("namespace_enabled", default=False,
help="Whether or not namespace handler and driver are "
"enabled"),
cfg.BoolOpt("network_policy_enabled", default=False,
help="Whether or not network policy handler and driver are "
"enabled"),
cfg.BoolOpt("service_tests_enabled", default=True,
help="Whether or not service tests will be running"),
cfg.BoolOpt("containerized", default=False,
help="Whether or not kuryr-controller and kuryr-cni are "
"containerized"),
cfg.StrOpt("kube_system_namespace", default="kube-system",
help="Namespace where kuryr-controllers and kuryr-cnis run"),
cfg.BoolOpt("run_tests_serial", default=False,
help="Whether or not test run serially or in parallel"),
cfg.StrOpt("kubernetes_project_name", default="k8s",
help="The OpenStack project name for Kubernetes"),
cfg.BoolOpt("npwg_multi_vif_enabled", default=False,
help="Whether or not NPWG multi-vif feature is enabled"),
cfg.StrOpt("ocp_router_fip", default=None, help="OCP Router floating IP"),
]

View File

@ -34,40 +34,10 @@ class KuryrTempestPlugin(plugins.TempestPlugin):
group='service_available')
conf.register_opt(project_config.ports_pool_batch,
group='vif_pool')
conf.register_opt(project_config.port_pool_enabled,
group='kuryr_kubernetes')
conf.register_opt(project_config.lb_build_timeout,
group='kuryr_kubernetes'),
conf.register_opt(project_config.containerized,
group='kuryr_kubernetes')
conf.register_opt(project_config.namespace_enabled,
group='kuryr_kubernetes')
conf.register_opt(project_config.network_policy_enabled,
group='kuryr_kubernetes')
conf.register_opt(project_config.service_tests_enabled,
group='kuryr_kubernetes')
conf.register_opt(project_config.kube_system_namespace,
group='kuryr_kubernetes')
conf.register_opt(project_config.run_tests_serial,
group='kuryr_kubernetes')
conf.register_opt(project_config.kubernetes_project_name,
group='kuryr_kubernetes')
conf.register_opt(project_config.npwg_multi_vif_enabled,
group='kuryr_kubernetes')
conf.register_opt(project_config.ocp_router_fip,
group='kuryr_kubernetes')
conf.register_opts(project_config.kuryr_k8s_opts,
group='kuryr_kubernetes')
def get_opt_lists(self):
return [('service_available', [project_config.service_option]),
('kuryr_kubernetes', [project_config.port_pool_enabled,
project_config.namespace_enabled,
project_config.network_policy_enabled,
project_config.service_tests_enabled,
project_config.containerized,
project_config.kube_system_namespace,
project_config.run_tests_serial,
project_config.npwg_multi_vif_enabled,
project_config.ocp_router_fip]),
('vif_pool', [project_config.ports_pool_batch,
project_config.lb_build_timeout])]
('kuryr_kubernetes', project_config.kuryr_k8s_opts),
('vif_pool', [project_config.ports_pool_batch])]