From e71d2419adaf42adf88dfbacb4269e0a5d30708c Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Thu, 19 Sep 2024 00:03:15 +0900
Subject: [PATCH] Squash tass.ini and taas_plugin.ini

Both of these files contain options loaded by neutron-server. This
follows how the config files are generated in the other plugins such
as neutron-vpnaas.

Also create a separate config file to capture agent options.

Change-Id: I0a6a28c1200d00a35ab2a8d23abfe14b0247f140
---
 etc/oslo-config-generator/taas_agent.ini                | 5 +++++
 etc/oslo-config-generator/{taas.ini => taas_plugin.ini} | 2 +-
 etc/taas_plugin.ini                                     | 7 -------
 neutron_taas/opts.py                                    | 8 ++++++--
 4 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100644 etc/oslo-config-generator/taas_agent.ini
 rename etc/oslo-config-generator/{taas.ini => taas_plugin.ini} (55%)
 delete mode 100644 etc/taas_plugin.ini

diff --git a/etc/oslo-config-generator/taas_agent.ini b/etc/oslo-config-generator/taas_agent.ini
new file mode 100644
index 00000000..5424c74e
--- /dev/null
+++ b/etc/oslo-config-generator/taas_agent.ini
@@ -0,0 +1,5 @@
+[DEFAULT]
+output_file = etc/taas_agent.ini.sample
+wrap_width = 79
+
+namespace = neutron.taas.agent
diff --git a/etc/oslo-config-generator/taas.ini b/etc/oslo-config-generator/taas_plugin.ini
similarity index 55%
rename from etc/oslo-config-generator/taas.ini
rename to etc/oslo-config-generator/taas_plugin.ini
index 5587bd54..a89a91e8 100644
--- a/etc/oslo-config-generator/taas.ini
+++ b/etc/oslo-config-generator/taas_plugin.ini
@@ -1,5 +1,5 @@
 [DEFAULT]
-output_file = etc/taas.ini.sample
+output_file = etc/taas_plugin.ini.sample
 wrap_width = 79
 
 namespace = neutron.taas
diff --git a/etc/taas_plugin.ini b/etc/taas_plugin.ini
deleted file mode 100644
index 53800f62..00000000
--- a/etc/taas_plugin.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[DEFAULT]
-
-
-[service_providers]
-# Defines providers for advanced services using the format:
-# <service_type>:<name>:<driver>[:default] (multi valued)
-service_provider = TAAS:TAAS:neutron_taas.services.taas.service_drivers.taas_rpc.TaasRpcDriver:default
diff --git a/neutron_taas/opts.py b/neutron_taas/opts.py
index e90ffc57..0f325e5e 100644
--- a/neutron_taas/opts.py
+++ b/neutron_taas/opts.py
@@ -10,18 +10,22 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
+import neutron.services.provider_configuration
+
 import neutron_taas.common.config
-import neutron_taas.services.taas.agents.extensions
+import neutron_taas.services.taas.agents.extensions.taas
 
 
 def list_agent_opts():
     return [
-        ('DEFAULT', neutron_taas.services.taas.agents.extensions.OPTS)
+        ('DEFAULT', neutron_taas.services.taas.agents.extensions.taas.OPTS)
     ]
 
 
 def list_opts():
     return [
+        ('service_providers',
+         neutron.services.provider_configuration.serviceprovider_opts),
         ('quotas', neutron_taas.common.config.taas_quota_opts),
         ('taas', neutron_taas.common.config.taas_opts)
     ]