Change location metadata key 'backend' to 'store'
As a part of vocabulary correction, changed the location metadata key name from 'backend' to 'store'. Modified corresponding tests as well. Change-Id: I1a8056a316fcfae8b4b32f74fb62f90eaceb9467 bp:multi-store-vocabulary-correction
This commit is contained in:
parent
a11649d4df
commit
59daa4c31e
@ -774,7 +774,7 @@ class Store(glance_store.driver.Store):
|
||||
|
||||
image_metadata = {}
|
||||
if self.backend_group:
|
||||
image_metadata['backend'] = u"%s" % self.backend_group
|
||||
image_metadata['store'] = u"%s" % self.backend_group
|
||||
|
||||
return ('cinder://%s' % volume.id,
|
||||
bytes_written,
|
||||
|
@ -764,7 +764,7 @@ class Store(glance_store.driver.Store):
|
||||
|
||||
# Add store backend information to location metadata
|
||||
if self.backend_group:
|
||||
metadata['backend'] = u"%s" % self.backend_group
|
||||
metadata['store'] = u"%s" % self.backend_group
|
||||
|
||||
return ('file://%s' % filepath,
|
||||
bytes_written,
|
||||
|
@ -588,7 +588,7 @@ class Store(driver.Store):
|
||||
# Add store backend information to location metadata
|
||||
metadata = {}
|
||||
if self.backend_group:
|
||||
metadata['backend'] = u"%s" % self.backend_group
|
||||
metadata['store'] = u"%s" % self.backend_group
|
||||
|
||||
return (loc.get_uri(),
|
||||
image_size,
|
||||
|
@ -414,7 +414,7 @@ class Store(glance_store.driver.Store):
|
||||
|
||||
metadata = {}
|
||||
if self.backend_group:
|
||||
metadata['backend'] = u"%s" % self.backend_group
|
||||
metadata['store'] = u"%s" % self.backend_group
|
||||
|
||||
return (location.get_uri(),
|
||||
offset,
|
||||
|
@ -1060,7 +1060,7 @@ class BaseStore(driver.Store):
|
||||
|
||||
metadata = {}
|
||||
if self.backend_group:
|
||||
metadata['backend'] = u"%s" % self.backend_group
|
||||
metadata['store'] = u"%s" % self.backend_group
|
||||
|
||||
return (location.get_uri(credentials_included=include_creds),
|
||||
image_size, obj_etag, os_hash_value.hexdigest(),
|
||||
|
@ -657,7 +657,7 @@ class Store(glance_store.Store):
|
||||
|
||||
metadata = {}
|
||||
if self.backend_group:
|
||||
metadata['backend'] = u"%s" % self.backend_group
|
||||
metadata['store'] = u"%s" % self.backend_group
|
||||
|
||||
return (loc.get_uri(),
|
||||
image_file.size,
|
||||
|
@ -348,7 +348,7 @@ class TestMultiCinderStore(base.MultiStoreBaseTest,
|
||||
'glance_image_id': expected_image_id,
|
||||
'image_size': str(expected_size)},
|
||||
volume_type='some_type')
|
||||
self.assertEqual(backend, metadata["backend"])
|
||||
self.assertEqual(backend, metadata["store"])
|
||||
|
||||
def test_cinder_add(self):
|
||||
fake_volume = mock.MagicMock(id=str(uuid.uuid4()),
|
||||
|
@ -109,8 +109,8 @@ class TestMultiStore(base.MultiStoreBaseTest,
|
||||
|
||||
loc, size, checksum, metadata = self.store.add(
|
||||
image_id, image_file, len(file_contents))
|
||||
# Check metadata contains 'file1' as a backend
|
||||
self.assertEqual(u"file1", metadata['backend'])
|
||||
# Check metadata contains 'file1' as a store
|
||||
self.assertEqual(u"file1", metadata['store'])
|
||||
|
||||
# Now read it back...
|
||||
uri = "file:///%s/%s" % (self.test_dir, image_id)
|
||||
@ -139,8 +139,8 @@ class TestMultiStore(base.MultiStoreBaseTest,
|
||||
loc, size, checksum, metadata = self.store.add(image_id,
|
||||
image_file,
|
||||
len(file_contents))
|
||||
# Check metadata contains 'file1' as a backend
|
||||
self.assertEqual(u"file1", metadata['backend'])
|
||||
# Check metadata contains 'file1' as a store
|
||||
self.assertEqual(u"file1", metadata['store'])
|
||||
|
||||
# Now read it back...
|
||||
uri = "file:///%s/%s" % (self.test_dir, image_id)
|
||||
@ -201,7 +201,7 @@ class TestMultiStore(base.MultiStoreBaseTest,
|
||||
self.assertEqual(expected_location, loc)
|
||||
self.assertEqual(expected_file_size, size)
|
||||
self.assertEqual(expected_checksum, checksum)
|
||||
self.assertEqual(u"file1", metadata['backend'])
|
||||
self.assertEqual(u"file1", metadata['store'])
|
||||
|
||||
uri = "file:///%s/%s" % (self.test_dir, expected_image_id)
|
||||
loc = location.get_location_from_uri_and_backend(
|
||||
@ -241,7 +241,7 @@ class TestMultiStore(base.MultiStoreBaseTest,
|
||||
self.assertEqual(expected_location, loc)
|
||||
self.assertEqual(expected_file_size, size)
|
||||
self.assertEqual(expected_checksum, checksum)
|
||||
self.assertEqual(u"file2", metadata['backend'])
|
||||
self.assertEqual(u"file2", metadata['store'])
|
||||
|
||||
uri = "file:///%s/%s" % (self.test_dir, expected_image_id)
|
||||
loc = location.get_location_from_uri_and_backend(
|
||||
@ -261,20 +261,20 @@ class TestMultiStore(base.MultiStoreBaseTest,
|
||||
in_metadata = [{'id': 'abcdefg',
|
||||
'mountpoint': '/xyz/images'}]
|
||||
location, size, checksum, metadata = self._store_image(in_metadata)
|
||||
self.assertEqual({'backend': u'file1'}, metadata)
|
||||
self.assertEqual({'store': u'file1'}, metadata)
|
||||
|
||||
def test_add_check_metadata_list_with_invalid_mountpoint_locations(self):
|
||||
in_metadata = [{'id': 'abcdefg', 'mountpoint': '/xyz/images'},
|
||||
{'id': 'xyz1234', 'mountpoint': '/pqr/images'}]
|
||||
location, size, checksum, metadata = self._store_image(in_metadata)
|
||||
self.assertEqual({'backend': u'file1'}, metadata)
|
||||
self.assertEqual({'store': u'file1'}, metadata)
|
||||
|
||||
def test_add_check_metadata_list_with_valid_mountpoint_locations(self):
|
||||
in_metadata = [{'id': 'abcdefg', 'mountpoint': '/tmp'},
|
||||
{'id': 'xyz1234', 'mountpoint': '/xyz'}]
|
||||
location, size, checksum, metadata = self._store_image(in_metadata)
|
||||
self.assertEqual(in_metadata[0], metadata)
|
||||
self.assertEqual(u"file1", metadata["backend"])
|
||||
self.assertEqual(u"file1", metadata["store"])
|
||||
|
||||
def test_add_check_metadata_bad_nosuch_file(self):
|
||||
expected_image_id = str(uuid.uuid4())
|
||||
@ -291,7 +291,7 @@ class TestMultiStore(base.MultiStoreBaseTest,
|
||||
image_file,
|
||||
expected_file_size)
|
||||
|
||||
self.assertEqual({'backend': u'file1'}, metadata)
|
||||
self.assertEqual({'store': u'file1'}, metadata)
|
||||
|
||||
def test_add_already_existing(self):
|
||||
"""
|
||||
@ -307,7 +307,7 @@ class TestMultiStore(base.MultiStoreBaseTest,
|
||||
location, size, checksum, metadata = self.store.add(image_id,
|
||||
image_file,
|
||||
file_size)
|
||||
self.assertEqual(u"file1", metadata["backend"])
|
||||
self.assertEqual(u"file1", metadata["store"])
|
||||
|
||||
image_file = six.BytesIO(b"nevergonnamakeit")
|
||||
self.assertRaises(exceptions.Duplicate,
|
||||
@ -392,7 +392,7 @@ class TestMultiStore(base.MultiStoreBaseTest,
|
||||
loc, size, checksum, metadata = self.store.add(image_id,
|
||||
image_file,
|
||||
file_size)
|
||||
self.assertEqual(u"file1", metadata["backend"])
|
||||
self.assertEqual(u"file1", metadata["store"])
|
||||
|
||||
# Now check that we can delete it
|
||||
uri = "file:///%s/%s" % (self.test_dir, image_id)
|
||||
@ -421,7 +421,7 @@ class TestMultiStore(base.MultiStoreBaseTest,
|
||||
loc, size, checksum, metadata = self.store.add(image_id,
|
||||
image_file,
|
||||
file_size)
|
||||
self.assertEqual(u"file1", metadata["backend"])
|
||||
self.assertEqual(u"file1", metadata["store"])
|
||||
|
||||
uri = "file:///%s/%s" % (self.test_dir, image_id)
|
||||
loc = location.get_location_from_uri_and_backend(uri, "file1",
|
||||
@ -591,7 +591,7 @@ class TestMultiStore(base.MultiStoreBaseTest,
|
||||
loc, size, checksum, metadata = self.store.add(expected_image_id,
|
||||
image_file,
|
||||
expected_file_size)
|
||||
self.assertEqual(u"file1", metadata["backend"])
|
||||
self.assertEqual(u"file1", metadata["store"])
|
||||
|
||||
self.assertEqual(expected_location, loc)
|
||||
self.assertEqual(expected_file_size, size)
|
||||
@ -638,7 +638,7 @@ class TestMultiStore(base.MultiStoreBaseTest,
|
||||
loc, size, checksum, metadata = self.store.add(expected_image_id,
|
||||
image_file,
|
||||
expected_file_size)
|
||||
self.assertEqual(u"file1", metadata["backend"])
|
||||
self.assertEqual(u"file1", metadata["store"])
|
||||
|
||||
self.assertEqual(expected_location, loc)
|
||||
self.assertEqual(expected_file_size, size)
|
||||
@ -749,7 +749,7 @@ class TestMultiStore(base.MultiStoreBaseTest,
|
||||
location, size, checksum, metadata = self.store.add(expected_image_id,
|
||||
image_file,
|
||||
expected_file_size)
|
||||
self.assertEqual(u"file1", metadata["backend"])
|
||||
self.assertEqual(u"file1", metadata["store"])
|
||||
|
||||
self.assertEqual(expected_location, location)
|
||||
self.assertEqual(expected_file_size, size)
|
||||
@ -793,7 +793,7 @@ class TestMultiStore(base.MultiStoreBaseTest,
|
||||
location, size, checksum, metadata = self.store.add(expected_image_id,
|
||||
image_file,
|
||||
expected_file_size)
|
||||
self.assertEqual(u"file1", metadata["backend"])
|
||||
self.assertEqual(u"file1", metadata["store"])
|
||||
|
||||
self.assertEqual(expected_location, location)
|
||||
self.assertEqual(expected_file_size, size)
|
||||
|
@ -228,7 +228,7 @@ class TestMultiStore(base.MultiStoreBaseTest,
|
||||
self.assertTrue(resize.called)
|
||||
self.assertTrue(write.called)
|
||||
self.assertEqual(ret[1], self.data_len)
|
||||
self.assertEqual("ceph1", ret[3]['backend'])
|
||||
self.assertEqual("ceph1", ret[3]['store'])
|
||||
|
||||
def test_add_w_image_size_zero_to_different_backend(self):
|
||||
"""Assert that correct size is returned even though 0 was provided."""
|
||||
@ -252,7 +252,7 @@ class TestMultiStore(base.MultiStoreBaseTest,
|
||||
self.assertTrue(resize.called)
|
||||
self.assertTrue(write.called)
|
||||
self.assertEqual(ret[1], self.data_len)
|
||||
self.assertEqual("ceph2", ret[3]['backend'])
|
||||
self.assertEqual("ceph2", ret[3]['store'])
|
||||
|
||||
@mock.patch.object(MockRBD.Image, '__enter__')
|
||||
@mock.patch.object(rbd_store.Store, '_create_image')
|
||||
|
@ -83,7 +83,7 @@ class TestSheepdogMultiStore(base.MultiStoreBaseTest,
|
||||
mock_exist.return_value = False
|
||||
|
||||
(uri, size, checksum, loc) = self.store.add('fake_image_id', data, 2)
|
||||
self.assertEqual("sheepdog1", loc["backend"])
|
||||
self.assertEqual("sheepdog1", loc["store"])
|
||||
|
||||
mock_exist.assert_called_once_with()
|
||||
mock_create.assert_called_once_with(2)
|
||||
@ -101,7 +101,7 @@ class TestSheepdogMultiStore(base.MultiStoreBaseTest,
|
||||
mock_exist.return_value = False
|
||||
|
||||
(uri, size, checksum, loc) = self.store.add('fake_image_id', data, 2)
|
||||
self.assertEqual("sheepdog2", loc["backend"])
|
||||
self.assertEqual("sheepdog2", loc["store"])
|
||||
|
||||
mock_exist.assert_called_once_with()
|
||||
mock_create.assert_called_once_with(2)
|
||||
@ -216,6 +216,6 @@ class TestSheepdogMultiStore(base.MultiStoreBaseTest,
|
||||
cmd.side_effect = _fake_run_command
|
||||
(uri, size, checksum, loc) = self.store.add(
|
||||
image_id, image_file, file_size, verifier=verifier)
|
||||
self.assertEqual("sheepdog1", loc["backend"])
|
||||
self.assertEqual("sheepdog1", loc["store"])
|
||||
|
||||
verifier.update.assert_called_with(file_contents)
|
||||
|
@ -196,7 +196,7 @@ class TestMultiStore(base.MultiStoreBaseTest,
|
||||
expected_image_id, image, expected_size)
|
||||
_, kwargs = HttpConn.call_args
|
||||
self.assertEqual(expected_headers, kwargs['headers'])
|
||||
self.assertEqual("vmware1", metadata["backend"])
|
||||
self.assertEqual("vmware1", metadata["store"])
|
||||
|
||||
self.assertEqual(utils.sort_url_by_qs_keys(expected_location),
|
||||
utils.sort_url_by_qs_keys(location))
|
||||
@ -231,7 +231,7 @@ class TestMultiStore(base.MultiStoreBaseTest,
|
||||
HttpConn.return_value = utils.fake_response()
|
||||
location, size, checksum, metadata = self.store.add(
|
||||
expected_image_id, image, 0)
|
||||
self.assertEqual("vmware1", metadata["backend"])
|
||||
self.assertEqual("vmware1", metadata["store"])
|
||||
|
||||
self.assertEqual(utils.sort_url_by_qs_keys(expected_location),
|
||||
utils.sort_url_by_qs_keys(location))
|
||||
@ -251,7 +251,7 @@ class TestMultiStore(base.MultiStoreBaseTest,
|
||||
HttpConn.return_value = utils.fake_response()
|
||||
location, size, checksum, multihash, metadata = self.store.add(
|
||||
image_id, image, size, self.hash_algo, verifier=verifier)
|
||||
self.assertEqual("vmware1", metadata["backend"])
|
||||
self.assertEqual("vmware1", metadata["store"])
|
||||
|
||||
fake_reader.assert_called_with(image, self.hash_algo, verifier)
|
||||
|
||||
@ -268,7 +268,7 @@ class TestMultiStore(base.MultiStoreBaseTest,
|
||||
HttpConn.return_value = utils.fake_response()
|
||||
location, size, checksum, multihash, metadata = self.store.add(
|
||||
image_id, image, 0, self.hash_algo, verifier=verifier)
|
||||
self.assertEqual("vmware1", metadata["backend"])
|
||||
self.assertEqual("vmware1", metadata["store"])
|
||||
|
||||
fake_reader.assert_called_with(image, self.hash_algo, verifier)
|
||||
|
||||
|
@ -407,7 +407,7 @@ class SwiftTests(object):
|
||||
loc, size, checksum, metadata = self.store.add(
|
||||
expected_image_id, image_swift, expected_swift_size)
|
||||
|
||||
self.assertEqual("swift1", metadata["backend"])
|
||||
self.assertEqual("swift1", metadata["store"])
|
||||
self.assertEqual(expected_location, loc)
|
||||
self.assertEqual(expected_swift_size, size)
|
||||
self.assertEqual(expected_checksum, checksum)
|
||||
@ -446,7 +446,7 @@ class SwiftTests(object):
|
||||
location, size, checksum, arg = self.store.add(expected_image_id,
|
||||
image_swift,
|
||||
expected_swift_size)
|
||||
self.assertEqual("swift1", arg['backend'])
|
||||
self.assertEqual("swift1", arg['store'])
|
||||
self.assertEqual(expected_location, location)
|
||||
|
||||
@mock.patch('glance_store._drivers.swift.utils'
|
||||
@ -492,7 +492,7 @@ class SwiftTests(object):
|
||||
expected_swift_size,
|
||||
context=ctxt)
|
||||
|
||||
self.assertEqual("swift1", metadata['backend'])
|
||||
self.assertEqual("swift1", metadata['store'])
|
||||
# ensure that image add uses user's context
|
||||
self.assertEqual(expected_location, loc)
|
||||
|
||||
@ -535,7 +535,7 @@ class SwiftTests(object):
|
||||
image_swift,
|
||||
expected_swift_size)
|
||||
|
||||
self.assertEqual("swift1", metadata['backend'])
|
||||
self.assertEqual("swift1", metadata['store'])
|
||||
self.assertEqual(expected_location, loc)
|
||||
self.assertEqual(expected_swift_size, size)
|
||||
self.assertEqual(expected_checksum, checksum)
|
||||
@ -615,7 +615,7 @@ class SwiftTests(object):
|
||||
image_swift,
|
||||
expected_swift_size)
|
||||
|
||||
self.assertEqual("swift1", metadata['backend'])
|
||||
self.assertEqual("swift1", metadata['store'])
|
||||
self.assertEqual(expected_location, loc)
|
||||
self.assertEqual(expected_swift_size, size)
|
||||
self.assertEqual(expected_checksum, checksum)
|
||||
@ -664,7 +664,7 @@ class SwiftTests(object):
|
||||
image_swift,
|
||||
expected_swift_size)
|
||||
|
||||
self.assertEqual("swift1", metadata['backend'])
|
||||
self.assertEqual("swift1", metadata['store'])
|
||||
self.assertEqual(expected_location, loc)
|
||||
self.assertEqual(expected_swift_size, size)
|
||||
self.assertEqual(expected_checksum, checksum)
|
||||
@ -849,7 +849,7 @@ class SwiftTests(object):
|
||||
expected_swift_size,
|
||||
context=ctxt)
|
||||
|
||||
self.assertEqual("swift1", metadata['backend'])
|
||||
self.assertEqual("swift1", metadata['store'])
|
||||
self.assertEqual(expected_location, location)
|
||||
|
||||
@mock.patch('glance_store._drivers.swift.utils'
|
||||
@ -887,7 +887,7 @@ class SwiftTests(object):
|
||||
self.store.large_object_chunk_size = orig_temp_size
|
||||
self.store.large_object_size = orig_max_size
|
||||
|
||||
self.assertEqual("swift1", metadata['backend'])
|
||||
self.assertEqual("swift1", metadata['store'])
|
||||
self.assertEqual(expected_location, loc)
|
||||
self.assertEqual(expected_swift_size, size)
|
||||
self.assertEqual(expected_checksum, checksum)
|
||||
@ -948,7 +948,7 @@ class SwiftTests(object):
|
||||
self.store.large_object_size = orig_max_size
|
||||
MAX_SWIFT_OBJECT_SIZE = orig_max_swift_object_size
|
||||
|
||||
self.assertEqual("swift1", metadata['backend'])
|
||||
self.assertEqual("swift1", metadata['store'])
|
||||
self.assertEqual(expected_location, loc)
|
||||
self.assertEqual(expected_swift_size, size)
|
||||
self.assertEqual(expected_checksum, checksum)
|
||||
|
Loading…
Reference in New Issue
Block a user