fix duplicate api_extensions
[network-feature-enabled] has 3 api_extensions entries in
tempest.conf.sample. 2 of them should belong to
[compute_features_group] and [volume_feature_group].
Generator compares the opt with opts in groups to find
the group in which the opt is. These 3 opts has same
'name', 'default value', and 'help message'. And first
match is '[network-feature-enabled]', so they go to the
same group.
This patch add some unique help info in api_extensions
opts to fix it.
Change-Id: I99dacc73281b16ed430912919defe3b4d9eb8b14
Closes-Bug: #1280085
diff --git a/etc/tempest.conf.sample b/etc/tempest.conf.sample
index 0e11b90..e528e47 100644
--- a/etc/tempest.conf.sample
+++ b/etc/tempest.conf.sample
@@ -316,6 +316,10 @@
# If false, skip disk config tests (boolean value)
#disk_config=true
+# A list of enabled compute extensions with a special entry
+# all which indicates every extension is enabled (list value)
+#api_extensions=all
+
# A list of enabled v3 extensions with a special entry all
# which indicates every extension is enabled (list value)
#api_v3_extensions=all
@@ -563,16 +567,8 @@
# Options defined in tempest.config
#
-# A list of enabled extensions with a special entry all which
-# indicates every extension is enabled (list value)
-#api_extensions=all
-
-# A list of enabled extensions with a special entry all which
-# indicates every extension is enabled (list value)
-#api_extensions=all
-
-# A list of enabled extensions with a special entry all which
-# indicates every extension is enabled (list value)
+# A list of enabled network extensions with a special entry
+# all which indicates every extension is enabled (list value)
#api_extensions=all
@@ -843,6 +839,10 @@
# Runs Cinder volumes backup test (boolean value)
#backup=true
+# A list of enabled volume extensions with a special entry all
+# which indicates every extension is enabled (list value)
+#api_extensions=all
+
# Is the v1 volume API enabled (boolean value)
#api_v1=true
diff --git a/tempest/config.py b/tempest/config.py
index 49d65f9..5e27ca9 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -225,8 +225,8 @@
help="If false, skip disk config tests"),
cfg.ListOpt('api_extensions',
default=['all'],
- help='A list of enabled extensions with a special entry all '
- 'which indicates every extension is enabled'),
+ help='A list of enabled compute extensions with a special '
+ 'entry all which indicates every extension is enabled'),
cfg.ListOpt('api_v3_extensions',
default=['all'],
help='A list of enabled v3 extensions with a special entry all'
@@ -349,8 +349,8 @@
NetworkFeaturesGroup = [
cfg.ListOpt('api_extensions',
default=['all'],
- help='A list of enabled extensions with a special entry all '
- 'which indicates every extension is enabled'),
+ help='A list of enabled network extensions with a special '
+ 'entry all which indicates every extension is enabled'),
]
volume_group = cfg.OptGroup(name='volume',
@@ -402,8 +402,8 @@
help='Runs Cinder volumes backup test'),
cfg.ListOpt('api_extensions',
default=['all'],
- help='A list of enabled extensions with a special entry all '
- 'which indicates every extension is enabled'),
+ help='A list of enabled volume extensions with a special '
+ 'entry all which indicates every extension is enabled'),
cfg.BoolOpt('api_v1',
default=True,
help="Is the v1 volume API enabled"),