From f5718605d7aae67eb9b63e3d5fa3f2217ec9bdf2 Mon Sep 17 00:00:00 2001 From: Dileep Ranganathan Date: Thu, 26 Jul 2018 16:35:13 -0700 Subject: 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 --- ocata/ocata/extensions/tests/test_epacaps.py | 67 ------------------------- ocata/ocata/extensions/tests/test_extensions.py | 7 --- ocata/ocata/extensions/urls.py | 2 - ocata/ocata/extensions/views/epacaps.py | 33 ------------ ocata/ocata/proxy/tests/test_identity_proxy.py | 3 -- ocata/ocata/proxy/tests/test_service_proxy.py | 3 -- ocata/ocata/vesagent/tests.py | 1 - ocata/ocata/vesagent/tests_tasks.py | 1 - ocata/vagrant/test/extsys.py | 4 -- ocata/vagrant/test/test-extensions.sh | 1 - 10 files changed, 122 deletions(-) delete mode 100644 ocata/ocata/extensions/tests/test_epacaps.py delete mode 100644 ocata/ocata/extensions/views/epacaps.py (limited to 'ocata') diff --git a/ocata/ocata/extensions/tests/test_epacaps.py b/ocata/ocata/extensions/tests/test_epacaps.py deleted file mode 100644 index 8120ba28..00000000 --- a/ocata/ocata/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": "ocata", - "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-ocata/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/ocata/ocata/extensions/tests/test_extensions.py b/ocata/ocata/extensions/tests/test_extensions.py index 762f0015..2f584de5 100644 --- a/ocata/ocata/extensions/tests/test_extensions.py +++ b/ocata/ocata/extensions/tests/test_extensions.py @@ -36,10 +36,3 @@ class TestExtensions(unittest.TestCase): 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("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-ocata/v0/%s/extensions/epa-caps" % vimid, - json_content["extensions"][0]["url"]) - self.assertEquals("", json_content["extensions"][0]["spec"]) diff --git a/ocata/ocata/extensions/urls.py b/ocata/ocata/extensions/urls.py index 0e364e02..9cb3b697 100644 --- a/ocata/ocata/extensions/urls.py +++ b/ocata/ocata/extensions/urls.py @@ -16,11 +16,9 @@ from django.conf.urls import url from rest_framework.urlpatterns import format_suffix_patterns from ocata.extensions.views import extensions -from ocata.extensions.views import epacaps urlpatterns = [ url(r'^sions/?$', extensions.Extensions.as_view()), - url(r'^sions/epa-caps/?$', epacaps.EpaCaps.as_view()), ] urlpatterns = format_suffix_patterns(urlpatterns) diff --git a/ocata/ocata/extensions/views/epacaps.py b/ocata/ocata/extensions/views/epacaps.py deleted file mode 100644 index 025d55df..00000000 --- a/ocata/ocata/extensions/views/epacaps.py +++ /dev/null @@ -1,33 +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 logging -import json -import traceback - -from django.conf import settings - - -from newton_base.extensions import epacaps as newton_epacaps - -logger = logging.getLogger(__name__) - -# DEBUG=True - - -class EpaCaps(newton_epacaps.EpaCaps): - - def __init__(self): - self.proxy_prefix = settings.MULTICLOUD_PREFIX - self._logger = logger diff --git a/ocata/ocata/proxy/tests/test_identity_proxy.py b/ocata/ocata/proxy/tests/test_identity_proxy.py index 185fe17f..0c844c7b 100644 --- a/ocata/ocata/proxy/tests/test_identity_proxy.py +++ b/ocata/ocata/proxy/tests/test_identity_proxy.py @@ -42,9 +42,6 @@ mock_viminfo = { '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', } diff --git a/ocata/ocata/proxy/tests/test_service_proxy.py b/ocata/ocata/proxy/tests/test_service_proxy.py index 3b784be3..83fe5241 100644 --- a/ocata/ocata/proxy/tests/test_service_proxy.py +++ b/ocata/ocata/proxy/tests/test_service_proxy.py @@ -38,9 +38,6 @@ 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"}', 'insecure':'True', } diff --git a/ocata/ocata/vesagent/tests.py b/ocata/ocata/vesagent/tests.py index b170e025..9f34b3f5 100644 --- a/ocata/ocata/vesagent/tests.py +++ b/ocata/ocata/vesagent/tests.py @@ -39,7 +39,6 @@ MOCK_VIM_INFO = { 'cloud_owner': 'windriver-hudson-dc', 'cloud_region_id': 'RegionOne', 'cloud_extra_info': '{"vesagent_config":{"backlogs":[{"source":"onap-aaf","domain":"fault","type":"vm","tenant":"VIM"}],"poll_interval_default":10,"ves_subscription":{"username":"user","password":"password","endpoint":"http://127.0.0.1:9005/sample"}}}', - 'cloud_epa_caps': '', 'insecure': 'True', } diff --git a/ocata/ocata/vesagent/tests_tasks.py b/ocata/ocata/vesagent/tests_tasks.py index bd47133f..45fbea1b 100644 --- a/ocata/ocata/vesagent/tests_tasks.py +++ b/ocata/ocata/vesagent/tests_tasks.py @@ -42,7 +42,6 @@ MOCK_VIM_INFO = { 'cloud_owner': 'windriver-hudson-dc', 'cloud_region_id': 'RegionOne', 'cloud_extra_info': '{"vesagent_config":{"backlogs":[{"source":"onap-aaf","domain":"fault","type":"vm","tenant":"VIM"}],"poll_interval_default":10,"ves_subscription":{"username":"user","password":"password","endpoint":"http://127.0.0.1:9005/sample"}}}', - 'cloud_epa_caps': '', 'insecure': 'True', } diff --git a/ocata/vagrant/test/extsys.py b/ocata/vagrant/test/extsys.py index 5de88155..db6088ed 100644 --- a/ocata/vagrant/test/extsys.py +++ b/ocata/vagrant/test/extsys.py @@ -38,9 +38,6 @@ tisr4 = { 'cloud_owner':'openstack-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', } @@ -104,7 +101,6 @@ def get_vim_by_id(vim_id): viminfo['name'] = tmp_viminfo['complex-name'] viminfo['version'] = tmp_viminfo['cloud-region-version'] viminfo['cloud_extra_info'] = tmp_viminfo['cloud-extra-info'] - viminfo['cloud_epa_caps'] = tmp_viminfo['cloud-epa-caps'] if tmp_authinfo: viminfo['userName'] = tmp_authinfo['user-name'] diff --git a/ocata/vagrant/test/test-extensions.sh b/ocata/vagrant/test/test-extensions.sh index 65fc0d1f..305a5a39 100644 --- a/ocata/vagrant/test/test-extensions.sh +++ b/ocata/vagrant/test/test-extensions.sh @@ -3,4 +3,3 @@ set -ex MULTICLOUD_PLUGIN_ENDPOINT=http://172.16.77.40:9006/api/multicloud-ocata/v0/openstack-hudson-dc_RegionOne curl -v -s -H "Content-Type: application/json" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/extensions -curl -v -s -H "Content-Type: application/json" -X GET $MULTICLOUD_PLUGIN_ENDPOINT/extensions/epa-caps -- cgit 1.2.3-korg