openstack
/
python-openstackclient
Code Issues Proposed changes

Merge "Validate 'server group create --policy' option"

This commit is contained in:
Zuul 2020-10-21 20:05:12 +00:00 committed by Gerrit Code Review
parent 0228790024 ab0b1fe885
commit deae091f78
2 changed files with 63 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
openstackclient/compute/v2/server_group.py
View File

@ -56,12 +56,18 @@ class CreateServerGroup(command.ShowOne):
parser.add_argument(
'--policy',
metavar='<policy>',
choices=[
'affinity',
'anti-affinity',
'soft-affinity',
'soft-anti-affinity',
],
default='affinity',
help=_("Add a policy to <name> "
"('affinity' or 'anti-affinity', "
"defaults to 'affinity'). Specify --os-compute-api-version "
"2.15 or higher for the 'soft-affinity' or "
"'soft-anti-affinity' policy.")
help=_(
"Add a policy to <name> "
"Specify --os-compute-api-version 2.15 or higher for the "
"'soft-affinity' or 'soft-anti-affinity' policy."
)
)
return parser
@ -69,9 +75,18 @@ class CreateServerGroup(command.ShowOne):
compute_client = self.app.client_manager.compute
info = {}
if parsed_args.policy in ('soft-affinity', 'soft-anti-affinity'):
if compute_client.api_version < api_versions.APIVersion('2.15'):
msg = _(
'--os-compute-api-version 2.15 or greater is required to '
'support the %s policy'
)
raise exceptions.CommandError(msg % parsed_args.policy)
policy_arg = {'policies': [parsed_args.policy]}
if compute_client.api_version >= api_versions.APIVersion("2.64"):
policy_arg = {'policy': parsed_args.policy}
server_group = compute_client.server_groups.create(
name=parsed_args.name, **policy_arg)

43
openstackclient/tests/unit/compute/v2/test_server_group.py
View File

@ -90,6 +90,28 @@ class TestServerGroupCreate(TestServerGroup):
self.cmd = server_group.CreateServerGroup(self.app, None)
def test_server_group_create(self):
arglist = [
'--policy', 'anti-affinity',
'affinity_group',
]
verifylist = [
('policy', 'anti-affinity'),
('name', 'affinity_group'),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args)
self.server_groups_mock.create.assert_called_once_with(
name=parsed_args.name,
policies=[parsed_args.policy],
)
self.assertEqual(self.columns, columns)
self.assertEqual(self.data, data)
def test_server_group_create_with_soft_policies(self):
self.app.client_manager.compute.api_version = api_versions.APIVersion(
'2.15')
arglist = [
'--policy', 'soft-anti-affinity',
'affinity_group',
@ -108,6 +130,27 @@ class TestServerGroupCreate(TestServerGroup):
self.assertEqual(self.columns, columns)
self.assertEqual(self.data, data)
def test_server_group_create_with_soft_policies_pre_v215(self):
self.app.client_manager.compute.api_version = api_versions.APIVersion(
'2.14')
arglist = [
'--policy', 'soft-anti-affinity',
'affinity_group',
]
verifylist = [
('policy', 'soft-anti-affinity'),
('name', 'affinity_group'),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
ex = self.assertRaises(
exceptions.CommandError,
self.cmd.take_action,
parsed_args)
self.assertIn(
'--os-compute-api-version 2.15 or greater is required',
str(ex))
def test_server_group_create_v264(self):
self.app.client_manager.compute.api_version = api_versions.APIVersion(
'2.64')