Merge "update test_volume_boot_pattern to assign one value"
diff --git a/tempest/api/compute/images/test_image_metadata.py b/tempest/api/compute/images/test_image_metadata.py
index e45e941..c3b144d 100644
--- a/tempest/api/compute/images/test_image_metadata.py
+++ b/tempest/api/compute/images/test_image_metadata.py
@@ -49,20 +49,20 @@
def setUp(self):
super(ImagesMetadataTestJSON, self).setUp()
- meta = {'key1': 'value1', 'key2': 'value2'}
+ meta = {'os_version': 'value1', 'os_distro': 'value2'}
self.client.set_image_metadata(self.image_id, meta)
@test.attr(type='gate')
def test_list_image_metadata(self):
# All metadata key/value pairs for an image should be returned
resp_metadata = self.client.list_image_metadata(self.image_id)
- expected = {'key1': 'value1', 'key2': 'value2'}
+ expected = {'os_version': 'value1', 'os_distro': 'value2'}
self.assertEqual(expected, resp_metadata)
@test.attr(type='gate')
def test_set_image_metadata(self):
# The metadata for the image should match the new values
- req_metadata = {'meta2': 'value2', 'meta3': 'value3'}
+ req_metadata = {'os_version': 'value2', 'architecture': 'value3'}
self.client.set_image_metadata(self.image_id,
req_metadata)
@@ -72,37 +72,39 @@
@test.attr(type='gate')
def test_update_image_metadata(self):
# The metadata for the image should match the updated values
- req_metadata = {'key1': 'alt1', 'key3': 'value3'}
+ req_metadata = {'os_version': 'alt1', 'architecture': 'value3'}
self.client.update_image_metadata(self.image_id,
req_metadata)
resp_metadata = self.client.list_image_metadata(self.image_id)
- expected = {'key1': 'alt1', 'key2': 'value2', 'key3': 'value3'}
+ expected = {'os_version': 'alt1',
+ 'os_distro': 'value2',
+ 'architecture': 'value3'}
self.assertEqual(expected, resp_metadata)
@test.attr(type='gate')
def test_get_image_metadata_item(self):
# The value for a specific metadata key should be returned
meta = self.client.get_image_metadata_item(self.image_id,
- 'key2')
- self.assertEqual('value2', meta['key2'])
+ 'os_distro')
+ self.assertEqual('value2', meta['os_distro'])
@test.attr(type='gate')
def test_set_image_metadata_item(self):
# The value provided for the given meta item should be set for
# the image
- meta = {'key1': 'alt'}
+ meta = {'os_version': 'alt'}
self.client.set_image_metadata_item(self.image_id,
- 'key1', meta)
+ 'os_version', meta)
resp_metadata = self.client.list_image_metadata(self.image_id)
- expected = {'key1': 'alt', 'key2': 'value2'}
+ expected = {'os_version': 'alt', 'os_distro': 'value2'}
self.assertEqual(expected, resp_metadata)
@test.attr(type='gate')
def test_delete_image_metadata_item(self):
# The metadata value/key pair should be deleted from the image
self.client.delete_image_metadata_item(self.image_id,
- 'key1')
+ 'os_version')
resp_metadata = self.client.list_image_metadata(self.image_id)
- expected = {'key2': 'value2'}
+ expected = {'os_distro': 'value2'}
self.assertEqual(expected, resp_metadata)
diff --git a/tempest/api/compute/images/test_image_metadata_negative.py b/tempest/api/compute/images/test_image_metadata_negative.py
index 615b5d0..73412ff 100644
--- a/tempest/api/compute/images/test_image_metadata_negative.py
+++ b/tempest/api/compute/images/test_image_metadata_negative.py
@@ -36,7 +36,7 @@
@test.attr(type=['negative', 'gate'])
def test_update_nonexistent_image_metadata(self):
# Negative test:An update should not happen for a non-existent image
- meta = {'key1': 'alt1', 'key2': 'alt2'}
+ meta = {'os_distro': 'alt1', 'os_version': 'alt2'}
self.assertRaises(exceptions.NotFound,
self.client.update_image_metadata,
data_utils.rand_uuid(), meta)
@@ -46,12 +46,12 @@
# Negative test: Get on non-existent image should not happen
self.assertRaises(exceptions.NotFound,
self.client.get_image_metadata_item,
- data_utils.rand_uuid(), 'key2')
+ data_utils.rand_uuid(), 'os_version')
@test.attr(type=['negative', 'gate'])
def test_set_nonexistent_image_metadata(self):
# Negative test: Metadata should not be set to a non-existent image
- meta = {'key1': 'alt1', 'key2': 'alt2'}
+ meta = {'os_distro': 'alt1', 'os_version': 'alt2'}
self.assertRaises(exceptions.NotFound, self.client.set_image_metadata,
data_utils.rand_uuid(), meta)
@@ -59,10 +59,10 @@
def test_set_nonexistent_image_metadata_item(self):
# Negative test: Metadata item should not be set to a
# nonexistent image
- meta = {'key1': 'alt'}
+ meta = {'os_distro': 'alt'}
self.assertRaises(exceptions.NotFound,
self.client.set_image_metadata_item,
- data_utils.rand_uuid(), 'key1',
+ data_utils.rand_uuid(), 'os_distro',
meta)
@test.attr(type=['negative', 'gate'])
@@ -71,4 +71,4 @@
# item from non-existent image
self.assertRaises(exceptions.NotFound,
self.client.delete_image_metadata_item,
- data_utils.rand_uuid(), 'key1')
+ data_utils.rand_uuid(), 'os_distro')
diff --git a/tempest/common/glance_http.py b/tempest/common/glance_http.py
index 5f35c85..92ed8f1 100644
--- a/tempest/common/glance_http.py
+++ b/tempest/common/glance_http.py
@@ -67,7 +67,7 @@
_kwargs = {'timeout': float(kwargs.get('timeout', 600))}
if scheme == 'https':
- _kwargs['cacert'] = kwargs.get('cacert', None)
+ _kwargs['ca_certs'] = kwargs.get('ca_certs', None)
_kwargs['cert_file'] = kwargs.get('cert_file', None)
_kwargs['key_file'] = kwargs.get('key_file', None)
_kwargs['insecure'] = kwargs.get('insecure', False)
@@ -232,7 +232,7 @@
with native Python 3.3 code.
"""
def __init__(self, host, port=None, key_file=None, cert_file=None,
- cacert=None, timeout=None, insecure=False,
+ ca_certs=None, timeout=None, insecure=False,
ssl_compression=True):
httplib.HTTPSConnection.__init__(self, host, port,
key_file=key_file,
@@ -242,7 +242,7 @@
self.timeout = timeout
self.insecure = insecure
self.ssl_compression = ssl_compression
- self.cacert = cacert
+ self.ca_certs = ca_certs
self.setcontext()
@staticmethod
@@ -326,11 +326,11 @@
msg = 'Unable to load key from "%s" %s' % (self.key_file, e)
raise exc.SSLConfigurationError(msg)
- if self.cacert:
+ if self.ca_certs:
try:
- self.context.load_verify_locations(self.cacert)
+ self.context.load_verify_locations(self.ca_certs)
except Exception as e:
- msg = 'Unable to load CA from "%s"' % (self.cacert, e)
+ msg = 'Unable to load CA from "%s"' % (self.ca_certs, e)
raise exc.SSLConfigurationError(msg)
else:
self.context.set_default_verify_paths()
diff --git a/tempest/scenario/test_network_basic_ops.py b/tempest/scenario/test_network_basic_ops.py
index 2cfec14..ebc6b15 100644
--- a/tempest/scenario/test_network_basic_ops.py
+++ b/tempest/scenario/test_network_basic_ops.py
@@ -436,6 +436,7 @@
act_serv=servers,
trgt_serv=dns_servers))
+ @test.skip_because(bug="1412325")
@testtools.skipUnless(CONF.scenario.dhcp_client,
"DHCP client is not available.")
@test.attr(type='smoke')
diff --git a/tempest/tests/test_glance_http.py b/tempest/tests/test_glance_http.py
index 9a6c9de..c92a886 100644
--- a/tempest/tests/test_glance_http.py
+++ b/tempest/tests/test_glance_http.py
@@ -171,7 +171,7 @@
def test_get_connection_kwargs_set_timeout_for_http(self):
kwargs = self.client.get_connection_kwargs('http', timeout=10,
- cacert='foo')
+ ca_certs='foo')
self.assertEqual(10, kwargs['timeout'])
# nothing more than timeout is evaluated for http connections
self.assertEqual(1, len(kwargs.keys()))
@@ -179,7 +179,7 @@
def test_get_connection_kwargs_default_for_https(self):
kwargs = self.client.get_connection_kwargs('https')
self.assertEqual(600, kwargs['timeout'])
- self.assertEqual(None, kwargs['cacert'])
+ self.assertEqual(None, kwargs['ca_certs'])
self.assertEqual(None, kwargs['cert_file'])
self.assertEqual(None, kwargs['key_file'])
self.assertEqual(False, kwargs['insecure'])
@@ -188,13 +188,13 @@
def test_get_connection_kwargs_set_params_for_https(self):
kwargs = self.client.get_connection_kwargs('https', timeout=10,
- cacert='foo',
+ ca_certs='foo',
cert_file='/foo/bar.cert',
key_file='/foo/key.pem',
insecure=True,
ssl_compression=False)
self.assertEqual(10, kwargs['timeout'])
- self.assertEqual('foo', kwargs['cacert'])
+ self.assertEqual('foo', kwargs['ca_certs'])
self.assertEqual('/foo/bar.cert', kwargs['cert_file'])
self.assertEqual('/foo/key.pem', kwargs['key_file'])
self.assertEqual(True, kwargs['insecure'])