Merge "Move ipv6 config option into network-feature-enabled"
diff --git a/etc/tempest.conf.sample b/etc/tempest.conf.sample
index 31aff61..b0c7826 100644
--- a/etc/tempest.conf.sample
+++ b/etc/tempest.conf.sample
@@ -588,9 +588,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
@@ -617,6 +614,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 a82d6d2..0c33233 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -348,9 +348,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"),
@@ -375,6 +372,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 '