compute: Remove 'file://' prefix from '--block-device'

stephenfin · stephenfin · commit 2ccf7727a6c0 · 2021-03-11T15:56:59.000Z
There are a couple of other (networking-related) options which accept
paths, none of which insist on a URI-style path. Let's just drop this
bit of complexity before we release the feature.

Change-Id: Ia7f781d82f3f4695b49b55a39abbb6e582cd879c
Signed-off-by: Stephen Finucane &lt;sfinucan@redhat.com&gt;
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
@@ -21,7 +21,6 @@
 import json
 import logging
 import os
-import urllib.parse
 
 from cliff import columns as cliff_columns
 import iso8601
@@ -774,9 +773,8 @@ def __call__(self, parser, namespace, values, option_string=None):
         if getattr(namespace, self.dest, None) is None:
             setattr(namespace, self.dest, [])
 
-        if values.startswith('file://'):
-            path = urllib.parse.urlparse(values).path
-            with open(path) as fh:
+        if os.path.exists(values):
+            with open(values) as fh:
                 data = json.load(fh)
 
             # Validate the keys - other validation is left to later
@@ -898,10 +896,9 @@ def get_parser(self, prog_name):
             default=[],
             help=_(
                 'Create a block device on the server.\n'
-                'Either a URI-style path (\'file:\\\\{path}\') to a JSON file '
-                'or a CSV-serialized string describing the block device '
-                'mapping.\n'
-                'The following keys are accepted:\n'
+                'Either a path to a JSON file or a CSV-serialized string '
+                'describing the block device mapping.\n'
+                'The following keys are accepted for both:\n'
                 'uuid=<uuid>: UUID of the volume, snapshot or ID '
                 '(required if using source image, snapshot or volume),\n'
                 'source_type=<source_type>: source type '
diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py
@@ -2197,7 +2197,7 @@ def test_server_create_with_block_device_from_file(self):
             arglist = [
                 '--image', 'image1',
                 '--flavor', self.flavor.id,
-                '--block-device', f'file://{fp.name}',
+                '--block-device', fp.name,
                 self.new_server.name,
             ]
             verifylist = [

Original file line number	Diff line number	Diff line change
`@@ -2197,7 +2197,7 @@ def test_server_create_with_block_device_from_file(self):`
`2197`	`2197`	`arglist = [`
`2198`	`2198`	`'--image', 'image1',`
`2199`	`2199`	`'--flavor', self.flavor.id,`
`2200`		`- '--block-device', f'file://{fp.name}',`
	`2200`	`+ '--block-device', fp.name,`
`2201`	`2201`	`self.new_server.name,`
`2202`	`2202`	`]`
`2203`	`2203`	`verifylist = [`