Merge "v2 api - return bootable attr value on volume list"

This commit is contained in:
Jenkins 2013-10-03 00:43:37 +00:00 committed by Gerrit Code Review
commit 743f114851
2 changed files with 10 additions and 1 deletions

View File

@ -67,7 +67,8 @@ class ViewBuilder(common.ViewBuilder):
'source_volid': volume.get('source_volid'),
'metadata': self._get_volume_metadata(volume),
'links': self._get_links(request, volume['id']),
'user_id': volume.get('user_id')
'user_id': volume.get('user_id'),
'bootable': str(volume.get('bootable')).lower()
}
}

View File

@ -246,6 +246,7 @@ class VolumeApiTest(test.TestCase):
'status': 'fakestatus',
'description': 'displaydesc',
'availability_zone': 'fakeaz',
'bootable': 'false',
'name': 'Updated Test Name',
'attachments': [
{
@ -292,6 +293,7 @@ class VolumeApiTest(test.TestCase):
'status': 'fakestatus',
'description': 'displaydesc',
'availability_zone': 'fakeaz',
'bootable': 'false',
'name': 'displayname',
'attachments': [{
'id': '1',
@ -349,6 +351,7 @@ class VolumeApiTest(test.TestCase):
'status': 'fakestatus',
'description': 'displaydesc',
'availability_zone': 'fakeaz',
'bootable': 'false',
'name': 'displayname',
'attachments': [{
'id': '1',
@ -446,6 +449,7 @@ class VolumeApiTest(test.TestCase):
'status': 'fakestatus',
'description': 'displaydesc',
'availability_zone': 'fakeaz',
'bootable': 'false',
'name': 'displayname',
'attachments': [
{
@ -501,6 +505,7 @@ class VolumeApiTest(test.TestCase):
'status': 'fakestatus',
'description': 'displaydesc',
'availability_zone': 'fakeaz',
'bootable': 'false',
'name': 'displayname',
'attachments': [
{
@ -832,6 +837,7 @@ class VolumeApiTest(test.TestCase):
'status': 'fakestatus',
'description': 'displaydesc',
'availability_zone': 'fakeaz',
'bootable': 'false',
'name': 'displayname',
'attachments': [
{
@ -877,6 +883,7 @@ class VolumeApiTest(test.TestCase):
'status': 'fakestatus',
'description': 'displaydesc',
'availability_zone': 'fakeaz',
'bootable': 'false',
'name': 'displayname',
'attachments': [],
'user_id': 'fakeuser',
@ -930,6 +937,7 @@ class VolumeApiTest(test.TestCase):
'status': 'fakestatus',
'description': 'displaydesc',
'availability_zone': 'fakeaz',
'bootable': 'false',
'name': 'displayname',
'attachments': [
{