Convert Server Groups to REST

Change-Id: If779c02521d0cf07d43f19ff9a11666838e4ac3b

shade/_tasks.py

@@ -47,26 +47,6 @@ class UserRemoveFromGroup(task_manager.Task):
         return client.keystone_client.users.remove_from_group(**self.args)
 
 
-class ServerGroupList(task_manager.Task):
-    def main(self, client):
-        return client.nova_client.server_groups.list(**self.args)
-
-
-class ServerGroupGet(task_manager.Task):
-    def main(self, client):
-        return client.nova_client.server_groups.get(**self.args)
-
-
-class ServerGroupCreate(task_manager.Task):
-    def main(self, client):
-        return client.nova_client.server_groups.create(**self.args)
-
-
-class ServerGroupDelete(task_manager.Task):
-    def main(self, client):
-        return client.nova_client.server_groups.delete(**self.args)
-
-
 class HypervisorList(task_manager.Task):
     def main(self, client):
         return client.nova_client.hypervisors.list(**self.args)

shade/openstackcloud.py

@@ -2034,8 +2034,9 @@ class OpenStackCloud(
         :returns: A list of server group dicts.
 
         """
-        with _utils.shade_exceptions("Error fetching server group list"):
-            return self.manager.submit_task(_tasks.ServerGroupList())
+        return self._compute_client.get(
+            '/os-server-groups',
+            error_message="Error fetching server group list")
 
     def get_compute_limits(self, name_or_id=None):
         """ Get compute limits for a project
@@ -5971,11 +5972,14 @@ class OpenStackCloud(
 
         :raises: OpenStackCloudException on operation error.
         """
-        with _utils.shade_exceptions(
-                "Unable to create server group {name}".format(
-                    name=name)):
-            return self.manager.submit_task(_tasks.ServerGroupCreate(
-                name=name, policies=policies))
+        return self._compute_client.post(
+            '/os-server-groups',
+            json={
+                'server_group': {
+                    'name': name,
+                    'policies': policies}},
+            error_message="Unable to create server group {name}".format(
+                name=name))
 
     def delete_server_group(self, name_or_id):
         """Delete a server group.
@@ -5992,10 +5996,10 @@ class OpenStackCloud(
                            name_or_id)
             return False
 
-        with _utils.shade_exceptions(
-                "Error deleting server group {name}".format(name=name_or_id)):
-            self.manager.submit_task(
-                _tasks.ServerGroupDelete(id=server_group['id']))
+        self._compute_client.delete(
+            '/os-server-groups/{id}'.format(id=server_group['id']),
+            error_message="Error deleting server group {name}".format(
+                name=name_or_id))
 
         return True
 

shade/tests/unit/test_server_group.py

@@ -39,11 +39,6 @@ class TestServerGroup(base.RequestsMockTestCase):
                          'name': self.group_name,
                          'policies': self.policies,
                      }})),
-            dict(method='GET',
-                 uri=self.get_mock_url(
-                     'compute', 'public',
-                     append=['os-server-groups', self.group_id],),
-                 json={'server_group': self.fake_group}),
         ])
 
         self.cloud.create_server_group(name=self.group_name,