summaryrefslogtreecommitdiffstats
path: root/newton/newton/extensions
diff options
context:
space:
mode:
authorVictor Morales <victor.morales@intel.com>2018-01-05 17:32:25 -0800
committerVictor Morales <victor.morales@intel.com>2018-01-05 17:32:25 -0800
commit475ba5fdce48c8d646d20e7643851f559394c283 (patch)
treef2330419a150797f70522bb6ef1bce7f895fc62d /newton/newton/extensions
parent7330272e07e7bc3b72bf17cc4eb69ea9584697de (diff)
Centralize the release version for UTs
The URL is formed based on the OpenStack release version supported. Given that OpenStack release cycles are targeting twice a year, it's necessary mechanism to adopt this changes. This commit centralizes the release information into a configuration value. Change-Id: Ie7f0c819472593f706520e7f2563db31b9d42444 Signed-off-by: Victor Morales <victor.morales@intel.com> Issue-ID: MULTICLOUD-83
Diffstat (limited to 'newton/newton/extensions')
-rw-r--r--newton/newton/extensions/tests/test_epacaps.py37
-rw-r--r--newton/newton/extensions/tests/test_extensions.py26
2 files changed, 29 insertions, 34 deletions
diff --git a/newton/newton/extensions/tests/test_epacaps.py b/newton/newton/extensions/tests/test_epacaps.py
index 65125a43..35604165 100644
--- a/newton/newton/extensions/tests/test_epacaps.py
+++ b/newton/newton/extensions/tests/test_epacaps.py
@@ -19,29 +19,10 @@ from django.test import Client
from rest_framework import status
import unittest
+from newton.requests.tests import test_base
+from newton.requests.tests import mock_info
from newton.requests.views.util import VimDriverUtils
-MOCK_VIM_INFO = {
- "createTime": "2017-04-01 02:22:27",
- "domain": "Default",
- "name": "TiS_R4",
- "password": "admin",
- "tenant": "admin",
- "type": "openstack",
- "url": "http://128.224.180.14:5000/v3",
- "userName": "admin",
- "vendor": "WindRiver",
- "version": "newton",
- "vimId": "windriver-hudson-dc_RegionOne",
- '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"}',
- 'insecure':'True',
-}
-
class TestEpaCaps(unittest.TestCase):
def setUp(self):
@@ -49,19 +30,23 @@ class TestEpaCaps(unittest.TestCase):
@mock.patch.object(VimDriverUtils, 'get_vim_info')
def test_get_epa_caps_info(self, mock_get_vim_info):
- mock_get_vim_info.return_value = MOCK_VIM_INFO
+ mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO
cloud_owner = "windriver-hudson-dc"
cloud_region_id = "RegionOne"
vimid = cloud_owner + "_" + cloud_region_id
response = self.client.get(
- "/api/multicloud-newton/v0/" + vimid + "/extensions/epa-caps")
+ "/api/%s/v0/%s/extensions/epa-caps" % (
+ test_base.MULTIVIM_VERSION,
+ vimid))
json_content = response.json()
self.assertEquals(status.HTTP_200_OK, response.status_code)
self.assertEquals(4, len(json_content.keys()))
self.assertEquals(cloud_owner, json_content["cloud-owner"])
- self.assertEquals(cloud_region_id, json_content["cloud-region-id"])
+ self.assertEquals(cloud_region_id,
+ json_content["cloud-region-id"])
self.assertEquals(vimid, json_content["vimid"])
- self.assertEquals(json.loads(MOCK_VIM_INFO['cloud_epa_caps']),
- json_content["cloud-epa-caps"]) \ No newline at end of file
+ self.assertEquals(
+ json.loads(mock_info.MOCK_VIM_INFO['cloud_epa_caps']),
+ json_content["cloud-epa-caps"])
diff --git a/newton/newton/extensions/tests/test_extensions.py b/newton/newton/extensions/tests/test_extensions.py
index 89ef0d11..7b92b61e 100644
--- a/newton/newton/extensions/tests/test_extensions.py
+++ b/newton/newton/extensions/tests/test_extensions.py
@@ -16,6 +16,8 @@ from django.test import Client
from rest_framework import status
import unittest
+from newton.requests.tests import test_base
+
class TestExtensions(unittest.TestCase):
def setUp(self):
@@ -27,19 +29,27 @@ class TestExtensions(unittest.TestCase):
vimid = cloud_owner + "_" + cloud_region_id
response = self.client.get(
- "/api/multicloud-newton/v0/" + vimid + "/extensions/")
+ "/api/%s/v0/%s/extensions/" % (
+ test_base.MULTIVIM_VERSION, vimid))
json_content = response.json()
self.assertEquals(status.HTTP_200_OK, response.status_code)
self.assertEquals(4, len(json_content.keys()))
self.assertEquals(cloud_owner, json_content["cloud-owner"])
- self.assertEquals(cloud_region_id, json_content["cloud-region-id"])
+ self.assertEquals(cloud_region_id,
+ json_content["cloud-region-id"])
self.assertEquals(vimid, json_content["vimid"])
- self.assertEquals("epa-caps", json_content["extensions"][0]["alias"])
- self.assertEquals("Multiple network support", json_content["extensions"][0]["description"])
- self.assertEquals("EPACapsQuery", json_content["extensions"][0]["name"])
- self.assertEquals("http://127.0.0.1:80/api/multicloud-newton/v0/%s/extensions/epa-caps" % vimid,
- json_content["extensions"][0]["url"])
- self.assertEquals("", json_content["extensions"][0]["spec"]) \ No newline at end of file
+ self.assertEquals("epa-caps",
+ json_content["extensions"][0]["alias"])
+ self.assertEquals("Multiple network support",
+ json_content["extensions"][0][
+ "description"])
+ self.assertEquals("EPACapsQuery",
+ json_content["extensions"][0]["name"])
+ self.assertEquals(
+ "http://127.0.0.1:80/api/%s/v0/%s/extensions/epa-caps" % (
+ test_base.MULTIVIM_VERSION, vimid),
+ json_content["extensions"][0]["url"])
+ self.assertEquals("", json_content["extensions"][0]["spec"])