Merge "Support mark volume as bootable in volume set"

Author: Jenkins

doc/source/command-objects/volume.rst

@@ -193,6 +193,7 @@ Set volume properties
         [--property <key=value> [...] ]
         [--image-property <key=value> [...] ]
         [--state <state>]
+        [--bootable | --non-bootable]
         <volume>
 
 .. option:: --name <name>
@@ -211,6 +212,14 @@ Set volume properties
 
     Set a property on this volume (repeat option to set multiple properties)
 
+.. option:: --bootable
+
+    Mark volume as bootable
+
+.. option:: --non-bootable
+
+    Mark volume as non-bootable
+
 .. option:: --image-property <key=value>
 
     Set an image property on this volume

openstackclient/tests/functional/volume/v1/test_volume.py

@@ -75,3 +75,14 @@ def test_volume_set_size(self):
         opts = self.get_opts(["display_name", "size"])
         raw_output = self.openstack('volume show ' + self.NAME + opts)
         self.assertEqual(self.NAME + "\n2\n", raw_output)
+
+    def test_volume_set_bootable(self):
+        self.openstack('volume set --bootable ' + self.NAME)
+        opts = self.get_opts(["bootable"])
+        raw_output = self.openstack('volume show ' + self.NAME + opts)
+        self.assertEqual("true\n", raw_output)
+
+        self.openstack('volume set --non-bootable ' + self.NAME)
+        opts = self.get_opts(["bootable"])
+        raw_output = self.openstack('volume show ' + self.NAME + opts)
+        self.assertEqual("false\n", raw_output)

openstackclient/tests/functional/volume/v2/test_volume.py

@@ -91,6 +91,17 @@ def test_volume_set_size(self):
         raw_output = self.openstack('volume show ' + self.NAME + opts)
         self.assertEqual(self.NAME + "\n2\n", raw_output)
 
+    def test_volume_set_bootable(self):
+        self.openstack('volume set --bootable ' + self.NAME)
+        opts = self.get_opts(["bootable"])
+        raw_output = self.openstack('volume show ' + self.NAME + opts)
+        self.assertEqual("true\n", raw_output)
+
+        self.openstack('volume set --non-bootable ' + self.NAME)
+        opts = self.get_opts(["bootable"])
+        raw_output = self.openstack('volume show ' + self.NAME + opts)
+        self.assertEqual("false\n", raw_output)
+
     def test_volume_snapshot(self):
         opts = self.get_opts(self.FIELDS)
 

openstackclient/tests/unit/volume/v1/test_volume.py

@@ -844,6 +844,8 @@ def test_volume_set_property(self):
             ('size', None),
             ('property', {'myprop': 'myvalue'}),
             ('volume', volume_fakes.volume_name),
+            ('bootable', False),
+            ('non_bootable', False)
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -858,3 +860,28 @@ def test_volume_set_property(self):
             metadata
         )
         self.assertIsNone(result)
+
+    def test_volume_set_bootable(self):
+        arglist = [
+            ['--bootable', volume_fakes.volume_id],
+            ['--non-bootable', volume_fakes.volume_id]
+        ]
+        verifylist = [
+            [
+                ('bootable', True),
+                ('non_bootable', False),
+                ('volume', volume_fakes.volume_id)
+            ],
+            [
+                ('bootable', False),
+                ('non_bootable', True),
+                ('volume', volume_fakes.volume_id)
+            ]
+        ]
+        for index in range(len(arglist)):
+            parsed_args = self.check_parser(
+                self.cmd, arglist[index], verifylist[index])
+
+            self.cmd.take_action(parsed_args)
+            self.volumes_mock.set_bootable.assert_called_with(
+                volume_fakes.volume_id, verifylist[index][0][1])

openstackclient/tests/unit/volume/v2/test_volume.py

@@ -905,6 +905,8 @@ def test_volume_set_image_property(self):
         verifylist = [
             ('image_property', {'Alpha': 'a', 'Beta': 'b'}),
             ('volume', self.new_volume.id),
+            ('bootable', False),
+            ('non_bootable', False)
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -952,6 +954,31 @@ def test_volume_set_state_failed(self):
         self.volumes_mock.reset_state.assert_called_with(
             self.new_volume.id, 'error')
 
+    def test_volume_set_bootable(self):
+        arglist = [
+            ['--bootable', self.new_volume.id],
+            ['--non-bootable', self.new_volume.id]
+        ]
+        verifylist = [
+            [
+                ('bootable', True),
+                ('non_bootable', False),
+                ('volume', self.new_volume.id)
+            ],
+            [
+                ('bootable', False),
+                ('non_bootable', True),
+                ('volume', self.new_volume.id)
+            ]
+        ]
+        for index in range(len(arglist)):
+            parsed_args = self.check_parser(
+                self.cmd, arglist[index], verifylist[index])
+
+            self.cmd.take_action(parsed_args)
+            self.volumes_mock.set_bootable.assert_called_with(
+                self.new_volume.id, verifylist[index][0][1])
+
 
 class TestVolumeShow(TestVolume):
 

openstackclient/volume/v1/volume.py

@@ -363,6 +363,17 @@ def get_parser(self, prog_name):
             help=_('Set a property on this volume '
                    '(repeat option to set multiple properties)'),
         )
+        bootable_group = parser.add_mutually_exclusive_group()
+        bootable_group.add_argument(
+            "--bootable",
+            action="store_true",
+            help=_("Mark volume as bootable")
+        )
+        bootable_group.add_argument(
+            "--non-bootable",
+            action="store_true",
+            help=_("Mark volume as non-bootable")
+        )
         return parser
 
     def take_action(self, parsed_args):
@@ -382,7 +393,12 @@ def take_action(self, parsed_args):
 
         if parsed_args.property:
             volume_client.volumes.set_metadata(volume.id, parsed_args.property)
-
+        if parsed_args.bootable or parsed_args.non_bootable:
+            try:
+                volume_client.volumes.set_bootable(
+                    volume.id, parsed_args.bootable)
+            except Exception as e:
+                LOG.error(_("Failed to set volume bootable property: %s"), e)
         kwargs = {}
         if parsed_args.name:
             kwargs['display_name'] = parsed_args.name

openstackclient/volume/v2/volume.py

@@ -404,6 +404,17 @@ def get_parser(self, prog_name):
                    '"deleting", "in-use", "attaching", "detaching", '
                    '"error_deleting" or "maintenance")'),
         )
+        bootable_group = parser.add_mutually_exclusive_group()
+        bootable_group.add_argument(
+            "--bootable",
+            action="store_true",
+            help=_("Mark volume as bootable")
+        )
+        bootable_group.add_argument(
+            "--non-bootable",
+            action="store_true",
+            help=_("Mark volume as non-bootable")
+        )
         return parser
 
     def take_action(self, parsed_args):
@@ -446,6 +457,13 @@ def take_action(self, parsed_args):
             except Exception as e:
                 LOG.error(_("Failed to set volume state: %s"), e)
                 result += 1
+        if parsed_args.bootable or parsed_args.non_bootable:
+            try:
+                volume_client.volumes.set_bootable(
+                    volume.id, parsed_args.bootable)
+            except Exception as e:
+                LOG.error(_("Failed to set volume bootable property: %s"), e)
+                result += 1
 
         kwargs = {}
         if parsed_args.name:

releasenotes/notes/bug-1535704-d6f013bfa22ab668.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Add ``--bootable`` and ``--non-bootable`` options to ``os volume set``
+    command to mark volume as bootable or non-bootable.
+    [Bug `1535704 <https://bugs.launchpad.net/bugs/1535704>`_]