Remove hard-coded policy choices for creating a server group

mriedem · mriedem · commit d0917cd14b94 · 2017-11-19T18:45:28.000-05:00
The hard-coded choices for the server group policy make it impossible
to create a server group with the soft-affinity or
soft-anti-affinity policy rules which were added in compute API
microversion 2.15. This removes the hard-coded choices so that the
policy is restricted on the server side rather than the client side.

Change-Id: Ib3dc39422ac1015872d56ae2fdeddf0f29613494
Closes-Bug: #1732938
diff --git a/openstackclient/compute/v2/server_group.py b/openstackclient/compute/v2/server_group.py
@@ -55,11 +55,12 @@ def get_parser(self, prog_name):
         parser.add_argument(
             '--policy',
             metavar='<policy>',
-            choices=['affinity', 'anti-affinity'],
             default='affinity',
             help=_("Add a policy to <name> "
                    "('affinity' or 'anti-affinity', "
-                   "default to 'affinity')")
+                   "defaults to 'affinity'). Specify --os-compute-api-version "
+                   "2.15 or higher for the 'soft-affinity' or "
+                   "'soft-anti-affinity' policy.")
         )
         return parser
 
diff --git a/openstackclient/tests/unit/compute/v2/test_server_group.py b/openstackclient/tests/unit/compute/v2/test_server_group.py
@@ -63,11 +63,11 @@ def setUp(self):
 
     def test_server_group_create(self):
         arglist = [
-            '--policy', 'anti-affinity',
+            '--policy', 'soft-anti-affinity',
             'affinity_group',
         ]
         verifylist = [
-            ('policy', 'anti-affinity'),
+            ('policy', 'soft-anti-affinity'),
             ('name', 'affinity_group'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)

Original file line number	Diff line number	Diff line change
`@@ -63,11 +63,11 @@ def setUp(self):`
`63`	`63`
`64`	`64`	`def test_server_group_create(self):`
`65`	`65`	`arglist = [`
`66`		`- '--policy', 'anti-affinity',`
	`66`	`+ '--policy', 'soft-anti-affinity',`
`67`	`67`	`'affinity_group',`
`68`	`68`	`]`
`69`	`69`	`verifylist = [`
`70`		`- ('policy', 'anti-affinity'),`
	`70`	`+ ('policy', 'soft-anti-affinity'),`
`71`	`71`	`('name', 'affinity_group'),`
`72`	`72`	`]`
`73`	`73`	`parsed_args = self.check_parser(self.cmd, arglist, verifylist)`