Browse Source

Merge "Stop silently ignoring invalid 'nova boot --hint' options" into stable/train

tags/15.1.1^0
Zuul 9 months ago
committed by Gerrit Code Review
parent
commit
79959abc90
3 changed files with 44 additions and 10 deletions
  1. +36
    -8
      novaclient/tests/unit/v2/test_shell.py
  2. +2
    -2
      novaclient/v2/shell.py
  3. +6
    -0
      releasenotes/notes/bug-1845322-463ee407b60131c9.yaml

+ 36
- 8
novaclient/tests/unit/v2/test_shell.py View File

@@ -85,17 +85,27 @@ class ShellTest(utils.TestCase):
self.useFixture(fixtures.MonkeyPatch(
'novaclient.client.Client', fakes.FakeClient))

# TODO(stephenfin): We should migrate most of the existing assertRaises
# calls to simply pass expected_error to this instead so we can easily
# capture and compare output
@mock.patch('sys.stdout', new_callable=six.StringIO)
@mock.patch('sys.stderr', new_callable=six.StringIO)
def run_command(self, cmd, mock_stderr, mock_stdout, api_version=None):
def run_command(self, cmd, mock_stderr, mock_stdout, api_version=None,
expected_error=None):
version_options = []
if api_version:
version_options.extend(["--os-compute-api-version", api_version,
"--service-type", "computev21"])
if isinstance(cmd, list):
self.shell.main(version_options + cmd)
if not isinstance(cmd, list):
cmd = cmd.split()

if expected_error:
self.assertRaises(expected_error,
self.shell.main,
version_options + cmd)
else:
self.shell.main(version_options + cmd.split())
self.shell.main(version_options + cmd)

return mock_stdout.getvalue(), mock_stderr.getvalue()

def assert_called(self, method, url, body=None, **kwargs):
@@ -748,9 +758,12 @@ class ShellTest(utils.TestCase):
self.assertEqual(expected, result.args[0])

def test_boot_hints(self):
self.run_command('boot --image %s --flavor 1 '
'--hint a=b0=c0 --hint a=b1=c1 some-server ' %
FAKE_UUID_1)
cmd = ('boot --image %s --flavor 1 '
'--hint same_host=a0cf03a5-d921-4877-bb5c-86d26cf818e1 '
'--hint same_host=8c19174f-4220-44f0-824a-cd1eeef10287 '
'--hint query=[>=,$free_ram_mb,1024] '
'some-server' % FAKE_UUID_1)
self.run_command(cmd)
self.assert_called_anytime(
'POST', '/servers',
{
@@ -761,10 +774,25 @@ class ShellTest(utils.TestCase):
'min_count': 1,
'max_count': 1,
},
'os:scheduler_hints': {'a': ['b0=c0', 'b1=c1']},
'os:scheduler_hints': {
'same_host': [
'a0cf03a5-d921-4877-bb5c-86d26cf818e1',
'8c19174f-4220-44f0-824a-cd1eeef10287',
],
'query': '[>=,$free_ram_mb,1024]',
},
},
)

def test_boot_hints_invalid(self):
cmd = ('boot --image %s --flavor 1 '
'--hint a0cf03a5-d921-4877-bb5c-86d26cf818e1 '
'some-server' % FAKE_UUID_1)
_, err = self.run_command(cmd, expected_error=SystemExit)
self.assertIn("'a0cf03a5-d921-4877-bb5c-86d26cf818e1' is not in "
"the format of 'key=value'",
err)

def test_boot_nic_auto_not_alone_after(self):
cmd = ('boot --image %s --flavor 1 '
'--nic auto,tag=foo some-server' %


+ 2
- 2
novaclient/v2/shell.py View File

@@ -489,8 +489,7 @@ def _boot(cs, args):

hints = {}
if args.scheduler_hints:
for hint in args.scheduler_hints:
key, _sep, value = hint.partition('=')
for key, value in args.scheduler_hints:
# NOTE(vish): multiple copies of the same hint will
# result in a list of values
if key in hints:
@@ -810,6 +809,7 @@ def _boot(cs, args):
'--hint',
action='append',
dest='scheduler_hints',
type=_key_value_pairing,
default=[],
metavar='<key=value>',
help=_("Send arbitrary key/value pairs to the scheduler for custom "


+ 6
- 0
releasenotes/notes/bug-1845322-463ee407b60131c9.yaml View File

@@ -0,0 +1,6 @@
---
upgrade:
- |
The ``--hint`` option for the ``boot`` command expects a key-value
argument. Previously, if this was not the case, the argument would be
silently ignored. It will now raise an error.

Loading…
Cancel
Save