From: Pavel Kirpichyov <pavel.kirpichyov@gmail.com>
Date: Thu, 10 Apr 2014 07:20:29 +0000 (+0300)
Subject: Inform about instance_uuid in volume usage notification
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1186e3b9bd4cc83b80256c48d6f11fd81809c038;p=openstack-build%2Fcinder-build.git

Inform about instance_uuid in volume usage notification

Change-Id: I6f43a2ef2401d6369ad0258f61fe2d3a8c168734
---

diff --git a/cinder/tests/test_volume.py b/cinder/tests/test_volume.py
index e8246eddf..796320ccc 100644
--- a/cinder/tests/test_volume.py
+++ b/cinder/tests/test_volume.py
@@ -257,6 +257,7 @@ class VolumeTestCase(BaseVolumeTestCase):
             'volume_id': volume_id,
             'volume_type': None,
             'snapshot_id': None,
+            'instance_uuid': None,
             'user_id': 'fake',
             'launched_at': 'DONTCARE',
             'size': 1,
diff --git a/cinder/volume/utils.py b/cinder/volume/utils.py
index 9fea56c46..967bcee53 100644
--- a/cinder/volume/utils.py
+++ b/cinder/volume/utils.py
@@ -41,6 +41,7 @@ def null_safe_str(s):
 def _usage_from_volume(context, volume_ref, **kw):
     usage_info = dict(tenant_id=volume_ref['project_id'],
                       user_id=volume_ref['user_id'],
+                      instance_uuid=volume_ref['instance_uuid'],
                       availability_zone=volume_ref['availability_zone'],
                       volume_id=volume_ref['id'],
                       volume_type=volume_ref['volume_type_id'],