compute: Add 'server group create --rule' option

This closes the remaining gap with the 2.64 compute API microversion.

Change-Id: Ia42b23d813b7af6ddb1a41f4e9bdc8a6160b908c
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>

1 files changed, 29 insertions, 2 deletions

diff --git a/openstackclient/tests/unit/compute/v2/test_server_group.py b/openstackclient/tests/unit/compute/v2/test_server_group.py
index 8de7492c..732c1881 100644
--- a/openstackclient/tests/unit/compute/v2/test_server_group.py
+++ b/openstackclient/tests/unit/compute/v2/test_server_group.py
@@ -152,28 +152,55 @@ class TestServerGroupCreate(TestServerGroup):
             '--os-compute-api-version 2.15 or greater is required',
             str(ex))
 
-    def test_server_group_create_v264(self):
+    def test_server_group_create_with_rules(self):
         self.app.client_manager.compute.api_version = api_versions.APIVersion(
             '2.64')
 
         arglist = [
             '--policy', 'soft-anti-affinity',
+            '--rule', 'max_server_per_host=2',
             'affinity_group',
         ]
         verifylist = [
             ('policy', 'soft-anti-affinity'),
+            ('rules', {'max_server_per_host': '2'}),
             ('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,
-            policy=parsed_args.policy,
+            policy=parsed_args.policy,  # should be 'policy', not 'policies'
+            rules=parsed_args.rules,
         )
 
         self.assertCountEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
+    def test_server_group_create_with_rules_pre_v264(self):
+        self.app.client_manager.compute.api_version = api_versions.APIVersion(
+            '2.63')
+
+        arglist = [
+            '--policy', 'soft-anti-affinity',
+            '--rule', 'max_server_per_host=2',
+            'affinity_group',
+        ]
+        verifylist = [
+            ('policy', 'soft-anti-affinity'),
+            ('rules', {'max_server_per_host': '2'}),
+            ('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.64 or greater is required',
+            str(ex))
+
 
 class TestServerGroupDelete(TestServerGroup):