Merge "Centralize the release version for UTs"

10 files changed, 233 insertions, 138 deletions

diff --git a/newton/newton/requests/tests/mock_info.py b/newton/newton/requests/tests/mock_info.py
index 9bcad7e0..0c7556ee 100644
--- a/newton/newton/requests/tests/mock_info.py
+++ b/newton/newton/requests/tests/mock_info.py
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from django.conf import settings
+
 MOCK_VIM_INFO = {
     "createTime": "2017-04-01 02:22:27",
     "domain": "Default",
@@ -27,9 +29,17 @@ MOCK_VIM_INFO = {
     'cloud_owner': 'windriver-hudson-dc',
     'cloud_region_id': 'RegionOne',
     'cloud_extra_info': '',
-    'cloud_epa_caps': '{"huge_page":"true","cpu_pinning":"true",\
-        "cpu_thread_policy":"true","numa_aware":"true","sriov":"true",\
-        "dpdk_vswitch":"true","rdt":"false","numa_locality_pci":"true"}',
+    'cloud_epa_caps':
+        '{'
+        '"huge_page":"true",'
+        '"cpu_pinning":"true",'
+        '"cpu_thread_policy":"true",'
+        '"numa_aware":"true",'
+        '"sriov":"true",'
+        '"dpdk_vswitch":"true",'
+        '"rdt":"false",'
+        '"numa_locality_pci":"true"'
+        '}',
     'insecure': 'True',
 }
 
@@ -480,74 +490,78 @@ MOCK_AUTH_STATE = {
     "auth_token": MOCK_TOKEN_ID
 }
 
+BASE_URL = ("http://172.16.77.20:9003/api/%s/v0/"
+            "windriver-hudson-dc_RegionOne/"
+            % settings.MULTIVIM_VERSION)
+
 MOCK_INTERNAL_METADATA_CATALOG = {
     "identity": {
-        "proxy_prefix": "http://172.16.77.20:9003/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/identity",
+        "proxy_prefix": BASE_URL + "identity",
         "prefix": "http://128.224.180.14:5000",
         "suffix": "v3"
     },
     "patching": {
-        "proxy_prefix": "http://172.16.77.20:9003/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/patching",
+        "proxy_prefix": BASE_URL + "patching",
         "suffix": "",
         "prefix": "http://128.224.180.14:15491"
     },
     "orchestration": {
         "suffix": "v1/fcca3cc49d5e42caae15459e27103efc",
         "prefix": "http://128.224.180.14:8004",
-        "proxy_prefix": "http://172.16.77.20:9003/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/orchestration"
+        "proxy_prefix": BASE_URL + "orchestration"
     },
     "volume": {
         "prefix": "http://128.224.180.14:8776",
         "suffix": "v1/fcca3cc49d5e42caae15459e27103efc",
-        "proxy_prefix": "http://172.16.77.20:9003/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/volume"
+        "proxy_prefix": BASE_URL + "volume"
     },
     "metering": {
         "suffix": "",
         "prefix": "http://128.224.180.14:8777",
-        "proxy_prefix": "http://172.16.77.20:9003/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/metering"
+        "proxy_prefix": BASE_URL + "metering"
     },
     "volumev3": {
         "prefix": "http://128.224.180.14:8776",
         "suffix": "v3/fcca3cc49d5e42caae15459e27103efc",
-        "proxy_prefix": "http://172.16.77.20:9003/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/volumev3"
+        "proxy_prefix": BASE_URL + "volumev3"
     },
     "compute": {
         "suffix": "v2.1/fcca3cc49d5e42caae15459e27103efc",
         "prefix": "http://128.224.180.14:8774",
-        "proxy_prefix": "http://172.16.77.20:9003/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/compute"
+        "proxy_prefix": BASE_URL + "compute"
     },
     "platform": {
         "prefix": "http://128.224.180.14:6385",
         "suffix": "v1",
-        "proxy_prefix": "http://172.16.77.20:9003/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/platform"
+        "proxy_prefix": BASE_URL + "platform"
     },
     "nfv": {
-        "proxy_prefix": "http://172.16.77.20:9003/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/nfv",
+        "proxy_prefix": BASE_URL + "nfv",
         "prefix": "http://128.224.180.14:4545",
         "suffix": ""
     },
     "volumev2": {
-        "proxy_prefix": "http://172.16.77.20:9003/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/volumev2",
+        "proxy_prefix": BASE_URL + "volumev2",
         "suffix": "v2/fcca3cc49d5e42caae15459e27103efc",
         "prefix": "http://128.224.180.14:8776"
     },
     "image": {
         "suffix": "",
         "prefix": "http://128.224.180.14:9292",
-        "proxy_prefix": "http://172.16.77.20:9003/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/image"
+        "proxy_prefix": BASE_URL + "image"
     },
     "network": {
-        "proxy_prefix": "http://172.16.77.20:9003/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/network",
+        "proxy_prefix": BASE_URL + "network",
         "prefix": "http://128.224.180.14:9696",
         "suffix": ""
     },
     "alarming": {
         "suffix": "",
         "prefix": "http://128.224.180.14:8042",
-        "proxy_prefix": "http://172.16.77.20:9003/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/alarming"
+        "proxy_prefix": BASE_URL + "alarming"
     },
     "cloudformation": {
-        "proxy_prefix": "http://172.16.77.20:9003/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/cloudformation",
+        "proxy_prefix": BASE_URL + "cloudformation",
         "prefix": "http://128.224.180.14:8000",
         "suffix": "v1/fcca3cc49d5e42caae15459e27103efc"
     }
diff --git a/newton/newton/requests/tests/test_base.py b/newton/newton/requests/tests/test_base.py
index d2065b06..4db0cf64 100644
--- a/newton/newton/requests/tests/test_base.py
+++ b/newton/newton/requests/tests/test_base.py
@@ -17,11 +17,14 @@ from rest_framework import status
 import unittest
 
 from abc import ABCMeta
+from django.conf import settings
 from django.test import Client
 
 from newton.requests.tests import mock_info
 from newton.requests.views.util import VimDriverUtils
 
+MULTIVIM_VERSION = settings.MULTIVIM_VERSION
+
 
 class MockResponse(object):
     status_code = status.HTTP_200_OK
@@ -66,10 +69,10 @@ class AbstractTestResource(object):
 
         self.client = Client()
 
-        self.openstack_version = "newton"
         self.region = "windriver-hudson-dc_RegionOne"
-        self.url = "/api/multicloud-{}/v0/{}/fcca3cc49d5e42caae15459e27103efc/".format(
-            self.openstack_version, self.region)
+        self.url = ("/api/%s/v0/%s/"
+                   "fcca3cc49d5e42caae15459e27103efc/" % (
+            MULTIVIM_VERSION, self.region))
 
         self.MOCK_GET_RESOURCES_RESPONSE = {}
         self.MOCK_GET_RESOURCE_RESPONSE = {}
@@ -87,51 +90,68 @@ class AbstractTestResource(object):
 
     @mock.patch.object(VimDriverUtils, 'get_session')
     @mock.patch.object(VimDriverUtils, 'get_vim_info')
-    def test_get_resources_list(self, mock_get_vim_info, mock_get_session):
+    def test_get_resources_list(
+            self, mock_get_vim_info, mock_get_session):
         mock_get_session.side_effect = [
             get_mock_session(
-                ["get"], {"get": {"content": self.MOCK_GET_RESOURCES_RESPONSE}}),
+                ["get"], {"get": {
+                    "content": self.MOCK_GET_RESOURCES_RESPONSE}}),
         ]
 
         mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
 
-        response = self.client.get(self.url, {}, HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
+        response = self.client.get(
+            self.url, {}, HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
 
         context = response.json()
         self.assertEquals(status.HTTP_200_OK, response.status_code)
         self.assertIsNotNone(context[self.assert_keys])
         self.assertEqual(
-            self.MOCK_GET_RESOURCES_RESPONSE[self.assert_keys], context[self.assert_keys])
+            self.MOCK_GET_RESOURCES_RESPONSE[self.assert_keys],
+            context[self.assert_keys])
 
     @mock.patch.object(VimDriverUtils, 'get_session')
     @mock.patch.object(VimDriverUtils, 'get_vim_info')
-    def test_get_resource_info(self, mock_get_vim_info, mock_get_session):
+    def test_get_resource_info(
+            self, mock_get_vim_info, mock_get_session):
         mock_get_session.side_effect = [
             get_mock_session(
-                ["get"], {"get": {"content": self.MOCK_GET_RESOURCE_RESPONSE}}),
+                ["get"], {"get": {
+                    "content": self.MOCK_GET_RESOURCE_RESPONSE}}),
         ]
 
         mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
 
-        response = self.client.get(self.url + "/uuid_1", {}, HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
+        response = self.client.get(
+            self.url + "/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(
-            self.MOCK_GET_RESOURCE_RESPONSE[self.assert_key], context[self.assert_key])
+            self.MOCK_GET_RESOURCE_RESPONSE[self.assert_key],
+            context[self.assert_key])
 
     @mock.patch.object(VimDriverUtils, 'get_session')
     @mock.patch.object(VimDriverUtils, 'get_vim_info')
-    def test_get_resource_not_found(self, mock_get_vim_info, mock_get_session):
+    def test_get_resource_not_found(
+            self, mock_get_vim_info, mock_get_session):
         mock_get_session.side_effect = [
             get_mock_session(
-                ["get"], {"get": {"content": self.MOCK_GET_RESOURCE_RESPONSE_NOT_FOUND,
-                                  "status_code": 404}}),
+                ["get"], {
+                    "get": {
+                        "content": self.MOCK_GET_RESOURCE_RESPONSE_NOT_FOUND,
+                        "status_code": 404
+                    }
+                }
+            ),
         ]
 
         mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
 
-        response = self.client.get(self.url + "/uuid_3", {}, HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
+        response = self.client.get(
+            self.url + "/uuid_3", {},
+            HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
 
         self.assertEquals(self.HTTP_not_found, response.status_code)
 
@@ -140,35 +160,45 @@ class AbstractTestResource(object):
     def test_post_resource(self, mock_get_vim_info, mock_get_session):
         mock_get_session.side_effect = [
             get_mock_session(
-                ["get"], {"get": {"content": self.MOCK_GET_RESOURCES_RESPONSE}}),
+                ["get"], {"get": {
+                    "content": self.MOCK_GET_RESOURCES_RESPONSE}}),
             get_mock_session(
-                ["post"], {"post": {"content": self.MOCK_POST_RESOURCE_RESPONSE,
-                                    "status_code": 202}}),
+                ["post"], {"post": {
+                    "content": self.MOCK_POST_RESOURCE_RESPONSE,
+                    "status_code": 202}}),
         ]
 
         mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
 
-        response = self.client.post(self.url, self.MOCK_POST_RESOURCE_REQUEST, HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
+        response = self.client.post(
+            self.url, self.MOCK_POST_RESOURCE_REQUEST,
+            HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
 
         context = response.json()
-        self.assertEquals(status.HTTP_202_ACCEPTED, response.status_code)
+        self.assertEquals(status.HTTP_202_ACCEPTED,
+                          response.status_code)
         self.assertIsNotNone(context['id'])
         self.assertEqual(1, context['returnCode'])
 
     @mock.patch.object(VimDriverUtils, 'get_session')
     @mock.patch.object(VimDriverUtils, 'get_vim_info')
-    def test_post_resource_existing(self, mock_get_vim_info, mock_get_session):
+    def test_post_resource_existing(
+            self, mock_get_vim_info, mock_get_session):
         mock_get_session.side_effect = [
             get_mock_session(
-                ["get"], {"get": {"content": self.MOCK_GET_RESOURCES_RESPONSE}}),
+                ["get"], {"get": {
+                    "content": self.MOCK_GET_RESOURCES_RESPONSE}}),
             get_mock_session(
-                ["post"], {"post": {"content": self.MOCK_POST_RESOURCE_RESPONSE,
-                                    "status_code": 201}}),
+                ["post"], {"post": {
+                    "content": self.MOCK_POST_RESOURCE_RESPONSE,
+                    "status_code": 201}}),
         ]
 
         mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
 
-        response = self.client.post(self.url, self.MOCK_POST_RESOURCE_REQUEST_EXISTING, HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
+        response = self.client.post(
+            self.url, self.MOCK_POST_RESOURCE_REQUEST_EXISTING,
+            HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
 
         context = response.json()
         self.assertEquals(status.HTTP_200_OK, response.status_code)
@@ -177,26 +207,33 @@ class AbstractTestResource(object):
 
     @mock.patch.object(VimDriverUtils, 'get_session')
     @mock.patch.object(VimDriverUtils, 'get_vim_info')
-    def test_post_resource_empty(self, mock_get_vim_info, mock_get_session):
+    def test_post_resource_empty(
+            self, mock_get_vim_info, mock_get_session):
         mock_get_session.side_effect = [
             get_mock_session(
-                ["get"], {"get": {"content": self.MOCK_GET_RESOURCE_RESPONSE}}),
+                ["get"], {"get": {
+                    "content": self.MOCK_GET_RESOURCE_RESPONSE}}),
             get_mock_session(
-                ["post"], {"post": {"content": self.MOCK_POST_RESOURCE_RESPONSE,
-                                    "status_code": 202}}),
+                ["post"], {"post": {
+                    "content": self.MOCK_POST_RESOURCE_RESPONSE,
+                    "status_code": 202}}),
         ]
 
         mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
 
-        response = self.client.post(self.url, {}, HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
+        response = self.client.post(
+            self.url, {}, 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)
+        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_resource(self, mock_get_vim_info, mock_get_session):
+    def test_delete_resource(
+            self, mock_get_vim_info, mock_get_session):
 
         mock_get_session.side_effect = [
             get_mock_session(
@@ -206,7 +243,10 @@ class AbstractTestResource(object):
 
         mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
 
-        response = self.client.delete(self.url + "/uuid_1", HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
+        response = self.client.delete(
+            self.url + "/uuid_1",
+            HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
 
-        self.assertEqual(status.HTTP_204_NO_CONTENT, response.status_code)
+        self.assertEqual(status.HTTP_204_NO_CONTENT,
+                         response.status_code)
         self.assertIsNone(response.data)
diff --git a/newton/newton/requests/tests/test_flavor.py b/newton/newton/requests/tests/test_flavor.py
index 26e3f381..765121ff 100644
--- a/newton/newton/requests/tests/test_flavor.py
+++ b/newton/newton/requests/tests/test_flavor.py
@@ -82,7 +82,8 @@ class TestFlavorsNewton(unittest.TestCase, AbstractTestResource):
                           mock_get_flavor_extra_specs):
         mock_get_session.side_effect = [
             test_base.get_mock_session(
-            ["get"], {"get": {"content": self.MOCK_GET_RESOURCES_RESPONSE}}),
+            ["get"], {"get": {
+                    "content": self.MOCK_GET_RESOURCES_RESPONSE}}),
         ]
 
         mock_extra_specs = mock.Mock(spec=test_base.MockResponse)
@@ -92,8 +93,9 @@ class TestFlavorsNewton(unittest.TestCase, AbstractTestResource):
         mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
 
         response = self.client.get(
-            ("/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne"
-             "/fcca3cc49d5e42caae15459e27103efc/flavors"),
+            ("/api/%s/v0/windriver-hudson-dc_RegionOne"
+             "/fcca3cc49d5e42caae15459e27103efc/"
+             "flavors" % test_base.MULTIVIM_VERSION),
             {}, HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
         context = response.json()
 
@@ -110,7 +112,8 @@ class TestFlavorsNewton(unittest.TestCase, AbstractTestResource):
         mock_get_session.side_effect = [
             test_base.get_mock_session(
                 ["get"],
-                {"get": {"content": self.MOCK_GET_RESOURCE_RESPONSE}}),
+                {"get": {
+                    "content": self.MOCK_GET_RESOURCE_RESPONSE}}),
         ]
 
         mock_extra_specs = mock.Mock(spec=test_base.MockResponse)
@@ -120,13 +123,15 @@ class TestFlavorsNewton(unittest.TestCase, AbstractTestResource):
         mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
 
         response = self.client.get(
-            ("/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne"
-             "/fcca3cc49d5e42caae15459e27103efc/flavors/uuid_1"),
+            ("/api/%s/v0/windriver-hudson-dc_RegionOne"
+             "/fcca3cc49d5e42caae15459e27103efc/flavors/"
+             "uuid_1" % test_base.MULTIVIM_VERSION),
             {}, HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
         context = response.json()
 
         self.assertEquals(status.HTTP_200_OK, response.status_code)
-        self.assertEqual(self.MOCK_GET_RESOURCE_RESPONSE["id"], context["id"])
+        self.assertEqual(self.MOCK_GET_RESOURCE_RESPONSE["id"],
+                         context["id"])
 
     @mock.patch.object(Flavors, '_get_flavor_extra_specs')
     @mock.patch.object(VimDriverUtils, 'get_session')
@@ -147,8 +152,9 @@ class TestFlavorsNewton(unittest.TestCase, AbstractTestResource):
         mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
 
         response = self.client.get(
-            ("/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne"
-             "/fcca3cc49d5e42caae15459e27103efc/flavors/uuid_1"),
+            ("/api/%s/v0/windriver-hudson-dc_RegionOne"
+             "/fcca3cc49d5e42caae15459e27103efc/flavors/"
+             "uuid_1" % test_base.MULTIVIM_VERSION),
             {}, HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
 
         # TODO(sshank): 404 status is not possible.
@@ -158,11 +164,13 @@ class TestFlavorsNewton(unittest.TestCase, AbstractTestResource):
 
     @mock.patch.object(VimDriverUtils, 'get_session')
     @mock.patch.object(VimDriverUtils, 'get_vim_info')
-    def test_create_flavor(self, mock_get_vim_info, mock_get_session):
+    def test_create_flavor(
+            self, mock_get_vim_info, mock_get_session):
         mock_get_session.side_effect = [
             test_base.get_mock_session(
                 ["get", "post"], {
-                    "get": {"content": self.MOCK_GET_RESOURCES_RESPONSE},
+                    "get": {
+                        "content": self.MOCK_GET_RESOURCES_RESPONSE},
                     "post": {
                         "content": self.MOCK_POST_RESOURCE_RESPONSE,
                         "status_code": status.HTTP_202_ACCEPTED,
@@ -173,8 +181,9 @@ class TestFlavorsNewton(unittest.TestCase, AbstractTestResource):
         mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
 
         response = self.client.post(
-            ("/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne"
-             "/fcca3cc49d5e42caae15459e27103efc/flavors"),
+            ("/api/%s/v0/windriver-hudson-dc_RegionOne"
+             "/fcca3cc49d5e42caae15459e27103efc/"
+             "flavors" % test_base.MULTIVIM_VERSION),
             self.MOCK_POST_RESOURCE_REQUEST,
             HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
         context = response.json()
@@ -193,7 +202,8 @@ class TestFlavorsNewton(unittest.TestCase, AbstractTestResource):
        mock_get_session.side_effect = [
            test_base.get_mock_session(
                ["get", "post"], {
-                   "get": {"content":  self.MOCK_GET_RESOURCES_RESPONSE},
+                   "get": {
+                       "content":  self.MOCK_GET_RESOURCES_RESPONSE},
                    "post": {
                        "content": self.MOCK_POST_RESOURCE_RESPONSE,
                        "status_code": status.HTTP_202_ACCEPTED,
@@ -207,8 +217,9 @@ class TestFlavorsNewton(unittest.TestCase, AbstractTestResource):
        mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
 
        response = self.client.post(
-           ("/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/"
-            "fcca3cc49d5e42caae15459e27103efc/flavors"),
+           ("/api/%s/v0/windriver-hudson-dc_RegionOne/"
+            "fcca3cc49d5e42caae15459e27103efc/"
+            "flavors" % test_base.MULTIVIM_VERSION),
            self.MOCK_POST_RESOURCE_REQUEST_EXISTING,
            HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
 
@@ -219,20 +230,23 @@ class TestFlavorsNewton(unittest.TestCase, AbstractTestResource):
 
     @mock.patch.object(VimDriverUtils, 'get_session')
     @mock.patch.object(VimDriverUtils, 'get_vim_info')
-    def test_delete_flavor(self, mock_get_vim_info, mock_get_session):
+    def test_delete_flavor(
+            self, mock_get_vim_info, mock_get_session):
         mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
         mock_get_session.side_effect = [
             test_base.get_mock_session(
                 ["get", "delete"],
                 {
                     "get": { "content": self.MOCK_GET_EXTRA_SPECS },
-                    "delete": {"status_code": status.HTTP_204_NO_CONTENT }
+                    "delete": {
+                        "status_code": status.HTTP_204_NO_CONTENT }
                 }),
         ]
 
         response = self.client.delete(
-            ("/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/"
-             "fcca3cc49d5e42caae15459e27103efc/flavors/uuid_1"),
+            ("/api/%s/v0/windriver-hudson-dc_RegionOne/"
+             "fcca3cc49d5e42caae15459e27103efc/flavors/"
+             "uuid_1" % test_base.MULTIVIM_VERSION),
             HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
 
         self.assertEqual(status.HTTP_204_NO_CONTENT,
diff --git a/newton/newton/requests/tests/test_image.py b/newton/newton/requests/tests/test_image.py
index a290302e..40326c2d 100644
--- a/newton/newton/requests/tests/test_image.py
+++ b/newton/newton/requests/tests/test_image.py
@@ -26,7 +26,6 @@ from newton.requests.views.util import VimDriverUtils
 
 
 class TestImageNewton(unittest.TestCase, AbstractTestResource):
-
     def setUp(self):
         AbstractTestResource.__init__(self)
 
@@ -74,14 +73,16 @@ class TestImageNewton(unittest.TestCase, AbstractTestResource):
     @mock.patch.object(urllib, 'request')
     @mock.patch.object(VimDriverUtils, 'get_session')
     @mock.patch.object(VimDriverUtils, 'get_vim_info')
-    def test_post_image(self, mock_get_vim_info, mock_get_session, mock_request, mock_run):
-
+    def test_post_image(self, mock_get_vim_info, mock_get_session,
+                        mock_request, mock_run):
         mock_get_session.side_effect = [
             test_base.get_mock_session(
-                ["get"], {"get": {"content": self.MOCK_GET_RESOURCES_RESPONSE}}),
+                ["get"], {"get": {
+                    "content": self.MOCK_GET_RESOURCES_RESPONSE}}),
             test_base.get_mock_session(
-                ["post"], {"post": {"content": self.MOCK_POST_RESOURCE_RESPONSE,
-                                    "status_code": 201}}),
+                ["post"],
+                {"post": {"content": self.MOCK_POST_RESOURCE_RESPONSE,
+                          "status_code": 201}}),
         ]
 
         mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
@@ -89,11 +90,15 @@ class TestImageNewton(unittest.TestCase, AbstractTestResource):
         mock_request.urlopen.return_value = "image"
 
         response = self.client.post(
-            "/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/fcca3cc49d5e42caae15459e27103efc/images",
-            self.MOCK_POST_RESOURCE_REQUEST, HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
+            "/api/%s/v0/windriver-hudson-dc_RegionOne/"
+            "fcca3cc49d5e42caae15459e27103efc/"
+            "images" % test_base.MULTIVIM_VERSION,
+            self.MOCK_POST_RESOURCE_REQUEST,
+            HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
 
         context = response.json()
-        self.assertEquals(status.HTTP_201_CREATED, response.status_code)
+        self.assertEquals(status.HTTP_201_CREATED,
+                          response.status_code)
         self.assertIsNotNone(context['id'])
         self.assertEqual(1, context['returnCode'])
 
diff --git a/newton/newton/requests/tests/test_limits.py b/newton/newton/requests/tests/test_limits.py
index d37e7e6d..6438e975 100644
--- a/newton/newton/requests/tests/test_limits.py
+++ b/newton/newton/requests/tests/test_limits.py
@@ -53,51 +53,62 @@ class TestLimitNewton(unittest.TestCase, AbstractTestResource):
 
     @mock.patch.object(VimDriverUtils, 'get_session')
     @mock.patch.object(VimDriverUtils, 'get_vim_info')
-    def test_get_limits_list(self, mock_get_vim_info, mock_get_session):
-
+    def test_get_limits_list(
+            self, mock_get_vim_info, mock_get_session):
         mock_get_session.return_value = test_base.get_mock_session(
             ["get"], {
                 "side_effect": [
-                    self._get_mock_response(self.MOCK_GET_LIMITS_RESPONSE),
-                    self._get_mock_response(self.MOCK_GET_QUOTAS_RESPONSE),
-                    self._get_mock_response(self.MOCK_GET_LIMITS_RESPONSE)
+                    self._get_mock_response(
+                        self.MOCK_GET_LIMITS_RESPONSE),
+                    self._get_mock_response(
+                        self.MOCK_GET_QUOTAS_RESPONSE),
+                    self._get_mock_response(
+                        self.MOCK_GET_LIMITS_RESPONSE)
                 ]
             })
 
         mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
 
         response = self.client.get(
-            "/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/fcca3cc49d5e42caae15459e27103efc/limits",
+            "/api/%s/v0/windriver-hudson-dc_RegionOne/"
+            "fcca3cc49d5e42caae15459e27103efc/"
+            "limits" % test_base.MULTIVIM_VERSION,
             {}, HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
 
         context = response.json()
         self.assertEquals(status.HTTP_200_OK, response.status_code)
         self.assertIsNotNone(context)
         self.assertIn(
-            self.MOCK_GET_LIMITS_RESPONSE["limits"]["absolute"]['id'], context['id'])
+            self.MOCK_GET_LIMITS_RESPONSE["limits"]["absolute"]['id'],
+            context['id'])
 
     @mock.patch.object(VimDriverUtils, 'get_session')
     @mock.patch.object(VimDriverUtils, 'get_vim_info')
-    def test_get_limits_list_failure(self, mock_get_vim_info, mock_get_session):
-
+    def test_get_limits_list_failure(
+            self, mock_get_vim_info, mock_get_session):
         mock_get_session.return_value = test_base.get_mock_session(
             ["get"], {
                 "side_effect": [
-                    self._get_mock_response(self.MOCK_GET_LIMITS_RESPONSE),
+                    self._get_mock_response(
+                        self.MOCK_GET_LIMITS_RESPONSE),
                     self._get_mock_response({}),
-                    self._get_mock_response(self.MOCK_GET_LIMITS_RESPONSE)
+                    self._get_mock_response(
+                        self.MOCK_GET_LIMITS_RESPONSE)
                 ]
             })
 
         mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
 
         response = self.client.get(
-            "/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/fcca3cc49d5e42caae15459e27103efc/limits",
+            "/api/%s/v0/windriver-hudson-dc_RegionOne/"
+            "fcca3cc49d5e42caae15459e27103efc/"
+            "limits" % test_base.MULTIVIM_VERSION,
             {}, 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)
+        self.assertEquals(status.HTTP_500_INTERNAL_SERVER_ERROR,
+                          response.status_code)
 
     def test_get_resources_list(self):
         pass
diff --git a/newton/newton/requests/tests/test_server.py b/newton/newton/requests/tests/test_server.py
index b5e6e3fe..15a77948 100644
--- a/newton/newton/requests/tests/test_server.py
+++ b/newton/newton/requests/tests/test_server.py
@@ -26,7 +26,7 @@ MOCK_GET_SERVERS_RESPONSE = {
         {
             "name": "compute_1",
             "id": "1"
-         },
+        },
         {
             "name": "compute_2",
             "id": "2"
@@ -39,17 +39,17 @@ MOCK_GET_SERVER_RESPONSE = {
         {
             "name": "compute_1",
             "id": "1"
-         }
+        }
 }
 
 MOCK_GET_PORTS_RESPONSE = {
     "interfaceAttachments": [
         {
             "port_id": "1",
-         },
+        },
         {
             "port_id": "2",
-         },
+        },
     ]
 }
 
@@ -86,7 +86,6 @@ MOCK_POST_SERVER_CREATED_THREAD_RESPONSE = {
 
 
 class TestNetwork(test_base.TestRequest):
-
     @mock.patch.object(VimDriverUtils, 'get_vim_info')
     def test_get_servers_failure(self, mock_get_vim_info):
         mock_get_vim_info.raiseError.side_effect = mock.Mock(
@@ -94,8 +93,8 @@ class TestNetwork(test_base.TestRequest):
         tenant_id = "fcca3cc49d5e42caae15459e27103efc"
 
         response = self.client.get((
-            "/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/"
-            "" + tenant_id + "/servers"),
+            "/api/%s/v0/windriver-hudson-dc_RegionOne/%s/"
+            "servers" % (test_base.MULTIVIM_VERSION, tenant_id)),
             {}, HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
 
         self.assertEquals(status.HTTP_500_INTERNAL_SERVER_ERROR,
@@ -110,10 +109,10 @@ class TestNetwork(test_base.TestRequest):
         mock_get_session.side_effect = [
             test_base.get_mock_session(
                 ["get"],
-                {"get": { "content": MOCK_GET_SERVERS_RESPONSE }}),
+                {"get": {"content": MOCK_GET_SERVERS_RESPONSE}}),
             test_base.get_mock_session(
                 ["get"],
-                {"get": { "content":MOCK_GET_PORTS_RESPONSE}}),
+                {"get": {"content": MOCK_GET_PORTS_RESPONSE}}),
             test_base.get_mock_session(
                 ["get"],
                 {"get": {"content": None}}),
@@ -121,8 +120,8 @@ class TestNetwork(test_base.TestRequest):
         tenant_id = "fcca3cc49d5e42caae15459e27103efc"
 
         response = self.client.get((
-            "/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/"
-            "" + tenant_id + "/servers"),
+            "/api/%s/v0/windriver-hudson-dc_RegionOne/%s/"
+            "servers" % (test_base.MULTIVIM_VERSION, tenant_id)),
             {}, HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
 
         self.assertEquals(status.HTTP_200_OK, response.status_code)
@@ -142,16 +141,19 @@ class TestNetwork(test_base.TestRequest):
         mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
         mock_get_session.side_effect = [
             test_base.get_mock_session(
-                ["get"], {"get": {"content": MOCK_GET_SERVER_RESPONSE.copy()}}),
+                ["get"], {"get": {
+                    "content": MOCK_GET_SERVER_RESPONSE.copy()}}),
             test_base.get_mock_session(
-                ["get"], {"get": {"content": MOCK_GET_PORTS_RESPONSE.copy()}}),
+                ["get"], {"get": {
+                    "content": MOCK_GET_PORTS_RESPONSE.copy()}}),
         ]
         tenant_id = "fcca3cc49d5e42caae15459e27103efc"
         server_id = "f5dc173b-6804-445a-a6d8-c705dad5b5eb"
 
         response = self.client.get((
-            "/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/"
-            "" + tenant_id + "/servers/" + server_id),
+            "/api/%s/v0/windriver-hudson-dc_RegionOne/%s/"
+            "servers/%s" % (test_base.MULTIVIM_VERSION,
+                            tenant_id, server_id)),
             {}, HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
 
         self.assertEquals(status.HTTP_200_OK, response.status_code)
@@ -170,9 +172,9 @@ class TestNetwork(test_base.TestRequest):
         mock_get_session.side_effect = [
             test_base.get_mock_session(
                 ["get"],
-                {"get": {"content":MOCK_GET_SERVERS_RESPONSE}}),
+                {"get": {"content": MOCK_GET_SERVERS_RESPONSE}}),
             test_base.get_mock_session(
-                ["get"], {"get": {"content":None}}),
+                ["get"], {"get": {"content": None}}),
             test_base.get_mock_session(
                 ["get"], {"get": {"content": None}}),
         ]
@@ -181,21 +183,22 @@ class TestNetwork(test_base.TestRequest):
         server_id = "f5dc173b-6804-445a-a6d8-c705dad5b5eb"
 
         response = self.client.post((
-            "/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/"
-            "" + tenant_id + "/servers/" + server_id),
+            "/api/%s/v0/windriver-hudson-dc_RegionOne/%s/"
+            "servers/%s" % (test_base.MULTIVIM_VERSION, tenant_id,
+                            server_id)),
             data=json.dumps(TEST_CREATE_SERVER),
             content_type="application/json",
             HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
 
         context = response.json()
-        self.assertEquals(status.HTTP_200_OK,response.status_code)
+        self.assertEquals(status.HTTP_200_OK, response.status_code)
         self.assertIsNone(context["volumeArray"])
         self.assertIsNone(context["flavorId"])
         self.assertIsNone(context["availabilityZone"])
         self.assertEquals(TEST_CREATE_SERVER["name"], context["name"])
         self.assertEquals(
             MOCK_GET_SERVERS_RESPONSE["servers"][0]["id"],
-                                                 context["id"])
+            context["id"])
         self.assertIsNone(context["nicArray"])
         self.assertIsNotNone(context["boot"])
         self.assertEquals(0, context["returnCode"])
@@ -207,16 +210,18 @@ class TestNetwork(test_base.TestRequest):
 
         mock_get_session.side_effect = [
             test_base.get_mock_session(
-                ["get"], {"get": {"content": {"servers":[]}}}),
+                ["get"], {"get": {"content": {"servers": []}}}),
             test_base.get_mock_session(
-                ["post"], {"post": {"content": MOCK_POST_SERVER_RESPONSE.copy()}}),
+                ["post"], {"post": {
+                    "content": MOCK_POST_SERVER_RESPONSE.copy()}}),
         ]
         tenant_id = "fcca3cc49d5e42caae15459e27103efc"
         server_id = "f5dc173b-6804-445a-a6d8-c705dad5b5eb"
 
         response = self.client.post((
-            "/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/"
-            "" + tenant_id + "/servers/" + server_id),
+            "/api/%s/v0/windriver-hudson-dc_RegionOne/%s/"
+            "servers/%s" % (test_base.MULTIVIM_VERSION, tenant_id,
+                            server_id)),
             data=json.dumps(TEST_CREATE_SERVER),
             content_type="application/json",
             HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
@@ -249,14 +254,15 @@ class TestNetwork(test_base.TestRequest):
     @mock.patch.object(VimDriverUtils, 'get_session')
     @mock.patch.object(VimDriverUtils, 'get_vim_info')
     def test_delete_existing_server(self, mock_get_vim_info,
-                                     mock_get_session):
+                                    mock_get_session):
         mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
         mock_get_session.side_effect = [
             test_base.get_mock_session(
                 ["delete"], {"delete": {"content": None}}),
             test_base.get_mock_session(
                 ["get"],
-                {"get": {"content": MOCK_GET_SERVER_RESPONSE.copy()}}),
+                {"get": {
+                    "content": MOCK_GET_SERVER_RESPONSE.copy()}}),
             test_base.get_mock_session(
                 ["get"], {"get": {"content": None}}),
         ]
@@ -265,10 +271,11 @@ class TestNetwork(test_base.TestRequest):
         server_id = "f5dc173b-6804-445a-a6d8-c705dad5b5eb"
 
         response = self.client.delete((
-            "/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/"
-            "" + tenant_id + "/servers/" + server_id),
+            "/api/%s/v0/windriver-hudson-dc_RegionOne/%s/"
+            "servers/%s" % (test_base.MULTIVIM_VERSION, tenant_id,
+                            server_id)),
             data=json.dumps(TEST_CREATE_SERVER),
             content_type="application/json",
             HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
 
-        self.assertEquals(status.HTTP_200_OK, response.status_code)
\ No newline at end of file
+        self.assertEquals(status.HTTP_200_OK, response.status_code)
diff --git a/newton/newton/requests/tests/test_subnet.py b/newton/newton/requests/tests/test_subnet.py
index 653df33d..9cc1ea3c 100644
--- a/newton/newton/requests/tests/test_subnet.py
+++ b/newton/newton/requests/tests/test_subnet.py
@@ -80,13 +80,15 @@ class TestSubnetNewton(unittest.TestCase, AbstractTestResource):
         mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
 
         response = self.client.get(
-            "/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/fcca3cc49d5e42caae15459e27103efc/subnets"
-            "/uuid_1",
+            "/api/%s/v0/windriver-hudson-dc_RegionOne/"
+            "fcca3cc49d5e42caae15459e27103efc/subnets/"
+            "uuid_1" % test_base.MULTIVIM_VERSION,
             {}, HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
 
         context = response.json()
         self.assertEquals(status.HTTP_200_OK, response.status_code)
-        self.assertEqual(self.MOCK_GET_RESOURCE_RESPONSE["id"], context["id"])
+        self.assertEqual(self.MOCK_GET_RESOURCE_RESPONSE["id"],
+                         context["id"])
 
     # Overridden method from test base to not make it run for current test case.
     def test_get_resource_info(self):
diff --git a/newton/newton/requests/tests/test_tenant.py b/newton/newton/requests/tests/test_tenant.py
index 67c02b51..87db8abd 100644
--- a/newton/newton/requests/tests/test_tenant.py
+++ b/newton/newton/requests/tests/test_tenant.py
@@ -20,7 +20,7 @@ from newton.requests.tests import test_base
 from newton.requests.views.util import VimDriverUtils
 
 MOCK_GET_PROJECTS_RESPONSE = {
-    "tenants":[
+    "tenants": [
         {"id": "1", "name": "project"},
         {"id": "2", "name": "project2"},
     ]
@@ -28,7 +28,6 @@ MOCK_GET_PROJECTS_RESPONSE = {
 
 
 class TestNetwork(test_base.TestRequest):
-
     @mock.patch.object(VimDriverUtils, 'get_session')
     @mock.patch.object(VimDriverUtils, 'get_vim_info')
     def test_retrieve_projects(
@@ -37,12 +36,12 @@ class TestNetwork(test_base.TestRequest):
         mock_get_session.side_effect = [
             test_base.get_mock_session(
                 ["get"],
-                {"get": { "content": MOCK_GET_PROJECTS_RESPONSE }}),
+                {"get": {"content": MOCK_GET_PROJECTS_RESPONSE}}),
         ]
 
         response = self.client.get((
-            "/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/"
-            "tenants"), {},
+            "/api/%s/v0/windriver-hudson-dc_RegionOne/"
+            "tenants" % test_base.MULTIVIM_VERSION), {},
             HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
 
         self.assertEquals(status.HTTP_200_OK, response.status_code)
@@ -71,8 +70,8 @@ class TestNetwork(test_base.TestRequest):
         ]
 
         response = self.client.get((
-            "/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/"
-            "tenants?name=project"), {},
+            "/api/%s/v0/windriver-hudson-dc_RegionOne/"
+            "tenants?name=project" % test_base.MULTIVIM_VERSION), {},
             HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
 
         self.assertEquals(status.HTTP_200_OK, response.status_code)
diff --git a/newton/newton/requests/tests/test_volume.py b/newton/newton/requests/tests/test_volume.py
index fb58d240..ff3e2cf9 100644
--- a/newton/newton/requests/tests/test_volume.py
+++ b/newton/newton/requests/tests/test_volume.py
@@ -78,12 +78,15 @@ class TestVolumesNewton(unittest.TestCase, AbstractTestResource):
             {"get": {"content": self.MOCK_GET_RESOURCE_RESPONSE}})
 
         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)
+            "/api/%s/v0/windriver-hudson-dc_RegionOne/"
+            "fcca3cc49d5e42caae15459e27103efc/volumes/"
+            "uuid_1" % test_base.MULTIVIM_VERSION, {},
+            HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
 
         context = response.json()
         self.assertEquals(status.HTTP_200_OK, response.status_code)
-        self.assertEquals(self.MOCK_GET_RESOURCE_RESPONSE['id'], context['id'])
+        self.assertEquals(self.MOCK_GET_RESOURCE_RESPONSE['id'],
+                          context['id'])
 
     # Overridden method from test base to not make it run for current test case.
     def test_get_resource_info(self):
diff --git a/newton/newton/requests/tests/test_vport.py b/newton/newton/requests/tests/test_vport.py
index c272f5db..3fc4bfca 100644
--- a/newton/newton/requests/tests/test_vport.py
+++ b/newton/newton/requests/tests/test_vport.py
@@ -53,8 +53,8 @@ MOCK_POST_VPORT_RESPONSE = {
 
 class Testvports(test_base.TestRequest):
 
-    url = ("/api/multicloud-newton/v0/windriver-hudson-dc_RegionOne/"
-           "fcca3cc49d5e42caae15459e27103efc/")
+    url = ("/api/%s/v0/windriver-hudson-dc_RegionOne/"
+           "fcca3cc49d5e42caae15459e27103efc/" % test_base.MULTIVIM_VERSION)
     @mock.patch.object(VimDriverUtils, 'get_session')
     @mock.patch.object(VimDriverUtils, 'get_vim_info')
     def test_get_vports(self, mock_get_vim_info, mock_get_session):