diff options
author | Dileep Ranganathan <dileep.ranganathan@intel.com> | 2018-07-26 16:35:13 -0700 |
---|---|---|
committer | Dileep Ranganathan <dileep.ranganathan@intel.com> | 2018-07-30 06:31:55 -0700 |
commit | f5718605d7aae67eb9b63e3d5fa3f2217ec9bdf2 (patch) | |
tree | eb95244d9fee7beb6e928b626cc94722fc6fafe0 /windriver/titanium_cloud/extensions/tests | |
parent | 0d3e9ace323660381350a884b08ed92aa2290dbd (diff) |
Remove EPA attribute
Remove EPA property from multicloud as it is repaced by HPA attributes.
Change-Id: I96e2ebcc60ac55cb0f0559607de919da410f66b1
Issue-ID: AAI-1150
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
Diffstat (limited to 'windriver/titanium_cloud/extensions/tests')
-rw-r--r-- | windriver/titanium_cloud/extensions/tests/test_epacaps.py | 67 | ||||
-rw-r--r-- | windriver/titanium_cloud/extensions/tests/test_extensions.py | 4 |
2 files changed, 0 insertions, 71 deletions
diff --git a/windriver/titanium_cloud/extensions/tests/test_epacaps.py b/windriver/titanium_cloud/extensions/tests/test_epacaps.py deleted file mode 100644 index 6b938da1..00000000 --- a/windriver/titanium_cloud/extensions/tests/test_epacaps.py +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright (c) 2017-2018 Wind River Systems, Inc. -# -# 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 json - -import mock -from django.test import Client -from rest_framework import status -import unittest - -from newton_base.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": "titanium_cloud", - "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): - self.client = Client() - - @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 - cloud_owner = "windriver-hudson-dc" - cloud_region_id = "RegionOne" - vimid = cloud_owner + "_" + cloud_region_id - - response = self.client.get( - "/api/multicloud-titanium_cloud/v0/" + vimid + "/extensions/epa-caps") - 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(vimid, json_content["vimid"]) - self.assertEquals(json.loads(MOCK_VIM_INFO['cloud_epa_caps']), - json_content["cloud-epa-caps"]) diff --git a/windriver/titanium_cloud/extensions/tests/test_extensions.py b/windriver/titanium_cloud/extensions/tests/test_extensions.py index f0dae164..1ab792b9 100644 --- a/windriver/titanium_cloud/extensions/tests/test_extensions.py +++ b/windriver/titanium_cloud/extensions/tests/test_extensions.py @@ -37,9 +37,5 @@ class TestExtensions(unittest.TestCase): 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-titanium_cloud/v0/%s/extensions/epa-caps" % vimid, - json_content["extensions"][0]["url"]) self.assertEquals("", json_content["extensions"][0]["spec"]) |