Merge "Set bootable flag for volume serializer"

cinder/api/v1/volumes.py

@@ -131,6 +131,7 @@ def make_volume(elem):
     elem.set('availability_zone')
     elem.set('created_at')
     elem.set('display_name')
+    elem.set('bootable')
     elem.set('display_description')
     elem.set('volume_type')
     elem.set('snapshot_id')

cinder/api/v2/volumes.py

@@ -52,6 +52,7 @@ def make_volume(elem):
     elem.set('availability_zone')
     elem.set('created_at')
     elem.set('name')
+    elem.set('bootable')
     elem.set('description')
     elem.set('volume_type')
     elem.set('snapshot_id')

cinder/tests/api/v1/test_volumes.py

@@ -622,7 +622,7 @@ class VolumeSerializerTest(test.TestCase):
 
         for attr in ('id', 'status', 'size', 'availability_zone', 'created_at',
                      'display_name', 'display_description', 'volume_type',
-                     'snapshot_id'):
+                     'bootable', 'snapshot_id'):
             self.assertEqual(str(vol[attr]), tree.get(attr))
 
         for child in tree:
@@ -648,6 +648,7 @@ class VolumeSerializerTest(test.TestCase):
             status='vol_status',
             size=1024,
             availability_zone='vol_availability',
+            bootable=False,
             created_at=datetime.datetime.now(),
             attachments=[dict(id='vol_id',
                               volume_id='vol_id',
@@ -673,6 +674,7 @@ class VolumeSerializerTest(test.TestCase):
                             status='vol1_status',
                             size=1024,
                             availability_zone='vol1_availability',
+                            bootable=True,
                             created_at=datetime.datetime.now(),
                             attachments=[dict(id='vol1_id',
                                               volume_id='vol1_id',
@@ -689,6 +691,7 @@ class VolumeSerializerTest(test.TestCase):
                             status='vol2_status',
                             size=1024,
                             availability_zone='vol2_availability',
+                            bootable=False,
                             created_at=datetime.datetime.now(),
                             attachments=[dict(id='vol2_id',
                                               volume_id='vol2_id',

cinder/tests/api/v2/test_volumes.py

@@ -821,7 +821,7 @@ class VolumeSerializerTest(test.TestCase):
         self.assertEqual(tree.tag, NS + 'volume')
 
         for attr in ('id', 'status', 'size', 'availability_zone', 'created_at',
-                     'name', 'description', 'volume_type',
+                     'name', 'description', 'volume_type', 'bootable',
                      'snapshot_id', 'source_volid'):
             self.assertEqual(str(vol[attr]), tree.get(attr))
 
@@ -848,6 +848,7 @@ class VolumeSerializerTest(test.TestCase):
             status='vol_status',
             size=1024,
             availability_zone='vol_availability',
+            bootable=False,
             created_at=datetime.datetime.now(),
             attachments=[
                 dict(
@@ -882,6 +883,7 @@ class VolumeSerializerTest(test.TestCase):
                 status='vol1_status',
                 size=1024,
                 availability_zone='vol1_availability',
+                bootable=True,
                 created_at=datetime.datetime.now(),
                 attachments=[
                     dict(
@@ -903,6 +905,7 @@ class VolumeSerializerTest(test.TestCase):
                 status='vol2_status',
                 size=1024,
                 availability_zone='vol2_availability',
+                bootable=False,
                 created_at=datetime.datetime.now(),
                 attachments=[dict(id='vol2_id',
                                   volume_id='vol2_id',