openstack/cinder
Code Issues Proposed changes

Merge "Fix Snapshot object metadata loading"

Browse Source
This commit is contained in:
Zuul 2019-02-26 17:16:34 +00:00 committed by Gerrit Code Review
commit 81eb9f352a
2 changed files with 2 additions and 1 deletions
cinder
objects
snapshot.py
tests/unit/objects
test_snapshot.py

2
cinder/objects/snapshot.py

@ -95,7 +95,7 @@ class Snapshot(cleanable.CinderCleanableObject, base.CinderObject,
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(Snapshot, self).__init__(*args, **kwargs) super(Snapshot, self).__init__(*args, **kwargs)
self._orig_metadata = {} self.metadata = kwargs.get('metadata', {})
self._reset_metadata_tracking() self._reset_metadata_tracking()

1
cinder/tests/unit/objects/test_snapshot.py

@ -167,6 +167,7 @@ class TestSnapshot(test_objects.BaseObjectsTestCase):
self.assertEqual(volume, snapshot.volume) self.assertEqual(volume, snapshot.volume)
volume_get_by_id.assert_called_once_with(self.context, volume_get_by_id.assert_called_once_with(self.context,
snapshot.volume_id) snapshot.volume_id)
self.assertEqual(snapshot.metadata, {})
# Test cgsnapshot lazy-loaded field # Test cgsnapshot lazy-loaded field
cgsnapshot = objects.CGSnapshot(context=self.context, cgsnapshot = objects.CGSnapshot(context=self.context,
id=fake.CGSNAPSHOT_ID) id=fake.CGSNAPSHOT_ID)