Merge ~niedbalski/ubuntu/+source/cinder:fix-1631561 into ~ubuntu-server-dev/ubuntu/+source/cinder:stable/mitaka

[Jorge Niedbalski]

Fixes test errors introduced by previous commit (LP: #1631561).

diff --git a/debian/patches/log-message-cleanup-for-volume-usage-audit.patch b/debian/patches/log-message-cleanup-for-volume-usage-audit.patch
index 1f9c3d5..005eec1 100644
--- a/debian/patches/log-message-cleanup-for-volume-usage-audit.patch
+++ b/debian/patches/log-message-cleanup-for-volume-usage-audit.patch
@@ -227,25 +227,25 @@ index 1ab6d73..29b052c 100644
 +    @mock.patch('cinder.objects.Volume.get_by_id')
 +    def test_usage_from_deleted_snapshot(self, volume_get_by_id):
 +        raw_volume = {
-+            'id': fake.VOLUME_ID,
++            'id': fake.volume_id,
 +            'availability_zone': 'nova',
 +            'deleted': 1
 +        }
 +        ctxt = context.get_admin_context()
 +        volume_obj = fake_volume.fake_volume_obj(ctxt, **raw_volume)
 +        volume_get_by_id.side_effect = exception.VolumeNotFound(
-+            volume_id=fake.VOLUME_ID)
++            volume_id=fake.volume_id)
 +
 +        raw_snapshot = {
-+            'project_id': fake.PROJECT_ID,
-+            'user_id': fake.USER_ID,
++            'project_id': fake.project_id,
++            'user_id': fake.user_id,
 +            'volume': volume_obj,
-+            'volume_id': fake.VOLUME_ID,
++            'volume_id': fake.volume_id,
 +            'volume_size': 1,
-+            'id': fake.SNAPSHOT_ID,
++            'id': fake.snapshot_id,
 +            'display_name': '11',
 +            'created_at': '2014-12-11T10:10:00',
-+            'status': fields.SnapshotStatus.ERROR,
++            'status': 'error',
 +            'deleted': '',
 +            'snapshot_metadata': [{'key': 'fake_snap_meta_key',
 +                                   'value': 'fake_snap_meta_value'}],
@@ -255,15 +255,15 @@ index 1ab6d73..29b052c 100644
 +        snapshot_obj = fake_snapshot.fake_snapshot_obj(ctxt, **raw_snapshot)
 +        usage_info = volume_utils._usage_from_snapshot(snapshot_obj)
 +        expected_snapshot = {
-+            'tenant_id': fake.PROJECT_ID,
-+            'user_id': fake.USER_ID,
++            'tenant_id': fake.project_id,
++            'user_id': fake.user_id,
 +            'availability_zone': '',
-+            'volume_id': fake.VOLUME_ID,
++            'volume_id': fake.volume_id,
 +            'volume_size': 1,
-+            'snapshot_id': fake.SNAPSHOT_ID,
++            'snapshot_id': fake.snapshot_id,
 +            'display_name': '11',
 +            'created_at': 'DONTCARE',
-+            'status': fields.SnapshotStatus.ERROR,
++            'status': 'error',
 +            'deleted': '',
 +            'metadata': six.text_type({'fake_snap_meta_key':
 +                                      u'fake_snap_meta_value'}),