Merge "Fix "server create"command with --boot-from-volume"

Zuul · openstack-gerrit · commit 0fb1cae1a895 · 2023-10-11T15:59:24.000Z
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
@@ -1602,6 +1602,12 @@ def _match_image(image_api, wanted_properties):
             ]
         elif parsed_args.boot_from_volume:
             # Tell nova to create a root volume from the image provided.
+            if not image:
+                msg = _(
+                    "An image (--image or --image-property) is required "
+                    "to support --boot-from-volume option"
+                )
+                raise exceptions.CommandError(msg)
             block_device_mapping_v2 = [
                 {
                     'uuid': image.id,
diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py
@@ -3414,6 +3414,34 @@ def test_server_create_volume_boot_from_volume_conflict(self):
             '--volume is not allowed with --boot-from-volume', str(ex)
         )
 
+    def test_server_create_boot_from_volume_no_image(self):
+        # Test --boot-from-volume option without --image or
+        # --image-property.
+        arglist = [
+            '--flavor',
+            self.flavor.id,
+            '--boot-from-volume',
+            '1',
+            self.new_server.name,
+        ]
+        verifylist = [
+            ('flavor', self.flavor.id),
+            ('boot_from_volume', 1),
+            ('config_drive', False),
+            ('server_name', self.new_server.name),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        ex = self.assertRaises(
+            exceptions.CommandError, self.cmd.take_action, parsed_args
+        )
+        # Assert it is the error we expect.
+        self.assertIn(
+            'An image (--image or --image-property) is required '
+            'to support --boot-from-volume option',
+            str(ex),
+        )
+
     def test_server_create_image_property(self):
         arglist = [
             '--image-property',

Original file line number	Diff line number	Diff line change
`@@ -1602,6 +1602,12 @@ def _match_image(image_api, wanted_properties):`
`1602`	`1602`	`]`
`1603`	`1603`	`elif parsed_args.boot_from_volume:`
`1604`	`1604`	`# Tell nova to create a root volume from the image provided.`
	`1605`	`+ if not image:`
	`1606`	`+ msg = _(`
	`1607`	`+ "An image (--image or --image-property) is required "`
	`1608`	`+ "to support --boot-from-volume option"`
	`1609`	`+ )`
	`1610`	`+ raise exceptions.CommandError(msg)`
`1605`	`1611`	`block_device_mapping_v2 = [`
`1606`	`1612`	`{`
`1607`	`1613`	`'uuid': image.id,`