[microversions] Add support for API microversion 2.13

Nova now supports API microversion 2.13 to
allow return project_id and user_id for
os-server-groups API. Sync this to the
client side.

Change-Id: Ia09ab4bd5c693ed95b0f5dd9bc709b7597f7034e
Closes-Bug: #1526143

4 files changed, 115 insertions, 5 deletions

diff --git a/novaclient/__init__.py b/novaclient/__init__.py
index f407d9e3..7f5808a4 100644
--- a/novaclient/__init__.py
+++ b/novaclient/__init__.py
@@ -25,4 +25,4 @@ API_MIN_VERSION = api_versions.APIVersion("2.1")
 # when client supported the max version, and bumped sequentially, otherwise
 # the client may break due to server side new version may include some
 # backward incompatible change.
-API_MAX_VERSION = api_versions.APIVersion("2.12")
+API_MAX_VERSION = api_versions.APIVersion("2.13")
diff --git a/novaclient/tests/functional/v2/legacy/test_server_groups.py b/novaclient/tests/functional/v2/legacy/test_server_groups.py
new file mode 100644
index 00000000..ef7ff9ea
--- /dev/null
+++ b/novaclient/tests/functional/v2/legacy/test_server_groups.py
@@ -0,0 +1,49 @@
+#    Copyright 2015 Huawei Technology corp.
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import uuid
+
+from novaclient.tests.functional import base
+
+
+class TestServerGroupClient(base.ClientTestBase):
+    """Server groups v2.1 functional tests."""
+
+    COMPUTE_API_VERSION = "2.1"
+
+    def _create_sg(self, policy):
+        sg_name = 'server_group-' + str(uuid.uuid4())
+        output = self.nova('server-group-create %s %s' % (sg_name, policy))
+        sg_id = self._get_column_value_from_single_row_table(output, "Id")
+        return sg_id
+
+    def test_create_server_group(self):
+        sg_id = self._create_sg("affinity")
+        self.addCleanup(self.nova, 'server-group-delete %s' % sg_id)
+        sg = self.nova('server-group-get %s' % sg_id)
+        result = self._get_column_value_from_single_row_table(sg, "Id")
+        self.assertEqual(sg_id, result)
+
+    def test_list_server_group(self):
+        sg_id = self._create_sg("affinity")
+        self.addCleanup(self.nova, 'server-group-delete %s' % sg_id)
+        sg = self.nova('server-group-list')
+        result = self._get_column_value_from_single_row_table(sg, "Id")
+        self.assertEqual(sg_id, result)
+
+    def test_delete_server_group(self):
+        sg_id = self._create_sg("affinity")
+        sg = self.nova('server-group-get %s' % sg_id)
+        result = self._get_column_value_from_single_row_table(sg, "Id")
+        self.assertIsNotNone(result)
+        self.nova('server-group-delete %s' % sg_id)
diff --git a/novaclient/tests/functional/v2/test_server_groups.py b/novaclient/tests/functional/v2/test_server_groups.py
new file mode 100644
index 00000000..b2ad1262
--- /dev/null
+++ b/novaclient/tests/functional/v2/test_server_groups.py
@@ -0,0 +1,53 @@
+#    Copyright 2015 Huawei Technology corp.
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from novaclient.tests.functional.v2.legacy import test_server_groups
+
+
+class TestServerGroupClientV213(test_server_groups.TestServerGroupClient):
+    """Server groups v2.13 functional tests."""
+
+    COMPUTE_API_VERSION = "2.latest"
+
+    def test_create_server_group(self):
+        sg_id = self._create_sg("affinity")
+        self.addCleanup(self.nova, 'server-group-delete %s' % sg_id)
+        sg = self.nova('server-group-get %s' % sg_id)
+        result = self._get_column_value_from_single_row_table(sg, "Id")
+        self._get_column_value_from_single_row_table(
+            sg, "User Id")
+        self._get_column_value_from_single_row_table(
+            sg, "Project Id")
+        self.assertEqual(sg_id, result)
+
+    def test_list_server_groups(self):
+        sg_id = self._create_sg("affinity")
+        self.addCleanup(self.nova, 'server-group-delete %s' % sg_id)
+        sg = self.nova("server-group-list")
+        result = self._get_column_value_from_single_row_table(sg, "Id")
+        self._get_column_value_from_single_row_table(
+            sg, "User Id")
+        self._get_column_value_from_single_row_table(
+            sg, "Project Id")
+        self.assertEqual(sg_id, result)
+
+    def test_get_server_group(self):
+        sg_id = self._create_sg("affinity")
+        self.addCleanup(self.nova, 'server-group-delete %s' % sg_id)
+        sg = self.nova('server-group-get %s' % sg_id)
+        result = self._get_column_value_from_single_row_table(sg, "Id")
+        self._get_column_value_from_single_row_table(
+            sg, "User Id")
+        self._get_column_value_from_single_row_table(
+            sg, "Project Id")
+        self.assertEqual(sg_id, result)
diff --git a/novaclient/v2/shell.py b/novaclient/v2/shell.py
index 5b6028e7..0e602ef0 100644
--- a/novaclient/v2/shell.py
+++ b/novaclient/v2/shell.py
@@ -4594,11 +4594,19 @@ def do_availability_zone_list(cs, _args):
                      sortby_index=None)
 
 
-def _print_server_group_details(server_group):
+@api_versions.wraps("2.0", "2.12")
+def _print_server_group_details(cs, server_group):
     columns = ['Id', 'Name', 'Policies', 'Members', 'Metadata']
     utils.print_list(server_group, columns)
 
 
+@api_versions.wraps("2.13")
+def _print_server_group_details(cs, server_group):    # noqa
+    columns = ['Id', 'Name', 'Project Id', 'User Id',
+               'Policies', 'Members', 'Metadata']
+    utils.print_list(server_group, columns)
+
+
 @cliutils.arg(
     '--all-projects',
     dest='all_projects',
@@ -4608,7 +4616,7 @@ def _print_server_group_details(server_group):
 def do_server_group_list(cs, args):
     """Print a list of all server groups."""
     server_groups = cs.server_groups.list(args.all_projects)
-    _print_server_group_details(server_groups)
+    _print_server_group_details(cs, server_groups)
 
 
 def do_secgroup_list_default_rules(cs, args):
@@ -4702,7 +4710,7 @@ def do_server_group_create(cs, args):
     kwargs = {'name': args.name,
               'policies': args.policy}
     server_group = cs.server_groups.create(**kwargs)
-    _print_server_group_details([server_group])
+    _print_server_group_details(cs, [server_group])
 
 
 @cliutils.arg(
@@ -4734,7 +4742,7 @@ def do_server_group_delete(cs, args):
 def do_server_group_get(cs, args):
     """Get a specific server group."""
     server_group = cs.server_groups.get(args.id)
-    _print_server_group_details([server_group])
+    _print_server_group_details(cs, [server_group])
 
 
 def do_version_list(cs, args):