diff options
| author | Zuul <zuul@review.openstack.org> | 2017-11-30 18:46:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-11-30 18:46:54 +0000 |
| commit | 5c90dc5dc3e3b39f20679e32910d746566d23ea8 (patch) | |
| tree | 4c8742f5e7d8b7ef5eee30751c719b296a296e2f | |
| parent | 8eced505329a32533b1154700302780ca5af51ef (diff) | |
| parent | f7701cd6bc36aae5adb6ece553cbc4dc914790e3 (diff) | |
| download | python-openstackclient-5c90dc5dc3e3b39f20679e32910d746566d23ea8.tar.gz | |
Merge "Remove hard-coded policy choices for creating a server group" into stable/pike
| -rw-r--r-- | openstackclient/compute/v2/server_group.py | 5 | ||||
| -rw-r--r-- | openstackclient/tests/unit/compute/v2/test_server_group.py | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/openstackclient/compute/v2/server_group.py b/openstackclient/compute/v2/server_group.py index c6e2161f..c49a552f 100644 --- a/openstackclient/compute/v2/server_group.py +++ b/openstackclient/compute/v2/server_group.py @@ -55,11 +55,12 @@ class CreateServerGroup(command.ShowOne): 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 index 088497da..dc924e24 100644 --- a/openstackclient/tests/unit/compute/v2/test_server_group.py +++ b/openstackclient/tests/unit/compute/v2/test_server_group.py @@ -63,11 +63,11 @@ class TestServerGroupCreate(TestServerGroup): 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) |