nova: move accelerator and benchmark options to correct place

Author: alvarolopez

caso/extract/base.py

@@ -54,64 +54,8 @@
     ),
 ]
 
-accelerator_opts = [
-    cfg.StrOpt(
-        "type_key",
-        default="Accelerator:Type",
-        deprecated_name="accelerator_type_key",
-        deprecated_group="DEFAULT",
-        help="Metadata key used to retrieve the accelerator type "
-        "from the flavor properties.",
-    ),
-    cfg.StrOpt(
-        "vendor_key",
-        default="Accelerator:Vendor",
-        deprecated_name="accelerator_vendor_key",
-        deprecated_group="DEFAULT",
-        help="Metadata key used to retrieve the accelerator vendor "
-        "from the flavor properties.",
-    ),
-    cfg.StrOpt(
-        "model_key",
-        default="Accelerator:Model",
-        deprecated_name="accelerator_model_key",
-        deprecated_group="DEFAULT",
-        help="Metadata key used to retrieve the accelerator model "
-        "from the flavor properties.",
-    ),
-    cfg.StrOpt(
-        "number_key",
-        default="Accelerator:Number",
-        deprecated_name="accelerator_number_key",
-        deprecated_group="DEFAULT",
-        help="Metadata key used to retrieve the accelerator number "
-        "from the flavor properties.",
-    ),
-]
-
-benchmark_opts = [
-    cfg.StrOpt(
-        "name_key",
-        default="accounting:benchmark_type",
-        deprecated_name="benchmark_name_key",
-        deprecated_group="DEFAULT",
-        help="Metadata key used to retrieve the benchmark type "
-        "from the flavor properties.",
-    ),
-    cfg.StrOpt(
-        "value_key",
-        default="accounting:benchmark_value",
-        deprecated_name="benchmark_value_key",
-        deprecated_group="DEFAULT",
-        help="Metadata key used to retrieve the benchmark value "
-        "from the flavor properties.",
-    ),
-]
-
 CONF = cfg.CONF
 CONF.register_opts(opts)
-CONF.register_opts(benchmark_opts, group="benchmark")
-CONF.register_opts(accelerator_opts, group="accelerator")
 
 LOG = log.getLogger(__name__)
 

caso/extract/openstack/neutron.py

@@ -31,8 +31,6 @@
 
 CONF.import_opt("region_name", "caso.extract.openstack")
 CONF.import_opt("site_name", "caso.extract.base")
-CONF.import_group("benchmark", "caso.extract.base")
-CONF.import_group("accelerator", "caso.extract.base")
 
 LOG = log.getLogger(__name__)
 

caso/extract/openstack/nova.py

@@ -33,12 +33,66 @@
 from caso import record
 from datetime import datetime
 
+accelerator_opts = [
+    cfg.StrOpt(
+        "type_key",
+        default="Accelerator:Type",
+        deprecated_name="accelerator_type_key",
+        deprecated_group="DEFAULT",
+        help="Metadata key used to retrieve the accelerator type "
+        "from the flavor properties.",
+    ),
+    cfg.StrOpt(
+        "vendor_key",
+        default="Accelerator:Vendor",
+        deprecated_name="accelerator_vendor_key",
+        deprecated_group="DEFAULT",
+        help="Metadata key used to retrieve the accelerator vendor "
+        "from the flavor properties.",
+    ),
+    cfg.StrOpt(
+        "model_key",
+        default="Accelerator:Model",
+        deprecated_name="accelerator_model_key",
+        deprecated_group="DEFAULT",
+        help="Metadata key used to retrieve the accelerator model "
+        "from the flavor properties.",
+    ),
+    cfg.StrOpt(
+        "number_key",
+        default="Accelerator:Number",
+        deprecated_name="accelerator_number_key",
+        deprecated_group="DEFAULT",
+        help="Metadata key used to retrieve the accelerator number "
+        "from the flavor properties.",
+    ),
+]
+
+benchmark_opts = [
+    cfg.StrOpt(
+        "name_key",
+        default="accounting:benchmark_type",
+        deprecated_name="benchmark_name_key",
+        deprecated_group="DEFAULT",
+        help="Metadata key used to retrieve the benchmark type "
+        "from the flavor properties.",
+    ),
+    cfg.StrOpt(
+        "value_key",
+        default="accounting:benchmark_value",
+        deprecated_name="benchmark_value_key",
+        deprecated_group="DEFAULT",
+        help="Metadata key used to retrieve the benchmark value "
+        "from the flavor properties.",
+    ),
+]
+
 CONF = cfg.CONF
 
 CONF.import_opt("region_name", "caso.extract.openstack")
 CONF.import_opt("site_name", "caso.extract.base")
-CONF.import_group("benchmark", "caso.extract.base")
-CONF.import_group("accelerator", "caso.extract.base")
+CONF.register_opts(benchmark_opts, group="benchmark")
+CONF.register_opts(accelerator_opts, group="accelerator")
 
 LOG = log.getLogger(__name__)
 

caso/opts.py

@@ -20,6 +20,7 @@
 
 import caso.extract.base
 import caso.extract.manager
+import caso.extract.openstack.nova
 import caso.keystone_client
 import caso.manager
 import caso.messenger.logstash
@@ -38,8 +39,8 @@ def list_opts():
                 caso.extract.manager.cli_opts,
             ),
         ),
-        ("accelerator", caso.extract.base.accelerator_opts),
-        ("benchmark", caso.extract.base.benchmark_opts),
+        ("accelerator", caso.extract.openstack.nova.accelerator_opts),
+        ("benchmark", caso.extract.openstack.nova.benchmark_opts),
         ("keystone_auth", caso.keystone_client.opts),
         ("logstash", caso.messenger.logstash.opts),
         ("ssm", caso.messenger.ssm.opts),