Merge "Convert Server Group Tests to httpretty"

novaclient/tests/fixture_data/server_groups.py

@@ -0,0 +1,75 @@
+# 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 httpretty
+
+from novaclient.openstack.common import jsonutils
+from novaclient.tests.fixture_data import base
+
+
+class Fixture(base.Fixture):
+
+    base_url = 'os-server-groups'
+
+    def setUp(self):
+        super(Fixture, self).setUp()
+
+        server_groups = [
+            {
+                "members": [],
+                "metadata": {},
+                "id": "2cbd51f4-fafe-4cdb-801b-cf913a6f288b",
+                "policies": [],
+                "name": "ig1"
+            },
+            {
+                "members": [],
+                "metadata": {},
+                "id": "4473bb03-4370-4bfb-80d3-dc8cffc47d94",
+                "policies": ["anti-affinity"],
+                "name": "ig2"
+            },
+            {
+                "members": [],
+                "metadata": {"key": "value"},
+                "id": "31ab9bdb-55e1-4ac3-b094-97eeb1b65cc4",
+                "policies": [], "name": "ig3"
+            },
+            {
+                "members": ["2dccb4a1-02b9-482a-aa23-5799490d6f5d"],
+                "metadata": {},
+                "id": "4890bb03-7070-45fb-8453-d34556c87d94",
+                "policies": ["anti-affinity"],
+                "name": "ig2"
+            }
+        ]
+
+        get_server_groups = {'server_groups': server_groups}
+        httpretty.register_uri(httpretty.GET, self.url(),
+                               body=jsonutils.dumps(get_server_groups),
+                               content_type='application/json')
+
+        server = server_groups[0]
+        server_json = jsonutils.dumps({'server_group': server})
+
+        def _register(method, *args):
+            httpretty.register_uri(method, self.url(*args), body=server_json)
+
+        _register(httpretty.POST)
+        _register(httpretty.POST, server['id'])
+        _register(httpretty.GET, server['id'])
+        _register(httpretty.PUT, server['id'])
+        _register(httpretty.POST, server['id'], '/action')
+
+        httpretty.register_uri(httpretty.DELETE, self.url(server['id']),
+                               status=202)

novaclient/tests/v1_1/test_server_groups.py

@@ -13,19 +13,20 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from novaclient.tests.fixture_data import client
+from novaclient.tests.fixture_data import server_groups as data
 from novaclient.tests import utils
-from novaclient.tests.v1_1 import fakes
 from novaclient.v1_1 import server_groups
 
 
-cs = fakes.FakeClient()
+class ServerGroupsTest(utils.FixturedTestCase):
 
-
-class ServerGroupsTest(utils.TestCase):
+    client_fixture_class = client.V1
+    data_fixture_class = data.Fixture
 
     def test_list_server_groups(self):
-        result = cs.server_groups.list()
-        cs.assert_called('GET', '/os-server-groups')
+        result = self.cs.server_groups.list()
+        self.assert_called('GET', '/os-server-groups')
         for server_group in result:
             self.assertTrue(isinstance(server_group,
                                        server_groups.ServerGroup))
@@ -33,20 +34,20 @@ class ServerGroupsTest(utils.TestCase):
     def test_create_server_group(self):
         kwargs = {'name': 'ig1',
                   'policies': ['anti-affinity']}
-        server_group = cs.server_groups.create(**kwargs)
+        server_group = self.cs.server_groups.create(**kwargs)
         body = {'server_group': kwargs}
-        cs.assert_called('POST', '/os-server-groups', body)
+        self.assert_called('POST', '/os-server-groups', body)
         self.assertTrue(isinstance(server_group,
                                    server_groups.ServerGroup))
 
     def test_get_server_group(self):
         id = '2cbd51f4-fafe-4cdb-801b-cf913a6f288b'
-        server_group = cs.server_groups.get(id)
-        cs.assert_called('GET', '/os-server-groups/%s' % id)
+        server_group = self.cs.server_groups.get(id)
+        self.assert_called('GET', '/os-server-groups/%s' % id)
         self.assertTrue(isinstance(server_group,
                                    server_groups.ServerGroup))
 
     def test_delete_server_group(self):
         id = '2cbd51f4-fafe-4cdb-801b-cf913a6f288b'
-        cs.server_groups.delete(id)
-        cs.assert_called('DELETE', '/os-server-groups/%s' % id)
+        self.cs.server_groups.delete(id)
+        self.assert_called('DELETE', '/os-server-groups/%s' % id)