diff options
| -rw-r--r-- | nova/api/ec2/cloud.py | 8 | ||||
| -rw-r--r-- | nova/tests/api/ec2/test_cinder_cloud.py | 1 |
2 files changed, 1 insertions, 8 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 3d210404c..96206da58 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -805,14 +805,6 @@ class CloudController(object): v['size'] = volume['size'] v['availabilityZone'] = volume['availability_zone'] v['createTime'] = volume['created_at'] - if context.is_admin: - # NOTE(dprince): project_id and host_id are unset w/ Cinder - v['status'] = '%s (%s, %s, %s, %s)' % ( - volume['status'], - volume.get('project_id', ''), - volume.get('host', ''), - instance_data, - volume['mountpoint']) if volume['attach_status'] == 'attached': v['attachmentSet'] = [{'attachTime': volume['attach_time'], 'deleteOnTermination': False, diff --git a/nova/tests/api/ec2/test_cinder_cloud.py b/nova/tests/api/ec2/test_cinder_cloud.py index ffb2b4948..1751343ce 100644 --- a/nova/tests/api/ec2/test_cinder_cloud.py +++ b/nova/tests/api/ec2/test_cinder_cloud.py @@ -174,6 +174,7 @@ class CinderCloudTestCase(test.TestCase): size=1, name='test-1', description='test volume 1') + self.assertEqual(vol1['status'], 'available') vol2 = self.cloud.create_volume(self.context, size=1, name='test-2', |