From f2a12d39b59620e020bd5eb06985af184fb5d5c0 Mon Sep 17 00:00:00 2001 From: Erno Kuvaja Date: Fri, 7 Jun 2019 11:39:20 +0100 Subject: Revert "Change location metadata key 'backend' to 'store'" This reverts commit 54744cc3a39e1df7f24f34dbdc3f72c692199956. Change-Id: I20c5fb9d0d5f404ca6667d6513f0db5ae67fcc5a --- glance_store/_drivers/cinder.py | 2 +- glance_store/_drivers/filesystem.py | 2 +- glance_store/_drivers/rbd.py | 2 +- glance_store/_drivers/swift/store.py | 2 +- glance_store/_drivers/vmware_datastore.py | 2 +- glance_store/tests/unit/test_multistore_cinder.py | 2 +- .../tests/unit/test_multistore_filesystem.py | 30 +++++++++++----------- glance_store/tests/unit/test_multistore_rbd.py | 4 +-- glance_store/tests/unit/test_multistore_vmware.py | 8 +++--- .../tests/unit/test_swift_store_multibackend.py | 18 ++++++------- 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/glance_store/_drivers/cinder.py b/glance_store/_drivers/cinder.py index b6bd2e1..7212e02 100644 --- a/glance_store/_drivers/cinder.py +++ b/glance_store/_drivers/cinder.py @@ -774,7 +774,7 @@ class Store(glance_store.driver.Store): image_metadata = {} if self.backend_group: - image_metadata['store'] = u"%s" % self.backend_group + image_metadata['backend'] = u"%s" % self.backend_group return ('cinder://%s' % volume.id, bytes_written, diff --git a/glance_store/_drivers/filesystem.py b/glance_store/_drivers/filesystem.py index 57204de..f5e7871 100644 --- a/glance_store/_drivers/filesystem.py +++ b/glance_store/_drivers/filesystem.py @@ -764,7 +764,7 @@ class Store(glance_store.driver.Store): # Add store backend information to location metadata if self.backend_group: - metadata['store'] = u"%s" % self.backend_group + metadata['backend'] = u"%s" % self.backend_group return ('file://%s' % filepath, bytes_written, diff --git a/glance_store/_drivers/rbd.py b/glance_store/_drivers/rbd.py index 0e3e487..98cb284 100644 --- a/glance_store/_drivers/rbd.py +++ b/glance_store/_drivers/rbd.py @@ -588,7 +588,7 @@ class Store(driver.Store): # Add store backend information to location metadata metadata = {} if self.backend_group: - metadata['store'] = u"%s" % self.backend_group + metadata['backend'] = u"%s" % self.backend_group return (loc.get_uri(), image_size, diff --git a/glance_store/_drivers/swift/store.py b/glance_store/_drivers/swift/store.py index d7a324e..47c892d 100644 --- a/glance_store/_drivers/swift/store.py +++ b/glance_store/_drivers/swift/store.py @@ -1060,7 +1060,7 @@ class BaseStore(driver.Store): metadata = {} if self.backend_group: - metadata['store'] = u"%s" % self.backend_group + metadata['backend'] = u"%s" % self.backend_group return (location.get_uri(credentials_included=include_creds), image_size, obj_etag, os_hash_value.hexdigest(), diff --git a/glance_store/_drivers/vmware_datastore.py b/glance_store/_drivers/vmware_datastore.py index 07a3abb..9ca691e 100644 --- a/glance_store/_drivers/vmware_datastore.py +++ b/glance_store/_drivers/vmware_datastore.py @@ -657,7 +657,7 @@ class Store(glance_store.Store): metadata = {} if self.backend_group: - metadata['store'] = u"%s" % self.backend_group + metadata['backend'] = u"%s" % self.backend_group return (loc.get_uri(), image_file.size, diff --git a/glance_store/tests/unit/test_multistore_cinder.py b/glance_store/tests/unit/test_multistore_cinder.py index acb9a29..d3ebd62 100644 --- a/glance_store/tests/unit/test_multistore_cinder.py +++ b/glance_store/tests/unit/test_multistore_cinder.py @@ -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["store"]) + self.assertEqual(backend, metadata["backend"]) def test_cinder_add(self): fake_volume = mock.MagicMock(id=str(uuid.uuid4()), diff --git a/glance_store/tests/unit/test_multistore_filesystem.py b/glance_store/tests/unit/test_multistore_filesystem.py index 08130a9..b4e2b87 100644 --- a/glance_store/tests/unit/test_multistore_filesystem.py +++ b/glance_store/tests/unit/test_multistore_filesystem.py @@ -110,7 +110,7 @@ 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['store']) + self.assertEqual(u"file1", metadata['backend']) # Now read it back... uri = "file:///%s/%s" % (self.test_dir, image_id) @@ -140,7 +140,7 @@ class TestMultiStore(base.MultiStoreBaseTest, image_file, len(file_contents)) # Check metadata contains 'file1' as a backend - self.assertEqual(u"file1", metadata['store']) + self.assertEqual(u"file1", metadata['backend']) # 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['store']) + self.assertEqual(u"file1", metadata['backend']) 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['store']) + self.assertEqual(u"file2", metadata['backend']) 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({'store': u'file1'}, metadata) + self.assertEqual({'backend': 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({'store': u'file1'}, metadata) + self.assertEqual({'backend': 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["store"]) + self.assertEqual(u"file1", metadata["backend"]) 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({'store': u'file1'}, metadata) + self.assertEqual({'backend': 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["store"]) + self.assertEqual(u"file1", metadata["backend"]) 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["store"]) + self.assertEqual(u"file1", metadata["backend"]) # 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["store"]) + self.assertEqual(u"file1", metadata["backend"]) 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["store"]) + self.assertEqual(u"file1", metadata["backend"]) 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["store"]) + self.assertEqual(u"file1", metadata["backend"]) 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["store"]) + self.assertEqual(u"file1", metadata["backend"]) 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["store"]) + self.assertEqual(u"file1", metadata["backend"]) self.assertEqual(expected_location, location) self.assertEqual(expected_file_size, size) diff --git a/glance_store/tests/unit/test_multistore_rbd.py b/glance_store/tests/unit/test_multistore_rbd.py index 4d4d74b..75dd9bc 100644 --- a/glance_store/tests/unit/test_multistore_rbd.py +++ b/glance_store/tests/unit/test_multistore_rbd.py @@ -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]['store']) + self.assertEqual("ceph1", ret[3]['backend']) 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]['store']) + self.assertEqual("ceph2", ret[3]['backend']) @mock.patch.object(MockRBD.Image, '__enter__') @mock.patch.object(rbd_store.Store, '_create_image') diff --git a/glance_store/tests/unit/test_multistore_vmware.py b/glance_store/tests/unit/test_multistore_vmware.py index 7ca8a7a..c4ab983 100644 --- a/glance_store/tests/unit/test_multistore_vmware.py +++ b/glance_store/tests/unit/test_multistore_vmware.py @@ -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["store"]) + self.assertEqual("vmware1", metadata["backend"]) 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["store"]) + self.assertEqual("vmware1", metadata["backend"]) 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["store"]) + self.assertEqual("vmware1", metadata["backend"]) 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["store"]) + self.assertEqual("vmware1", metadata["backend"]) fake_reader.assert_called_with(image, self.hash_algo, verifier) diff --git a/glance_store/tests/unit/test_swift_store_multibackend.py b/glance_store/tests/unit/test_swift_store_multibackend.py index 9c6931f..b64538a 100644 --- a/glance_store/tests/unit/test_swift_store_multibackend.py +++ b/glance_store/tests/unit/test_swift_store_multibackend.py @@ -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["store"]) + self.assertEqual("swift1", metadata["backend"]) 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['store']) + self.assertEqual("swift1", arg['backend']) 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['store']) + self.assertEqual("swift1", metadata['backend']) # 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['store']) + self.assertEqual("swift1", metadata['backend']) 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['store']) + self.assertEqual("swift1", metadata['backend']) 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['store']) + self.assertEqual("swift1", metadata['backend']) 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['store']) + self.assertEqual("swift1", metadata['backend']) 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['store']) + self.assertEqual("swift1", metadata['backend']) 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['store']) + self.assertEqual("swift1", metadata['backend']) self.assertEqual(expected_location, loc) self.assertEqual(expected_swift_size, size) self.assertEqual(expected_checksum, checksum) -- cgit v1.2.1