diff options
| author | Zuul <zuul@review.openstack.org> | 2019-01-08 23:40:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-01-08 23:40:33 +0000 |
| commit | f51414945479a63bfcd4b697af89c2bdbed1b7ab (patch) | |
| tree | 13ac0634952d99c0b5445bc437340066f8a8a926 | |
| parent | 8246b74cf8701e532f9420d424241b64144c65f2 (diff) | |
| parent | 5610ebd10d18ac6db204d31e8b4341a33a31e327 (diff) | |
| download | python-novaclient-f51414945479a63bfcd4b697af89c2bdbed1b7ab.tar.gz | |
Merge "Fix up userdata argument to rebuild." into stable/rocky
| -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 c5492514..3d07ade8 100644 --- a/novaclient/tests/unit/v2/test_shell.py +++ b/novaclient/tests/unit/v2/test_shell.py @@ -1736,18 +1736,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 0bf6da8e..487a9aa7 100644 --- a/novaclient/v2/shell.py +++ b/novaclient/v2/shell.py @@ -1894,8 +1894,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. |