summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--share/newton_base/tests/__init__.py10
-rw-r--r--share/newton_base/tests/mock_info.py568
-rw-r--r--share/newton_base/tests/test_base.py252
-rw-r--r--windriver/assembly.xml9
-rw-r--r--windriver/run.sh2
-rw-r--r--windriver/titanium_cloud/registration/tests/test_registration.py4
-rw-r--r--windriver/tox.ini2
7 files changed, 834 insertions, 13 deletions
diff --git a/share/newton_base/tests/__init__.py b/share/newton_base/tests/__init__.py
new file mode 100644
index 00000000..387c54c2
--- /dev/null
+++ b/share/newton_base/tests/__init__.py
@@ -0,0 +1,10 @@
+# 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.
diff --git a/share/newton_base/tests/mock_info.py b/share/newton_base/tests/mock_info.py
new file mode 100644
index 00000000..0c7556ee
--- /dev/null
+++ b/share/newton_base/tests/mock_info.py
@@ -0,0 +1,568 @@
+# Copyright (c) 2017 Intel Corporation, 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.
+
+from django.conf import settings
+
+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',
+}
+
+MOCK_TOKEN_ID = "1a62b3971d774404a504c5d9a3e506e3"
+
+MOCK_CATALOG_RESPONSE = {
+ "catalog": [
+ {
+ "id": "99aefcc82a9246f98f8c281e61ffc754",
+ "endpoints": [
+ {
+ "region": "RegionOne",
+ "url": "http://128.224.180.14:9696",
+ "id": "39583c1508ad4b71b380570a745ee10a",
+ "interface": "public",
+ "region_id": "RegionOne"
+ },
+ {
+ "url": "http://192.168.204.2:9696",
+ "region": "RegionOne",
+ "id": "37e8d07ba24e4b8f93490c9daaba06e2",
+ "interface": "internal",
+ "region_id": "RegionOne"
+ },
+ {
+ "interface": "admin",
+ "id": "7eee4ca98d444b1abb00a50d4b89373f",
+ "region_id": "RegionOne",
+ "region": "RegionOne",
+ "url": "http://192.168.204.2:9696"
+ }
+ ],
+ "name": "neutron",
+ "type": "network"
+ },
+ {
+ "endpoints": [
+ {
+ "interface": "public",
+ "id": "10496738fa374295a4a88a63b81a1589",
+ "region_id": "RegionOne",
+ "url": "http://128.224.180.14:8777",
+ "region": "RegionOne"
+ },
+ {
+ "id": "02dcb8c0bd464c4489fa0a0c9f28571f",
+ "region_id": "RegionOne",
+ "interface": "internal",
+ "url": "http://192.168.204.2:8777",
+ "region": "RegionOne"
+ },
+ {
+ "region_id": "RegionOne",
+ "id": "8a73b0d3743b4e78b87614690f6e97fe",
+ "interface": "admin",
+ "url": "http://192.168.204.2:8777",
+ "region": "RegionOne"
+ }
+ ],
+ "id": "d131054da83f4c93833799747a0f4709",
+ "name": "ceilometer",
+ "type": "metering"
+ },
+ {
+ "type": "volumev2",
+ "name": "cinderv2",
+ "endpoints": [
+ {
+ "id": "35a67ad36f0447d19c9662babf7cf609",
+ "interface": "public",
+ "region_id": "RegionOne",
+ "url": "http://128.224.180.14:8776/v2/fcca3cc49d5e42caae15459e27103efc",
+ "region": "RegionOne"
+ },
+ {
+ "region": "RegionOne",
+ "url": "http://192.168.204.2:8776/v2/fcca3cc49d5e42caae15459e27103efc",
+ "id": "c6ea42052268420fa2c8d351ee68c922",
+ "interface": "internal",
+ "region_id": "RegionOne"
+ },
+ {
+ "region_id": "RegionOne",
+ "id": "91cb24853dc3450d847b0c286a2e44ea",
+ "interface": "admin",
+ "region": "RegionOne",
+ "url": "http://192.168.204.2:8776/v2/fcca3cc49d5e42caae15459e27103efc"
+ }
+ ],
+ "id": "40440057102440739c30be10a66bc5d1"
+ },
+ {
+ "name": "heat",
+ "type": "orchestration",
+ "id": "35300cce88db4bd4bb5a72ffe3b88b00",
+ "endpoints": [
+ {
+ "id": "58999d7b4a94439089ecfb2aca2d7f6c",
+ "region_id": "RegionOne",
+ "interface": "public",
+ "region": "RegionOne",
+ "url": "http://128.224.180.14:8004/v1/fcca3cc49d5e42caae15459e27103efc"
+ },
+ {
+ "url": "http://192.168.204.2:8004/v1/fcca3cc49d5e42caae15459e27103efc",
+ "region": "RegionOne",
+ "interface": "internal",
+ "id": "1e0ee1a2aef84802b921d422372a567e",
+ "region_id": "RegionOne"
+ },
+ {
+ "region": "RegionOne",
+ "url": "http://192.168.204.2:8004/v1/fcca3cc49d5e42caae15459e27103efc",
+ "id": "17661bf4859741b8a43a461dedad1871",
+ "region_id": "RegionOne",
+ "interface": "admin"
+ }
+ ]
+ },
+ {
+ "id": "08dc6912aea64c01925012c8a6df250a",
+ "endpoints": [
+ {
+ "id": "02792c4eed77486083f9b2e52d7b94b0",
+ "region_id": "RegionOne",
+ "interface": "public",
+ "region": "RegionOne",
+ "url": "http://128.224.180.14:5000/v3"
+ },
+ {
+ "id": "b6d5cad394b94309ae40d8de88059c5f",
+ "region_id": "RegionOne",
+ "interface": "internal",
+ "url": "http://192.168.204.2:5000/v3",
+ "region": "RegionOne"
+ },
+ {
+ "region": "RegionOne",
+ "url": "http://192.168.204.2:35357/v3",
+ "region_id": "RegionOne",
+ "id": "1f18e2b7c6a34493b86853b65917888e",
+ "interface": "admin"
+ }
+ ],
+ "type": "identity",
+ "name": "keystone"
+ },
+ {
+ "name": "vim",
+ "type": "nfv",
+ "endpoints": [
+ {
+ "url": "http://128.224.180.14:4545",
+ "region": "RegionOne",
+ "id": "b33e317345e4480ab0786e4960995ec9",
+ "interface": "public",
+ "region_id": "RegionOne"
+ },
+ {
+ "region": "RegionOne",
+ "url": "http://192.168.204.2:4545",
+ "interface": "internal",
+ "id": "03c85828d5bf432ab04831aa65ac9c52",
+ "region_id": "RegionOne"
+ },
+ {
+ "id": "067983abb061476cb53a9e23a740d98f",
+ "region_id": "RegionOne",
+ "interface": "admin",
+ "url": "http://192.168.204.2:4545",
+ "region": "RegionOne"
+ }
+ ],
+ "id": "01636c856fc84988b38b9117eb4a8021"
+ },
+ {
+ "name": "aodh",
+ "type": "alarming",
+ "id": "eb269151d0e44744a5b5449657bdc61c",
+ "endpoints": [
+ {
+ "id": "5bfc6c056e0244c493642eb82f6aaa11",
+ "region_id": "RegionOne",
+ "interface": "public",
+ "url": "http://128.224.180.14:8042",
+ "region": "RegionOne"
+ },
+ {
+ "region": "RegionOne",
+ "url": "http://192.168.204.2:8042",
+ "region_id": "RegionOne",
+ "id": "ad69c7f76dce4089a195b9221ddbfb44",
+ "interface": "internal"
+ },
+ {
+ "interface": "admin",
+ "id": "3e8fcdfa7bcb40b0ae33c282adfcc9ff",
+ "region_id": "RegionOne",
+ "region": "RegionOne",
+ "url": "http://192.168.204.2:8042"
+ }
+ ]
+ },
+ {
+ "name": "sysinv",
+ "type": "platform",
+ "endpoints": [
+ {
+ "region": "RegionOne",
+ "url": "http://128.224.180.14:6385/v1",
+ "interface": "public",
+ "id": "ba4ba8104590421b84672306c7e0e1f1",
+ "region_id": "RegionOne"
+ },
+ {
+ "region": "RegionOne",
+ "url": "http://192.168.204.2:6385/v1",
+ "interface": "internal",
+ "id": "a1cba34b163f496ab1acd6e9b51e39a2",
+ "region_id": "RegionOne"
+ },
+ {
+ "url": "http://192.168.204.2:6385/v1",
+ "region": "RegionOne",
+ "id": "7c171210a2c841a6a52a5713e316d6fc",
+ "interface": "admin",
+ "region_id": "RegionOne"
+ }
+ ],
+ "id": "256bbad671f946fea543e6bd71f98875"
+ },
+ {
+ "id": "e84665dcce814c05b4c5084964547534",
+ "endpoints": [
+ {
+ "url": "http://128.224.180.14:8000/v1/fcca3cc49d5e42caae15459e27103efc",
+ "region": "RegionOne",
+ "region_id": "RegionOne",
+ "id": "b2ed1a23dc6944bea129c20861e0286a",
+ "interface": "public"
+ },
+ {
+ "region": "RegionOne",
+ "url": "http://192.168.204.2:8000/v1/fcca3cc49d5e42caae15459e27103efc",
+ "interface": "internal",
+ "id": "c4df7c6bc15646848eff35caf6ffea8e",
+ "region_id": "RegionOne"
+ },
+ {
+ "region_id": "RegionOne",
+ "id": "61b3dabb761443a89ab549f437c05ab0",
+ "interface": "admin",
+ "region": "RegionOne",
+ "url": "http://192.168.204.2:8000/v1/fcca3cc49d5e42caae15459e27103efc"
+ }
+ ],
+ "name": "heat-cfn",
+ "type": "cloudformation"
+ },
+ {
+ "id": "823024424a014981a3721229491c0b1a",
+ "endpoints": [
+ {
+ "region": "RegionOne",
+ "url": "http://128.224.180.14:8776/v1/fcca3cc49d5e42caae15459e27103efc",
+ "region_id": "RegionOne",
+ "id": "4a52e4e54ff440789f9a797919c4a0f2",
+ "interface": "public"
+ },
+ {
+ "url": "http://192.168.204.2:8776/v1/fcca3cc49d5e42caae15459e27103efc",
+ "region": "RegionOne",
+ "id": "d4f9a84476524a39844f0fce63f1022e",
+ "region_id": "RegionOne",
+ "interface": "internal"
+ },
+ {
+ "region": "RegionOne",
+ "url": "http://192.168.204.2:8776/v1/fcca3cc49d5e42caae15459e27103efc",
+ "interface": "admin",
+ "id": "81bf3810a8cc4697b68c6e93b5b8fe1f",
+ "region_id": "RegionOne"
+ }
+ ],
+ "type": "volume",
+ "name": "cinder"
+ },
+ {
+ "name": "glance",
+ "type": "image",
+ "endpoints": [
+ {
+ "id": "bd930aba961946cfb1401bada56d55e3",
+ "region_id": "RegionOne",
+ "interface": "public",
+ "region": "RegionOne",
+ "url": "http://128.224.180.14:9292"
+ },
+ {
+ "region": "RegionOne",
+ "url": "http://192.168.204.2:9292",
+ "id": "c11da585f0b141b99d1e18bb9a607beb",
+ "region_id": "RegionOne",
+ "interface": "internal"
+ },
+ {
+ "region": "RegionOne",
+ "url": "http://192.168.204.2:9292",
+ "id": "31b26c625a6a4fc7910dc5935155996e",
+ "interface": "admin",
+ "region_id": "RegionOne"
+ }
+ ],
+ "id": "3b78cf039bc54d1bbb99ab3a4be15ef1"
+ },
+ {
+ "id": "b8701374bf254de1beee8a2c9ecc6b33",
+ "endpoints": [
+ {
+ "region_id": "RegionOne",
+ "id": "f7407f330c8b4577b1d377d3fab9c2f8",
+ "interface": "public",
+ "region": "RegionOne",
+ "url": "http://128.224.180.14:15491"
+ },
+ {
+ "url": "http://192.168.204.2:5491",
+ "region": "RegionOne",
+ "interface": "internal",
+ "id": "0b37ce31a32f4b6fa5e1aa0d6c20680f",
+ "region_id": "RegionOne"
+ },
+ {
+ "region_id": "RegionOne",
+ "id": "7b87ea72adf245e1991e9e0df29b7ea9",
+ "interface": "admin",
+ "region": "RegionOne",
+ "url": "http://192.168.204.2:5491"
+ }
+ ],
+ "type": "patching",
+ "name": "patching"
+ },
+ {
+ "id": "0ec0923a58f04ffeb6fced3bbc5c0947",
+ "endpoints": [
+ {
+ "url": "http://128.224.180.14:8774/v2.1/fcca3cc49d5e42caae15459e27103efc",
+ "region": "RegionOne",
+ "id": "13168b12da17451fb39630de67db168f",
+ "region_id": "RegionOne",
+ "interface": "public"
+ },
+ {
+ "id": "22dd6a44209f42d986b82e3aa6535f82",
+ "interface": "internal",
+ "region_id": "RegionOne",
+ "region": "RegionOne",
+ "url": "http://192.168.204.2:8774/v2.1/fcca3cc49d5e42caae15459e27103efc"
+ },
+ {
+ "region": "RegionOne",
+ "url": "http://192.168.204.2:8774/v2.1/fcca3cc49d5e42caae15459e27103efc",
+ "id": "552a991ae501492f841c1b6e2ff38fc5",
+ "region_id": "RegionOne",
+ "interface": "admin"
+ }
+ ],
+ "type": "compute",
+ "name": "nova"
+ },
+ {
+ "id": "50b219650f1049b097b3f14e8c70cdf8",
+ "endpoints": [
+ {
+ "interface": "public",
+ "id": "5a4276cd6e4d43e883cf8640d4e13f7d",
+ "region_id": "RegionOne",
+ "region": "RegionOne",
+ "url": "http://128.224.180.14:8776/v3/fcca3cc49d5e42caae15459e27103efc"
+ },
+ {
+ "region": "RegionOne",
+ "url": "http://192.168.204.2:8776/v3/fcca3cc49d5e42caae15459e27103efc",
+ "region_id": "RegionOne",
+ "id": "c796df3ca5a84fc18db5b43a55283953",
+ "interface": "internal"
+ },
+ {
+ "region_id": "RegionOne",
+ "id": "cf55c2b34d0049ba835a2e48b9ad0e2e",
+ "interface": "admin",
+ "url": "http://192.168.204.2:8776/v3/fcca3cc49d5e42caae15459e27103efc",
+ "region": "RegionOne"
+ }
+ ],
+ "type": "volumev3",
+ "name": "cinderv3"
+ }
+ ]
+}
+
+MOCK_AUTH_STATE = {
+ "body": {
+ "token": {
+ "is_domain": "false",
+ "expires_at": "2017-08-27T14:19:15.000000Z",
+ "issued_at": "2017-08-27T13:19:15.000000Z",
+ "roles": [
+ {
+ "id": "9fe2ff9ee4384b1894a90878d3e92bab",
+ "name": "_member_"
+ },
+ {
+ "id": "b86a7e02935844b899d3d326f83c1b1f",
+ "name": "admin"
+ },
+ {
+ "name": "heat_stack_owner",
+ "id": "7de502236e954c8282de32e773fc052e"
+ }
+ ],
+ "methods": [
+ "password"
+ ],
+ "catalog": MOCK_CATALOG_RESPONSE['catalog'],
+ "project": {
+ "name": "admin",
+ "id": "fcca3cc49d5e42caae15459e27103efc",
+ "domain": {
+ "id": "default",
+ "name": "Default"
+ }
+ },
+ "user": {
+ "name": "admin",
+ "id": "9efb043c7629497a8028d7325ca1afb0",
+ "domain": {
+ "id": "default",
+ "name": "Default"
+ }
+ },
+ "audit_ids": [
+ "_ZWT10DtSZKRXIvIcxun7w"
+ ]
+ }
+ },
+ "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": BASE_URL + "identity",
+ "prefix": "http://128.224.180.14:5000",
+ "suffix": "v3"
+ },
+ "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": BASE_URL + "orchestration"
+ },
+ "volume": {
+ "prefix": "http://128.224.180.14:8776",
+ "suffix": "v1/fcca3cc49d5e42caae15459e27103efc",
+ "proxy_prefix": BASE_URL + "volume"
+ },
+ "metering": {
+ "suffix": "",
+ "prefix": "http://128.224.180.14:8777",
+ "proxy_prefix": BASE_URL + "metering"
+ },
+ "volumev3": {
+ "prefix": "http://128.224.180.14:8776",
+ "suffix": "v3/fcca3cc49d5e42caae15459e27103efc",
+ "proxy_prefix": BASE_URL + "volumev3"
+ },
+ "compute": {
+ "suffix": "v2.1/fcca3cc49d5e42caae15459e27103efc",
+ "prefix": "http://128.224.180.14:8774",
+ "proxy_prefix": BASE_URL + "compute"
+ },
+ "platform": {
+ "prefix": "http://128.224.180.14:6385",
+ "suffix": "v1",
+ "proxy_prefix": BASE_URL + "platform"
+ },
+ "nfv": {
+ "proxy_prefix": BASE_URL + "nfv",
+ "prefix": "http://128.224.180.14:4545",
+ "suffix": ""
+ },
+ "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": BASE_URL + "image"
+ },
+ "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": BASE_URL + "alarming"
+ },
+ "cloudformation": {
+ "proxy_prefix": BASE_URL + "cloudformation",
+ "prefix": "http://128.224.180.14:8000",
+ "suffix": "v1/fcca3cc49d5e42caae15459e27103efc"
+ }
+}
diff --git a/share/newton_base/tests/test_base.py b/share/newton_base/tests/test_base.py
new file mode 100644
index 00000000..1b582ef4
--- /dev/null
+++ b/share/newton_base/tests/test_base.py
@@ -0,0 +1,252 @@
+# Copyright (c) 2017 Intel Corporation, 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 mock
+from rest_framework import status
+import unittest
+
+from abc import ABCMeta
+from django.conf import settings
+from django.test import Client
+
+from newton_base.tests import mock_info
+from newton_base.util import VimDriverUtils
+
+MULTIVIM_VERSION = settings.MULTIVIM_VERSION
+
+
+class MockResponse(object):
+ status_code = status.HTTP_200_OK
+ content = ''
+
+ def json(self):
+ pass
+
+
+def get_mock_session(http_actions, response_dict={}):
+ mock_session = mock.Mock(
+ name='mock_session',spec=http_actions)
+ for action in http_actions:
+ side_effect = response_dict.get("side_effect")
+ if side_effect and isinstance(side_effect, list):
+ mock_session.__getattr__(action).__setattr__(
+ "side_effect", side_effect)
+ else:
+ mock_response_obj = mock.Mock(spec=MockResponse)
+ mock_response_obj.content = response_dict.get(
+ action).get("content")
+ mock_response_obj.json.return_value = response_dict.get(
+ action).get("content")
+ mock_response_obj.status_code = response_dict.get(
+ action).get("status_code", status.HTTP_200_OK)
+ mock_session.__getattr__(action).__setattr__(
+ "return_value", mock_response_obj)
+
+ return mock_session
+
+
+class TestRequest(unittest.TestCase):
+
+ def setUp(self):
+ self.client = Client()
+
+
+class AbstractTestResource(object):
+ __metaclass__ = ABCMeta
+
+ def __init__(self):
+
+ self.client = Client()
+
+ self.region = "windriver-hudson-dc_RegionOne"
+ self.url = ("/api/%s/v0/%s/"
+ "fcca3cc49d5e42caae15459e27103efc/" % (
+ MULTIVIM_VERSION, self.region))
+
+ self.MOCK_GET_RESOURCES_RESPONSE = {}
+ self.MOCK_GET_RESOURCE_RESPONSE = {}
+ self.MOCK_GET_RESOURCE_RESPONSE_NOT_FOUND = {}
+
+ self.MOCK_POST_RESOURCE_REQUEST = {}
+ self.MOCK_POST_RESOURCE_REQUEST_EXISTING = {}
+
+ self.MOCK_POST_RESOURCE_RESPONSE = {}
+
+ self.assert_keys = ""
+ self.assert_key = ""
+
+ self.HTTP_not_found = status.HTTP_404_NOT_FOUND
+
+ @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):
+ mock_get_session.side_effect = [
+ get_mock_session(
+ ["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)
+
+ 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])
+
+ @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):
+ mock_get_session.side_effect = [
+ get_mock_session(
+ ["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)
+
+ 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])
+
+ @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):
+ mock_get_session.side_effect = [
+ get_mock_session(
+ ["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)
+
+ self.assertEquals(self.HTTP_not_found, response.status_code)
+
+ @mock.patch.object(VimDriverUtils, 'get_session')
+ @mock.patch.object(VimDriverUtils, 'get_vim_info')
+ 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_mock_session(
+ ["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)
+
+ context = response.json()
+ 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):
+ mock_get_session.side_effect = [
+ get_mock_session(
+ ["get"], {"get": {
+ "content": self.MOCK_GET_RESOURCES_RESPONSE}}),
+ get_mock_session(
+ ["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)
+
+ context = response.json()
+ self.assertEquals(status.HTTP_200_OK, response.status_code)
+ self.assertIsNotNone(context['returnCode'])
+ self.assertEqual(0, context['returnCode'])
+
+ @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):
+ mock_get_session.side_effect = [
+ get_mock_session(
+ ["get"], {"get": {
+ "content": self.MOCK_GET_RESOURCE_RESPONSE}}),
+ get_mock_session(
+ ["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)
+
+ context = response.json()
+ self.assertIn('error', context)
+ 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):
+
+ mock_get_session.side_effect = [
+ get_mock_session(
+ ["delete"], {"delete": {"content": {},
+ "status_code": 204}})
+ ]
+
+ 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)
+
+ self.assertEqual(status.HTTP_204_NO_CONTENT,
+ response.status_code)
+ self.assertIsNone(response.data)
diff --git a/windriver/assembly.xml b/windriver/assembly.xml
index 4d7813c9..518b10da 100644
--- a/windriver/assembly.xml
+++ b/windriver/assembly.xml
@@ -72,14 +72,5 @@
</includes>
</fileSet>
</fileSets>
- <dependencySets>
- <dependencySet>
- <unpack>true</unpack>
- <outputDirectory>/lib</outputDirectory>
- <includes>
- <include>org.onap.multicloud.openstack:multicloud-openstack-newton</include>
- </includes>
- </dependencySet>
- </dependencySets>
<baseDirectory>windriver</baseDirectory>
</assembly>
diff --git a/windriver/run.sh b/windriver/run.sh
index 95b7b71c..6efd9b3a 100644
--- a/windriver/run.sh
+++ b/windriver/run.sh
@@ -14,7 +14,7 @@
# limitations under the License.
memcached -d -m 2048 -u root -c 1024 -p 11211 -P /tmp/memcached1.pid
-export PYTHONPATH=lib/newton:lib/share
+export PYTHONPATH=lib/share
nohup python manage.py runserver 0.0.0.0:9005 2>&1 &
while [ ! -f logs/runtime_titanium_cloud.log ]; do
diff --git a/windriver/titanium_cloud/registration/tests/test_registration.py b/windriver/titanium_cloud/registration/tests/test_registration.py
index 01a40217..e0df5b1d 100644
--- a/windriver/titanium_cloud/registration/tests/test_registration.py
+++ b/windriver/titanium_cloud/registration/tests/test_registration.py
@@ -17,8 +17,8 @@ import mock
from rest_framework import status
from common.utils import restcall
-from newton.requests.tests import mock_info
-from newton.requests.tests import test_base
+from newton_base.tests import mock_info
+from newton_base.tests import test_base
from newton_base.util import VimDriverUtils
MOCK_GET_TENANT_RESPONSE = {
diff --git a/windriver/tox.ini b/windriver/tox.ini
index 29baba1a..0f9b2aee 100644
--- a/windriver/tox.ini
+++ b/windriver/tox.ini
@@ -7,7 +7,7 @@ downloadcache = ~/cache/pip
[testenv]
setenv =
- PYTHONPATH = {toxinidir}/../newton:{toxinidir}/../share
+ PYTHONPATH = {toxinidir}/../share
deps = -r{toxinidir}/requirements.txt
commands =
coverage run --branch manage.py test titanium_cloud