Merge "compute: Allow users to manually specify bootable volumes"

3 files changed, 58 insertions, 12 deletions

diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 5b97814b..7afacb3e 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -913,9 +913,7 @@ class CreateServer(command.ShowOne):
             required=True,
             help=_('Create server with this flavor (name or ID)'),
         )
-        disk_group = parser.add_mutually_exclusive_group(
-            required=True,
-        )
+        disk_group = parser.add_mutually_exclusive_group()
         disk_group.add_argument(
             '--image',
             metavar='<image>',
@@ -1473,14 +1471,14 @@ class CreateServer(command.ShowOne):
         if volume:
             block_device_mapping_v2 = [{
                 'uuid': volume,
-                'boot_index': '0',
+                'boot_index': 0,
                 'source_type': 'volume',
                 'destination_type': 'volume'
             }]
         elif snapshot:
             block_device_mapping_v2 = [{
                 'uuid': snapshot,
-                'boot_index': '0',
+                'boot_index': 0,
                 'source_type': 'snapshot',
                 'destination_type': 'volume',
                 'delete_on_termination': False
@@ -1489,7 +1487,7 @@ class CreateServer(command.ShowOne):
             # Tell nova to create a root volume from the image provided.
             block_device_mapping_v2 = [{
                 'uuid': image.id,
-                'boot_index': '0',
+                'boot_index': 0,
                 'source_type': 'image',
                 'destination_type': 'volume',
                 'volume_size': parsed_args.boot_from_volume
@@ -1626,6 +1624,15 @@ class CreateServer(command.ShowOne):
 
             block_device_mapping_v2.append(mapping)
 
+        if not image and not any(
+            [bdm.get('boot_index') == 0 for bdm in block_device_mapping_v2]
+        ):
+            msg = _(
+                'An image (--image, --image-property) or bootable volume '
+                '(--volume, --snapshot, --block-device) is required'
+            )
+            raise exceptions.CommandError(msg)
+
         nics = parsed_args.nics
 
         if 'auto' in nics or 'none' in nics:
diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py
index bd7ea27c..d7e84ba3 100644
--- a/openstackclient/tests/unit/compute/v2/test_server.py
+++ b/openstackclient/tests/unit/compute/v2/test_server.py
@@ -2470,7 +2470,7 @@ class TestServerCreate(TestServer):
             'admin_pass': None,
             'block_device_mapping_v2': [{
                 'uuid': self.volume.id,
-                'boot_index': '0',
+                'boot_index': 0,
                 'source_type': 'volume',
                 'destination_type': 'volume',
             }],
@@ -2521,7 +2521,7 @@ class TestServerCreate(TestServer):
             'admin_pass': None,
             'block_device_mapping_v2': [{
                 'uuid': self.snapshot.id,
-                'boot_index': '0',
+                'boot_index': 0,
                 'source_type': 'snapshot',
                 'destination_type': 'volume',
                 'delete_on_termination': False,
@@ -2544,20 +2544,20 @@ class TestServerCreate(TestServer):
         self.assertEqual(self.datalist(), data)
 
     def test_server_create_with_block_device(self):
-        block_device = f'uuid={self.volume.id},source_type=volume'
+        block_device = f'uuid={self.volume.id},source_type=volume,boot_index=0'
         arglist = [
-            '--image', 'image1',
             '--flavor', self.flavor.id,
             '--block-device', block_device,
             self.new_server.name,
         ]
         verifylist = [
-            ('image', 'image1'),
+            ('image', None),
             ('flavor', self.flavor.id),
             ('block_devices', [
                 {
                     'uuid': self.volume.id,
                     'source_type': 'volume',
+                    'boot_index': '0',
                 },
             ]),
             ('server_name', self.new_server.name),
@@ -2584,6 +2584,7 @@ class TestServerCreate(TestServer):
                     'uuid': self.volume.id,
                     'source_type': 'volume',
                     'destination_type': 'volume',
+                    'boot_index': 0,
                 },
             ],
             'nics': [],
@@ -2593,7 +2594,7 @@ class TestServerCreate(TestServer):
         # ServerManager.create(name, image, flavor, **kwargs)
         self.servers_mock.create.assert_called_with(
             self.new_server.name,
-            self.image,
+            None,
             self.flavor,
             **kwargs
         )
@@ -3521,6 +3522,37 @@ class TestServerCreate(TestServer):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.datalist(), data)
 
+    def test_server_create_no_boot_device(self):
+        block_device = f'uuid={self.volume.id},source_type=volume,boot_index=1'
+        arglist = [
+            '--block-device', block_device,
+            '--flavor', self.flavor.id,
+            self.new_server.name,
+        ]
+        verifylist = [
+            ('image', None),
+            ('flavor', self.flavor.id),
+            ('block_devices', [
+                {
+                    'uuid': self.volume.id,
+                    'source_type': 'volume',
+                    'boot_index': '1',
+                },
+            ]),
+            ('server_name', self.new_server.name),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        exc = self.assertRaises(
+            exceptions.CommandError,
+            self.cmd.take_action,
+            parsed_args,
+        )
+        self.assertIn(
+            'An image (--image, --image-property) or bootable volume '
+            '(--volume, --snapshot, --block-device) is required',
+            str(exc),
+        )
+
     def test_server_create_with_swap(self):
         arglist = [
             '--image', 'image1',
diff --git a/releasenotes/notes/bug-2010376-e15362bdd6c8d6ec.yaml b/releasenotes/notes/bug-2010376-e15362bdd6c8d6ec.yaml
new file mode 100644
index 00000000..9f2ea127
--- /dev/null
+++ b/releasenotes/notes/bug-2010376-e15362bdd6c8d6ec.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    The ``server create`` command will no longer insist on an ``--image``,
+    ``--image-property``, ``--volume`` or ``--snapshot`` argument when a
+    volume is provided with a boot index of ``0`` via the ``--block-device``
+    option.