diff options
author | Zuul <zuul@review.openstack.org> | 2019-03-28 23:02:16 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2019-03-28 23:02:16 +0000 |
commit | d2b913f505d317d0aaf09c8034692a988fded242 (patch) | |
tree | 724a87a6605c30e6a8370654fd0a673dc96bee55 | |
parent | 26d80661eda40082b87dfa425ee4cddd8967b19a (diff) | |
parent | 154b29b7a34ee3e1938574de2a69255b879979e5 (diff) | |
download | python-novaclient-d2b913f505d317d0aaf09c8034692a988fded242.tar.gz |
Merge "Fix up userdata argument to rebuild." into stable/queens
-rw-r--r-- | novaclient/tests/unit/v2/test_shell.py | 19 | ||||
-rw-r--r-- | novaclient/v2/shell.py | 11 | ||||
-rw-r--r-- | releasenotes/notes/fix-rebuild-userdata-9315e5784feb8ba9.yaml | 5 |
3 files changed, 29 insertions, 6 deletions
diff --git a/novaclient/tests/unit/v2/test_shell.py b/novaclient/tests/unit/v2/test_shell.py index 34c6717b..8bdacda2 100644 --- a/novaclient/tests/unit/v2/test_shell.py +++ b/novaclient/tests/unit/v2/test_shell.py @@ -1602,18 +1602,29 @@ class ShellTest(utils.TestCase): cmd % (FAKE_UUID_1, testfile), api_version='2.57') def test_rebuild_change_user_data(self): - self.run_command('rebuild sample-server %s --user-data test' % - FAKE_UUID_1, api_version='2.57') - user_data = servers.ServerManager.transform_userdata('test') + testfile = os.path.join(os.path.dirname(__file__), 'testfile.txt') + with open(testfile) as testfile_fd: + data = testfile_fd.read().encode('utf-8') + expected_file_data = servers.ServerManager.transform_userdata(data) + self.run_command('rebuild sample-server %s --user-data %s' % + (FAKE_UUID_1, testfile), api_version='2.57') self.assert_called('GET', '/servers?name=sample-server', pos=0) self.assert_called('GET', '/servers/1234', pos=1) self.assert_called('GET', '/v2/images/%s' % FAKE_UUID_1, pos=2) self.assert_called('POST', '/servers/1234/action', {'rebuild': {'imageRef': FAKE_UUID_1, - 'user_data': user_data, + 'user_data': expected_file_data, 'description': None}}, pos=3) self.assert_called('GET', '/v2/images/%s' % FAKE_UUID_2, pos=4) + def test_rebuild_invalid_user_data(self): + invalid_file = os.path.join(os.path.dirname(__file__), + 'no_such_file') + cmd = ('rebuild sample-server %s --user-data %s' + % (FAKE_UUID_1, invalid_file)) + self.assertRaises(exceptions.CommandError, self.run_command, cmd, + api_version='2.57') + def test_rebuild_unset_user_data(self): self.run_command('rebuild sample-server %s --user-data-unset' % FAKE_UUID_1, api_version='2.57') diff --git a/novaclient/v2/shell.py b/novaclient/v2/shell.py index 7c05d169..b47ba6dc 100644 --- a/novaclient/v2/shell.py +++ b/novaclient/v2/shell.py @@ -1850,8 +1850,15 @@ def do_rebuild(cs, args): _("Cannot specify '--user-data-unset' with " "'--user-data'.")) elif args.user_data: - kwargs['userdata'] = args.user_data - + try: + kwargs['userdata'] = open(args.user_data) + except IOError as e: + raise exceptions.CommandError( + _("Can't open '%(user_data)s': %(exc)s") % { + 'user_data': args.user_data, + 'exc': e, + } + ) if cs.api_version >= api_versions.APIVersion('2.54'): if args.key_unset: kwargs['key_name'] = None diff --git a/releasenotes/notes/fix-rebuild-userdata-9315e5784feb8ba9.yaml b/releasenotes/notes/fix-rebuild-userdata-9315e5784feb8ba9.yaml new file mode 100644 index 00000000..4d540758 --- /dev/null +++ b/releasenotes/notes/fix-rebuild-userdata-9315e5784feb8ba9.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + The user data argument to rebuild was passing the filename as is as userdata. + Now this passes the contents of the filename as intended. |