summaryrefslogtreecommitdiffstats
path: root/newton
diff options
context:
space:
mode:
Diffstat (limited to 'newton')
-rw-r--r--newton/newton/extensions/tests/test_epacaps.py52
-rw-r--r--newton/newton/extensions/tests/test_extensions.py13
-rw-r--r--newton/newton/extensions/urls.py2
-rw-r--r--newton/newton/extensions/views/epacaps.py33
4 files changed, 0 insertions, 100 deletions
diff --git a/newton/newton/extensions/tests/test_epacaps.py b/newton/newton/extensions/tests/test_epacaps.py
deleted file mode 100644
index 0588f773..00000000
--- a/newton/newton/extensions/tests/test_epacaps.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright (c) 2017 Intel Corporation.
-#
-# 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.tests import test_base
-from newton_base.tests import mock_info
-from newton_base.util import VimDriverUtils
-
-
-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_info.MOCK_VIM_INFO
- cloud_owner = "windriver-hudson-dc"
- cloud_region_id = "RegionOne"
- vimid = cloud_owner + "_" + cloud_region_id
-
- response = self.client.get(
- "/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(vimid, json_content["vimid"])
- 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 ebdb2168..0a89c8b7 100644
--- a/newton/newton/extensions/tests/test_extensions.py
+++ b/newton/newton/extensions/tests/test_extensions.py
@@ -40,16 +40,3 @@ 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/%s/v0/%s/extensions/epa-caps" % (
- test_base.MULTIVIM_VERSION, vimid),
- json_content["extensions"][0]["url"])
- self.assertEquals("", json_content["extensions"][0]["spec"])
diff --git a/newton/newton/extensions/urls.py b/newton/newton/extensions/urls.py
index ad61e1d9..41bac1b6 100644
--- a/newton/newton/extensions/urls.py
+++ b/newton/newton/extensions/urls.py
@@ -16,11 +16,9 @@ from django.conf.urls import url
from rest_framework.urlpatterns import format_suffix_patterns
from newton.extensions.views import extensions
-from newton.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/newton/newton/extensions/views/epacaps.py b/newton/newton/extensions/views/epacaps.py
deleted file mode 100644
index 025d55df..00000000
--- a/newton/newton/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