1 files changed, 45 insertions, 143 deletions
diff --git a/newton/newton/requests/tests/test_volume.py b/newton/newton/requests/tests/test_volume.py
index 8281e23d..fb58d240 100644
--- a/newton/newton/requests/tests/test_volume.py
+++ b/newton/newton/requests/tests/test_volume.py
@@ -15,174 +15,76 @@
 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.tests.test_base import AbstractTestResource
 from newton.requests.views.util import VimDriverUtils
-from newton.requests.views.volume import Volumes
-
-MOCK_GET_VOLUMES_RESPONSE = {
-    "volumes": [
-        {"id": "uuid_1", "name": "volume_1"},
-        {"id": "uuid_2", "name": "volume_2"}
-    ]
-}
-
-MOCK_GET_VOLUME_RESPONSE = {
-    "volume": {
-        "id": "uuid_1",
-        "name": "volume_1"
-    }
-}
-
-MOCK_POST_VOLUME_REQUEST = {
-    "id": "uuid_3",
-    "name": "volume_3"
-}
-
-MOCK_POST_VOLUME_REQUEST_EXISTING = {
-    "id": "uuid_1",
-    "name": "volume_1"
-}
-
-MOCK_POST_VOLUME_RESPONSE = {
-    "volume": {
-        "id": "uuid_3",
-        "name": "volume_3"
-    }
-}
-
-class TestVolumes(test_base.TestRequest):
-
-    url = ("/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/"
-           "fcca3cc49d5e42caae15459e27103efc/")
-    @mock.patch.object(VimDriverUtils, 'get_session')
-    @mock.patch.object(VimDriverUtils, 'get_vim_info')
-    def test_get_volumes(self, mock_get_vim_info, mock_get_session):
 
-        mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
-        mock_get_session.return_value = test_base.get_mock_session(
-            ["get"],
-            {"get": {"content": MOCK_GET_VOLUMES_RESPONSE}})
 
-        response = self.client.get(
-            self.url + "volumes",
-            {}, HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
+class TestVolumesNewton(unittest.TestCase, AbstractTestResource):
 
-        context = response.json()
-        self.assertEquals(status.HTTP_200_OK, response.status_code)
-        self.assertIsNotNone(context['volumes'])
-        self.assertEqual(MOCK_GET_VOLUMES_RESPONSE["volumes"], context['volumes'])
+    def setUp(self):
+        AbstractTestResource.__init__(self)
 
-    @mock.patch.object(VimDriverUtils, 'get_session')
-    @mock.patch.object(VimDriverUtils, 'get_vim_info')
-    def test_get_volume(self, mock_get_vim_info, mock_get_session):
+        self.url += "volumes"
 
-        mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
-        mock_get_session.return_value = test_base.get_mock_session(
-            ["get"],
-            {"get": {"content": MOCK_GET_VOLUME_RESPONSE}})
-
-        response = self.client.get(
-            self.url + "volumes/uuid_1",
-            {}, HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
-
-        context = response.json()
-        self.assertEquals(status.HTTP_200_OK, response.status_code)
-        self.assertEquals(MOCK_GET_VOLUME_RESPONSE['id'], context['id'])
+        self.MOCK_GET_RESOURCES_RESPONSE = {
+            "volumes": [
+                {"id": "uuid_1", "name": "volume_1"},
+                {"id": "uuid_2", "name": "volume_2"}
+            ]
+        }
 
-    @mock.patch.object(VimDriverUtils, 'get_session')
-    @mock.patch.object(VimDriverUtils, 'get_vim_info')
-    def test_get_volume_not_found(self, mock_get_vim_info, mock_get_session):
-
-        mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
-        mock_get_session.return_value = test_base.get_mock_session(
-            ["get"],
-            {"get": {"content": None, "status_code": 404}})
+        self.MOCK_GET_RESOURCE_RESPONSE = {
+            "volume": {
+                "id": "uuid_1",
+                "name": "volume_1"
+            }
+        }
 
-        response = self.client.get(
-            self.url + "volumes/uuid_3",
-            {}, HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
+        self.MOCK_GET_RESOURCE_RESPONSE_NOT_FOUND = {}
 
-        self.assertEquals(status.HTTP_500_INTERNAL_SERVER_ERROR, response.status_code)
-        self.assertIn('error', response.data)
+        self.MOCK_POST_RESOURCE_REQUEST = {
+            "id": "uuid_3",
+            "name": "volume_3"
+        }
 
-    @mock.patch.object(VimDriverUtils, 'get_session')
-    @mock.patch.object(VimDriverUtils, 'get_vim_info')
-    def test_create_volume_successfully(self, mock_get_vim_info, mock_get_session):
+        self.MOCK_POST_RESOURCE_REQUEST_EXISTING = {
+            "id": "uuid_1",
+            "name": "volume_1"
+        }
 
-        mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
-        mock_get_session.return_value = test_base.get_mock_session(
-            ["get", "post"],
-            {
-             "get" : {"content": MOCK_GET_VOLUMES_RESPONSE},
-             "post": {"content": MOCK_POST_VOLUME_RESPONSE, "status_code": 202}
-            })
+        self.MOCK_POST_RESOURCE_RESPONSE = {
+            "volume": {
+                "id": "uuid_3",
+                "name": "volume_3"
+            }
+        }
 
-        response = self.client.post(
-            self.url + "volumes",
-            MOCK_POST_VOLUME_REQUEST, HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
+        self.assert_keys = "volumes"
+        self.assert_key = "volume"
 
-        context = response.json()
-        self.assertEquals(status.HTTP_202_ACCEPTED, response.status_code)
-        self.assertIsNotNone(context['id'])
-        self.assertEqual(1, context['returnCode'])
+        self.HTTP_not_found = status.HTTP_500_INTERNAL_SERVER_ERROR
 
     @mock.patch.object(VimDriverUtils, 'get_session')
     @mock.patch.object(VimDriverUtils, 'get_vim_info')
-    def test_create_existing_volume(self, mock_get_vim_info, mock_get_session):
+    def test_get_volume(self, mock_get_vim_info, mock_get_session):
 
         mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
         mock_get_session.return_value = test_base.get_mock_session(
-            ["get", "post"],
-            {
-             "get" : {"content": MOCK_GET_VOLUMES_RESPONSE},
-             "post": {"content": MOCK_POST_VOLUME_RESPONSE, "status_code": 202}
-            })
+            ["get"],
+            {"get": {"content": self.MOCK_GET_RESOURCE_RESPONSE}})
 
-        response = self.client.post(
-            self.url + "volumes",
-            MOCK_POST_VOLUME_REQUEST_EXISTING, HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
+        response = self.client.get(
+            "/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/fcca3cc49d5e42caae15459e27103efc/"
+            "volumes/uuid_1", {}, HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
 
         context = response.json()
         self.assertEquals(status.HTTP_200_OK, response.status_code)
-        self.assertIsNotNone(context['returnCode'])
-        self.assertEqual(0, context['returnCode'])
-
-    @mock.patch.object(VimDriverUtils, 'get_session')
-    @mock.patch.object(VimDriverUtils, 'get_vim_info')
-    def test_create_volume_unsuccessfully(self, mock_get_vim_info, mock_get_session):
-
-        mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
-        mock_get_session.return_value = test_base.get_mock_session(
-            ["get", "post"],
-            {
-             "get" : {"content": MOCK_GET_VOLUMES_RESPONSE},
-             "post": {"content": MOCK_POST_VOLUME_RESPONSE, "status_code": 202}
-            })
-
-        response = self.client.post(
-            self.url + "volumes",
-            {}, HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
-
-        context = response.json()
-        self.assertIn('error', context)
-        self.assertEquals(status.HTTP_500_INTERNAL_SERVER_ERROR, response.status_code)
-
-    @mock.patch.object(VimDriverUtils, 'get_session')
-    @mock.patch.object(VimDriverUtils, 'get_vim_info')
-    def test_delete_volume(self, mock_get_vim_info, mock_get_session):
-
-        mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
-        mock_get_session.return_value = test_base.get_mock_session(
-            ["delete"],
-            {"delete" : {"content": None, "status_code": 204}})
-
-        response = self.client.delete(
-            self.url + "volumes/uuid_1",
-            HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
+        self.assertEquals(self.MOCK_GET_RESOURCE_RESPONSE['id'], context['id'])
 
-        self.assertEqual(status.HTTP_204_NO_CONTENT, response.status_code)
-        self.assertIsNone(response.data)
+    # Overridden method from test base to not make it run for current test case.
+    def test_get_resource_info(self):
+        pass