From d3bd0146ae64ebc3a7c5d7a3a2fc90efe4071495 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <sfinucan@redhat.com>
Date: Fri, 5 Mar 2021 12:39:37 +0000
Subject: compute: Add support for loading BDMs from files

The syntax of the '--block-device' parameter is complex and easily
screwed up. Allow users to load a block device config from a file. For
example:

  $ openstack server create ... --block-device file:///tmp/bdm.json ...

This should alleviate the pain that is BDMv2 somewhat.

No functional tests are provided since we already have tests for the CSV
style of passing parameters and the unit tests show that the net result
is the same.

Change-Id: I3e3299bbdbbb343863b4c14fb4d9196ff3e1698d
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
---
 .../tests/unit/compute/v2/test_server.py           | 83 ++++++++++++++++++++++
 1 file changed, 83 insertions(+)

(limited to 'openstackclient/tests/unit')

diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py
index 9666c5fd..775ad0d9 100644
--- a/openstackclient/tests/unit/compute/v2/test_server.py
+++ b/openstackclient/tests/unit/compute/v2/test_server.py
@@ -16,6 +16,8 @@ import argparse
 import collections
 import copy
 import getpass
+import json
+import tempfile
 from unittest import mock
 from unittest.mock import call
 
@@ -2169,6 +2171,87 @@ class TestServerCreate(TestServer):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.datalist(), data)
 
+    def test_server_create_with_block_device_from_file(self):
+        self.app.client_manager.compute.api_version = api_versions.APIVersion(
+            '2.67')
+
+        block_device = {
+            'uuid': self.volume.id,
+            'source_type': 'volume',
+            'destination_type': 'volume',
+            'disk_bus': 'ide',
+            'device_type': 'disk',
+            'device_name': 'sdb',
+            'guest_format': 'ext4',
+            'volume_size': 64,
+            'volume_type': 'foo',
+            'boot_index': 1,
+            'delete_on_termination': True,
+            'tag': 'foo',
+        }
+
+        with tempfile.NamedTemporaryFile(mode='w+') as fp:
+            json.dump(block_device, fp=fp)
+            fp.flush()
+
+            arglist = [
+                '--image', 'image1',
+                '--flavor', self.flavor.id,
+                '--block-device', f'file://{fp.name}',
+                self.new_server.name,
+            ]
+            verifylist = [
+                ('image', 'image1'),
+                ('flavor', self.flavor.id),
+                ('block_devices', [block_device]),
+                ('server_name', self.new_server.name),
+            ]
+            parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        # CreateServer.take_action() returns two tuples
+        columns, data = self.cmd.take_action(parsed_args)
+
+        # Set expected values
+        kwargs = {
+            'meta': None,
+            'files': {},
+            'reservation_id': None,
+            'min_count': 1,
+            'max_count': 1,
+            'security_groups': [],
+            'userdata': None,
+            'key_name': None,
+            'availability_zone': None,
+            'admin_pass': None,
+            'block_device_mapping_v2': [{
+                'uuid': self.volume.id,
+                'source_type': 'volume',
+                'destination_type': 'volume',
+                'disk_bus': 'ide',
+                'device_name': 'sdb',
+                'volume_size': 64,
+                'guest_format': 'ext4',
+                'boot_index': 1,
+                'device_type': 'disk',
+                'delete_on_termination': True,
+                'tag': 'foo',
+                'volume_type': 'foo',
+            }],
+            'nics': 'auto',
+            'scheduler_hints': {},
+            'config_drive': None,
+        }
+        # ServerManager.create(name, image, flavor, **kwargs)
+        self.servers_mock.create.assert_called_with(
+            self.new_server.name,
+            self.image,
+            self.flavor,
+            **kwargs
+        )
+
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.datalist(), data)
+
     def test_server_create_with_block_device_invalid_boot_index(self):
         block_device = \
             f'uuid={self.volume.name},source_type=volume,boot_index=foo'
-- 
cgit v1.2.1