1 files changed, 28 insertions, 70 deletions
diff --git a/newton/newton/requests/tests/test_hosts.py b/newton/newton/requests/tests/test_hosts.py
index e78375b1..13e6b1fc 100644
--- a/newton/newton/requests/tests/test_hosts.py
+++ b/newton/newton/requests/tests/test_hosts.py
@@ -12,90 +12,48 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 import unittest
 
-from django.test import Client
 from rest_framework import status
 
-from newton.requests.tests import mock_info
-from newton.requests.tests import test_base
-from newton.requests.views.util import VimDriverUtils
+from newton.requests.tests.test_base import AbstractTestResource
 
 
-MOCK_GET_HOSTS_RESPONSE = {
-    "hosts": [
-        {"id": "uuid_1", "name": "host_1"},
-        {"id": "uuid_2", "name": "host_2"}
-    ]
-}
-
-MOCK_GET_HOST_RESPONSE = {
-    "host": [
-        {"resource": {"id": "uuid_1", "name": "host_1"}}
-    ]
-}
-
-
-class TestHost(unittest.TestCase):
+class TestHostNewton(unittest.TestCase, AbstractTestResource):
     def setUp(self):
-        self.client = Client()
-    def tearDown(self):
-        pass
-
-    @mock.patch.object(VimDriverUtils, 'get_session')
-    @mock.patch.object(VimDriverUtils, 'get_vim_info')
-    def test_get_hosts_list(self, mock_get_vim_info, mock_get_session):
-        mock_get_session.side_effect = [
-            test_base.get_mock_session(
-                ["get"], {"get": {"content": MOCK_GET_HOSTS_RESPONSE}}),
-        ]
+        AbstractTestResource.__init__(self)
 
-        mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
+        self.url += "hosts"
 
-        response = self.client.get(
-            "/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/fcca3cc49d5e42caae15459e27103efc/hosts",
-            {}, HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
+        self.MOCK_GET_RESOURCES_RESPONSE = {
+            "hosts": [
+            {"id": "uuid_1", "name": "host_1"},
+            {"id": "uuid_2", "name": "host_2"}
+            ]
+        }
 
-        context = response.json()
-        self.assertEquals(status.HTTP_200_OK, response.status_code)
-        self.assertIsNotNone(context['hosts'])
-        self.assertEqual(MOCK_GET_HOSTS_RESPONSE["hosts"], context["hosts"])
+        self.MOCK_GET_RESOURCE_RESPONSE = {
+            "host": [
+                {"resource": {"id": "uuid_1", "name": "host_1"}}
+            ]
+        }
 
-    @mock.patch.object(VimDriverUtils, 'get_session')
-    @mock.patch.object(VimDriverUtils, 'get_vim_info')
-    def test_get_host_info(self, mock_get_vim_info, mock_get_session):
-        mock_get_session.side_effect = [
-            test_base.get_mock_session(
-                ["get"], {"get": {"content": MOCK_GET_HOST_RESPONSE}}),
-        ]
+        self.MOCK_GET_RESOURCE_RESPONSE_NOT_FOUND = {}
 
-        mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
+        self.assert_keys = "hosts"
+        self.assert_key = "host"
 
-        response = self.client.get(
-            "/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/fcca3cc49d5e42caae15459e27103efc/hosts"
-            "/uuid_1",
-            {}, HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
+        self.HTTP_not_found = status.HTTP_500_INTERNAL_SERVER_ERROR
 
-        context = response.json()
-        self.assertEquals(status.HTTP_200_OK, response.status_code)
-        self.assertEquals(MOCK_GET_HOST_RESPONSE['host'], context['host'])
-
-    @mock.patch.object(VimDriverUtils, 'get_session')
-    @mock.patch.object(VimDriverUtils, 'get_vim_info')
-    def test_get_host_not_found(self, mock_get_vim_info, mock_get_session):
-        mock_get_session.side_effect = [
-            test_base.get_mock_session(
-                ["get"], {"get": {"content": {},
-                                  "status_code": 404}}),
-        ]
+    # Overridden methods from test base to not make it run for current test case.
+    def test_post_resource(self):
+        pass
 
-        mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
+    def test_post_resource_existing(self):
+        pass
 
-        response = self.client.get(
-            "/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/fcca3cc49d5e42caae15459e27103efc/hosts"
-            "/uuid_3",
-            {}, HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
+    def test_post_resource_empty(self):
+        pass
 
-        self.assertEquals(status.HTTP_500_INTERNAL_SERVER_ERROR, response.status_code)
-        self.assertIn('error', response.data)
+    def test_delete_resource(self):
+        pass