Merge "Add tempest tests to boot Windows VM" into mcp/antelope
diff --git a/tempest/api/compute/images/test_images.py b/tempest/api/compute/images/test_images.py
index d47ffce..bc89c1e 100644
--- a/tempest/api/compute/images/test_images.py
+++ b/tempest/api/compute/images/test_images.py
@@ -129,6 +129,9 @@
self.addCleanup(self.client.delete_image, image['id'])
self.assertEqual(snapshot_name, image['name'])
+ @testtools.skipIf(
+ CONF.compute_feature_enabled.barbican_integration_enabled,
+ "Not supported when barbican integration enabled.")
@decorators.idempotent_id('f3cac456-e3fe-4183-a7a7-a59f7f017088')
def test_create_server_from_snapshot(self):
# Create one server normally
diff --git a/tempest/api/network/admin/test_routers.py b/tempest/api/network/admin/test_routers.py
index 5c32ea4..8a0c28c 100644
--- a/tempest/api/network/admin/test_routers.py
+++ b/tempest/api/network/admin/test_routers.py
@@ -139,7 +139,7 @@
def _verify_gateway_port(self, router_id):
# Workaround for PRODX-8489
- if CONF.get('sdn').get('service_name') == "tungstenfabric":
+ if config.is_tungstenfabric_backend_enabled():
self._wait_for_ports(router_id)
list_body = self.admin_ports_client.list_ports(
network_id=CONF.network.public_network_id,
diff --git a/tempest/api/network/test_security_groups.py b/tempest/api/network/test_security_groups.py
index d8a2509..02ece09 100644
--- a/tempest/api/network/test_security_groups.py
+++ b/tempest/api/network/test_security_groups.py
@@ -191,7 +191,7 @@
port_range_min = 77
port_range_max = 77
- if CONF.get('sdn').get('service_name') == "tungstenfabric":
+ if config.is_tungstenfabric_backend_enabled():
if self.ethertype == 'IPv6':
remote_ip_prefix = '::/0'
else:
@@ -228,7 +228,7 @@
protocol = 'ipv6-icmp' if self._ip_version == 6 else 'icmp'
icmp_type_codes = [(3, 2), (3, 0), (8, 0), (0, 0), (11, None)]
for icmp_type, icmp_code in icmp_type_codes:
- if CONF.get('sdn').get('service_name') == "tungstenfabric":
+ if config.is_tungstenfabric_backend_enabled():
if self.ethertype == 'IPv6':
remote_ip_prefix = '::/0'
else:
diff --git a/tempest/scenario/test_encrypted_cinder_volumes.py b/tempest/scenario/test_encrypted_cinder_volumes.py
index 3e354dc..cc9fb28 100644
--- a/tempest/scenario/test_encrypted_cinder_volumes.py
+++ b/tempest/scenario/test_encrypted_cinder_volumes.py
@@ -79,6 +79,8 @@
self.attach_detach_volume(server, volume)
@decorators.idempotent_id('cbc752ed-b716-4717-910f-956cce965722')
+ @testtools.skipIf(CONF.volume.storage_protocol == 'ceph',
+ 'Skip because ceph does not support Provider plain.')
@decorators.attr(type='slow')
@testtools.skipUnless(
'plain' in CONF.volume_feature_enabled.supported_crypto_providers,