Move ipv6 config option into network-feature-enabled
This commit moves the ipv6 option into the proper config group.
Previously, there was an ipv6_enabled option under the network group.
This was the incorrect location for this type of option since, ipv6
is an optional feature it should be in the feature enabled group.
Change-Id: I35769cf4d18363fad56ed5150b4d01d8a5ad17e7
diff --git a/etc/tempest.conf.sample b/etc/tempest.conf.sample
index b9e3393..fedf357 100644
--- a/etc/tempest.conf.sample
+++ b/etc/tempest.conf.sample
@@ -570,9 +570,6 @@
# The mask bits for tenant ipv4 subnets (integer value)
#tenant_network_mask_bits=28
-# Allow the execution of IPv6 tests (boolean value)
-#ipv6_enabled=true
-
# The cidr block to allocate tenant ipv6 subnets from (string
# value)
#tenant_network_v6_cidr=2003::/64
@@ -599,6 +596,9 @@
# Options defined in tempest.config
#
+# Allow the execution of IPv6 tests (boolean value)
+#ipv6=true
+
# A list of enabled network extensions with a special entry
# all which indicates every extension is enabled (list value)
#api_extensions=all
diff --git a/tempest/api/network/test_networks.py b/tempest/api/network/test_networks.py
index ea802ad..1155257 100644
--- a/tempest/api/network/test_networks.py
+++ b/tempest/api/network/test_networks.py
@@ -455,7 +455,7 @@
@classmethod
def setUpClass(cls):
super(NetworksIpV6TestJSON, cls).setUpClass()
- if not CONF.network.ipv6_enabled:
+ if not CONF.network_feature_enabled.ipv6:
cls.tearDownClass()
skip_msg = "IPv6 Tests are disabled."
raise cls.skipException(skip_msg)
diff --git a/tempest/config.py b/tempest/config.py
index 7706eaf..cfa1f11 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -344,9 +344,6 @@
cfg.IntOpt('tenant_network_mask_bits',
default=28,
help="The mask bits for tenant ipv4 subnets"),
- cfg.BoolOpt('ipv6_enabled',
- default=True,
- help="Allow the execution of IPv6 tests"),
cfg.StrOpt('tenant_network_v6_cidr',
default="2003::/64",
help="The cidr block to allocate tenant ipv6 subnets from"),
@@ -371,6 +368,9 @@
title='Enabled network service features')
NetworkFeaturesGroup = [
+ cfg.BoolOpt('ipv6',
+ default=True,
+ help="Allow the execution of IPv6 tests"),
cfg.ListOpt('api_extensions',
default=['all'],
help='A list of enabled network extensions with a special '