Merge "Add missed parameters in auto-generated config"

etc/config-generator.conf

@@ -2,30 +2,36 @@
 output_file = etc/tacker/tacker.conf.sample
 wrap_width = 79
 namespace = glance.store
-namespace = tacker.common.config
-namespace = tacker.conf
-namespace = tacker.wsgi
-namespace = tacker.service
-namespace = tacker.nfvo.nfvo_plugin
-namespace = tacker.nfvo.drivers.vim.openstack_driver
-namespace = tacker.nfvo.drivers.vim.kubernetes_driver
-namespace = tacker.keymgr
-namespace = tacker.vnflcm.vnflcm_driver
-namespace = tacker.vnfm.monitor
-namespace = tacker.vnfm.plugin
-namespace = tacker.vnfm.infra_drivers.openstack.openstack
-namespace = tacker.vnfm.infra_drivers.kubernetes.kubernetes_driver
-namespace = tacker.vnfm.mgmt_drivers.openwrt.openwrt
-namespace = tacker.vnfm.monitor_drivers.http_ping.http_ping
-namespace = tacker.vnfm.monitor_drivers.ping.ping
-namespace = tacker.vnfm.monitor_drivers.ceilometer.ceilometer
-namespace = tacker.alarm_receiver
 namespace = keystonemiddleware.auth_token
-namespace = oslo.middleware
-namespace = oslo.messaging
 namespace = oslo.db
 namespace = oslo.log
+namespace = oslo.messaging
+namespace = oslo.middleware
 namespace = oslo.policy
 namespace = oslo.reports
 namespace = oslo.service.periodic_tasks
 namespace = oslo.service.service
+namespace = tacker.alarm_receiver
+namespace = tacker.auth
+namespace = tacker.common.config
+namespace = tacker.conductor.conductor_server
+namespace = tacker.conf
+namespace = tacker.keymgr
+namespace = tacker.nfvo.drivers.vim.kubernetes_driver
+namespace = tacker.nfvo.drivers.vim.openstack_driver
+namespace = tacker.nfvo.nfvo_plugin
+namespace = tacker.plugins.fenix
+namespace = tacker.service
+namespace = tacker.sol_refactored.common.config
+namespace = tacker.vnflcm.vnflcm_driver
+namespace = tacker.vnfm.infra_drivers.kubernetes.kubernetes_driver
+namespace = tacker.vnfm.infra_drivers.openstack.openstack
+namespace = tacker.vnfm.infra_drivers.openstack.translate_template
+namespace = tacker.vnfm.mgmt_drivers.openwrt.openwrt
+namespace = tacker.vnfm.monitor
+namespace = tacker.vnfm.monitor_drivers.ceilometer.ceilometer
+namespace = tacker.vnfm.monitor_drivers.http_ping.http_ping
+namespace = tacker.vnfm.monitor_drivers.ping.ping
+namespace = tacker.vnfm.nfvo_client
+namespace = tacker.vnfm.plugin
+namespace = tacker.wsgi

setup.cfg

@@ -77,26 +77,30 @@ tacker.tacker.policy.actions =
     log_and_kill = tacker.vnfm.policy_actions.log.log:VNFActionLogAndKill
     vdu_autoheal = tacker.vnfm.policy_actions.vdu_autoheal.vdu_autoheal:VNFActionVduAutoheal
 oslo.config.opts =
+    tacker.alarm_receiver = tacker.alarm_receiver:config_opts
+    tacker.auth = tacker.auth:config_opts
     tacker.common.config = tacker.common.config:config_opts
+    tacker.conductor.conductor_server = tacker.conductor.conductor_server:config_opts
     tacker.conf = tacker.conf.opts:list_opts
-    tacker.wsgi = tacker.wsgi:config_opts
-    tacker.service = tacker.service:config_opts
-    tacker.nfvo.nfvo_plugin = tacker.nfvo.nfvo_plugin:config_opts
-    tacker.nfvo.drivers.vim.openstack_driver = tacker.nfvo.drivers.vim.openstack_driver:config_opts
-    tacker.nfvo.drivers.vim.kubernetes_driver = tacker.nfvo.drivers.vim.kubernetes_driver:config_opts
     tacker.keymgr = tacker.keymgr:config_opts
-    tacker.vnfm.monitor = tacker.vnfm.monitor:config_opts
-    tacker.vnfm.plugin = tacker.vnfm.plugin:config_opts
-    tacker.vnfm.infra_drivers.openstack.openstack= tacker.vnfm.infra_drivers.openstack.openstack:config_opts
+    tacker.nfvo.drivers.vim.kubernetes_driver = tacker.nfvo.drivers.vim.kubernetes_driver:config_opts
+    tacker.nfvo.drivers.vim.openstack_driver = tacker.nfvo.drivers.vim.openstack_driver:config_opts
+    tacker.nfvo.nfvo_plugin = tacker.nfvo.nfvo_plugin:config_opts
+    tacker.plugins.fenix = tacker.plugins.fenix:config_opts
+    tacker.service = tacker.service:config_opts
+    tacker.sol_refactored.common.config = tacker.sol_refactored.common.config:config_opts
+    tacker.vnflcm.vnflcm_driver = tacker.vnflcm.vnflcm_driver:config_opts
     tacker.vnfm.infra_drivers.kubernetes.kubernetes_driver = tacker.vnfm.infra_drivers.kubernetes.kubernetes_driver:config_opts
+    tacker.vnfm.infra_drivers.openstack.openstack = tacker.vnfm.infra_drivers.openstack.openstack:config_opts
+    tacker.vnfm.infra_drivers.openstack.translate_template = tacker.vnfm.infra_drivers.openstack.translate_template:config_opts
     tacker.vnfm.mgmt_drivers.openwrt.openwrt = tacker.vnfm.mgmt_drivers.openwrt.openwrt:config_opts
+    tacker.vnfm.monitor = tacker.vnfm.monitor:config_opts
+    tacker.vnfm.monitor_drivers.ceilometer.ceilometer = tacker.vnfm.monitor_drivers.ceilometer.ceilometer:config_opts
     tacker.vnfm.monitor_drivers.http_ping.http_ping = tacker.vnfm.monitor_drivers.http_ping.http_ping:config_opts
     tacker.vnfm.monitor_drivers.ping.ping = tacker.vnfm.monitor_drivers.ping.ping:config_opts
-    tacker.vnfm.monitor_drivers.ceilometer.ceilometer = tacker.vnfm.monitor_drivers.ceilometer.ceilometer:config_opts
-    tacker.vnfm.monitor_drivers.zabbix.zabbix = tacker.vnfm.monitor_drivers.zabbix.zabbix:config_opts
-    tacker.vnflcm.vnflcm_driver = tacker.vnflcm.vnflcm_driver:config_opts
-    tacker.alarm_receiver = tacker.alarm_receiver:config_opts
-    tacker.plugins.fenix = tacker.plugins.fenix:config_opts
+    tacker.vnfm.nfvo_client = tacker.vnfm.nfvo_client:config_opts
+    tacker.vnfm.plugin = tacker.vnfm.plugin:config_opts
+    tacker.wsgi = tacker.wsgi:config_opts
 
 mistral.actions =
     tacker.vim_ping_action = tacker.nfvo.workflows.vim_monitor.vim_ping_action:PingVimAction

tacker/auth.py

@@ -30,6 +30,11 @@ from tacker import context
 LOG = logging.getLogger(__name__)
 
 
+def config_opts():
+    return [('authentication', _AuthManager.OPTS),
+            ('authentication', _AuthValidateManager.auth_opts)]
+
+
 class TackerKeystoneContext(base.ConfigurableMiddleware):
     """Make a request context from keystone headers."""
 
@@ -446,7 +451,7 @@ class _AuthValidateBasic(_AuthBase):
 
 class _AuthValidateManager:
 
-    atuh_opts = [
+    auth_opts = [
         cfg.StrOpt('token_type',
                 default=None,
                 choices=['Bearer', 'Basic'],
@@ -461,7 +466,7 @@ class _AuthValidateManager:
                 default=None,
                 help="URL of the authorization server")
     ]
-    cfg.CONF.register_opts(atuh_opts, group='authentication')
+    cfg.CONF.register_opts(auth_opts, group='authentication')
 
     def __init__(self):
         self.__manages = {}

tacker/conductor/conductor_server.py

@@ -109,6 +109,10 @@ cfg.CONF.register_opts(OPTS, 'keystone_authtoken')
 LOG = logging.getLogger(__name__)
 
 
+def config_opts():
+    return [('keystone_authtoken', OPTS)]
+
+
 def _delete_csar(context, vnf_package):
     # Delete from glance store
     glance_store.delete_csar(context, vnf_package.id,

tacker/nfvo/drivers/vim/openstack_driver.py

@@ -86,7 +86,8 @@ SFC_ENCAP = 'sfc_encap'
 
 
 def config_opts():
-    return [('vim_keys', OPTS), ('vim_monitor', OPENSTACK_OPTS)]
+    return [('vim_keys', OPTS),
+            ('vim_monitor', OPENSTACK_OPTS)]
 
 
 class OpenStack_Driver(abstract_vim_driver.VimAbstractDriver,

tacker/sol_refactored/common/config.py

@@ -80,3 +80,8 @@ NFVO_OPTS = [
 ]
 
 CONF.register_opts(NFVO_OPTS, 'v2_nfvo')
+
+
+def config_opts():
+    return [('v2_nfvo', NFVO_OPTS),
+            ('v2_vnfm', VNFM_OPTS)]

tacker/vnfm/infra_drivers/openstack/translate_template.py

@@ -50,6 +50,10 @@ ALARMING_POLICY = 'tosca.policies.tacker.Alarming'
 SCALING_POLICY = 'tosca.policies.tacker.Scaling'
 
 
+def config_opts():
+    return [('openstack_vim', OPTS)]
+
+
 class TOSCAToHOT(object):
     """Convert TOSCA template to HOT template."""
 

tacker/vnfm/nfvo_client.py

@@ -23,6 +23,11 @@ from oslo_log import log as logging
 LOG = logging.getLogger(__name__)
 
 
+def config_opts():
+    return [('connect_vnf_packages', VnfPackageRequest.OPTS),
+            ('connect_grant', GrantRequest.OPTS)]
+
+
 class UndefinedExternalSettingException(Exception):
     pass