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 e8246eddffa2b36351b4215a95c40e52651005ae..796320ccc266d29c145d5828b83d18d13357d7c3 100644 (file)
--- 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 9fea56c46d0b07b18d98335b8f707b09f33271e6..967bcee53baa62f322c74aa35b5240491a8f65f0 100644 (file)
--- 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'],