Remove unused xml config options
This patch removes the xml configuration options from tempest. Since
the xml testing has all been removed from tempest these options no
longer do anything, so let's just remove them from config.
Change-Id: I5b3e221d942e09134024b82acaf179dc869357e0
diff --git a/etc/tempest.conf.sample b/etc/tempest.conf.sample
index 13ee8fe..b70b446 100644
--- a/etc/tempest.conf.sample
+++ b/etc/tempest.conf.sample
@@ -467,9 +467,6 @@
# [nova.vnc]->vnc_enabled in nova.conf (boolean value)
#vnc_console = false
-# If false skip all v2 api tests with xml (boolean value)
-#xml_api_v2 = true
-
[dashboard]
@@ -632,9 +629,6 @@
# (boolean value)
#trust = true
-# If false, skip all identity api tests with xml (boolean value)
-#xml_api = false
-
[image]
@@ -810,9 +804,6 @@
# attributes ipv6_ra_mode and ipv6_address_mode (boolean value)
#ipv6_subnet_attributes = false
-# If false, skip all network api tests with xml (boolean value)
-#xml_api = false
-
[object-storage]
diff --git a/tempest/api/compute/base.py b/tempest/api/compute/base.py
index 2f53a0b..6a3ee44 100644
--- a/tempest/api/compute/base.py
+++ b/tempest/api/compute/base.py
@@ -38,9 +38,6 @@
def resource_setup(cls):
cls.set_network_resources()
super(BaseComputeTest, cls).resource_setup()
- if getattr(cls, '_interface', None) == 'xml' and cls._api_version == 2:
- if not CONF.compute_feature_enabled.xml_api_v2:
- raise cls.skipException('XML API is not enabled')
# TODO(andreaf) WE should care also for the alt_manager here
# but only once client lazy load in the manager is done
diff --git a/tempest/api/network/base.py b/tempest/api/network/base.py
index 4b5f107..b13dd22 100644
--- a/tempest/api/network/base.py
+++ b/tempest/api/network/base.py
@@ -62,9 +62,6 @@
super(BaseNetworkTest, cls).resource_setup()
if not CONF.service_available.neutron:
raise cls.skipException("Neutron support is required")
- if getattr(cls, '_interface', None) == 'xml':
- if not CONF.network_feature_enabled.xml_api:
- raise cls.skipException('XML API is not enabled')
if cls._ip_version == 6 and not CONF.network_feature_enabled.ipv6:
raise cls.skipException("IPv6 Tests are disabled.")
diff --git a/tempest/config.py b/tempest/config.py
index 616a476..b467f83 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -143,9 +143,6 @@
cfg.BoolOpt('api_v3',
default=True,
help='Is the v3 identity API enabled'),
- cfg.BoolOpt('xml_api',
- default=False,
- help='If false, skip all identity api tests with xml'),
]
compute_group = cfg.OptGroup(name='compute',
@@ -280,9 +277,6 @@
cfg.BoolOpt('api_v3',
default=False,
help="If false, skip all nova v3 tests."),
- cfg.BoolOpt('xml_api_v2',
- default=True,
- help="If false skip all v2 api tests with xml"),
cfg.BoolOpt('disk_config',
default=True,
help="If false, skip disk config tests"),
@@ -491,9 +485,6 @@
"the extended IPv6 attributes ipv6_ra_mode "
"and ipv6_address_mode"
),
- cfg.BoolOpt('xml_api',
- default=False,
- help='If false, skip all network api tests with xml')
]
messaging_group = cfg.OptGroup(name='messaging',