diff options
author | Bin Yang <bin.yang@windriver.com> | 2019-03-06 01:50:30 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-03-06 01:50:30 +0000 |
commit | cc4e6853dca01ff1cdbbd6a163d1653e261d9a36 (patch) | |
tree | ca1e3575c9b664d61ce92b1e1a475c3109cc5e7d /lenovo/thinkcloud/extensions | |
parent | c67c38021c18377a65a7d054aa280de5baa64d91 (diff) | |
parent | 56fd16d9f72b1b7f3f4363eeb7edb24a259a4160 (diff) |
Merge "Add Lenovo ThinkCLoud Driver"
Diffstat (limited to 'lenovo/thinkcloud/extensions')
-rw-r--r-- | lenovo/thinkcloud/extensions/__init__.py | 13 | ||||
-rw-r--r-- | lenovo/thinkcloud/extensions/tests/__init__.py | 13 | ||||
-rw-r--r-- | lenovo/thinkcloud/extensions/tests/test_extensions.py | 38 | ||||
-rw-r--r-- | lenovo/thinkcloud/extensions/urls.py | 24 | ||||
-rw-r--r-- | lenovo/thinkcloud/extensions/urlsV1.py | 24 | ||||
-rw-r--r-- | lenovo/thinkcloud/extensions/views/__init__.py | 13 | ||||
-rw-r--r-- | lenovo/thinkcloud/extensions/views/extensions.py | 43 |
7 files changed, 168 insertions, 0 deletions
diff --git a/lenovo/thinkcloud/extensions/__init__.py b/lenovo/thinkcloud/extensions/__init__.py new file mode 100644 index 00000000..5b09b2fd --- /dev/null +++ b/lenovo/thinkcloud/extensions/__init__.py @@ -0,0 +1,13 @@ +# Copyright (c) 2017-2018 Lenovo 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. diff --git a/lenovo/thinkcloud/extensions/tests/__init__.py b/lenovo/thinkcloud/extensions/tests/__init__.py new file mode 100644 index 00000000..5b09b2fd --- /dev/null +++ b/lenovo/thinkcloud/extensions/tests/__init__.py @@ -0,0 +1,13 @@ +# Copyright (c) 2017-2018 Lenovo 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. diff --git a/lenovo/thinkcloud/extensions/tests/test_extensions.py b/lenovo/thinkcloud/extensions/tests/test_extensions.py new file mode 100644 index 00000000..4bc64aad --- /dev/null +++ b/lenovo/thinkcloud/extensions/tests/test_extensions.py @@ -0,0 +1,38 @@ +# Copyright (c) 2017-2018 Lenovo 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. + +from django.test import Client +from rest_framework import status +import unittest + + +class TestExtensions(unittest.TestCase): + def setUp(self): + self.client = Client() + + def test_get_extensions_info(self): + cloud_owner = "lenovo-hudson-dc" + cloud_region_id = "RegionOne" + vimid = cloud_owner + "_" + cloud_region_id + + response = self.client.get( + "/api/multicloud-thinkcloud/v0/" + vimid + "/extensions/") + 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"]) diff --git a/lenovo/thinkcloud/extensions/urls.py b/lenovo/thinkcloud/extensions/urls.py new file mode 100644 index 00000000..e88c607d --- /dev/null +++ b/lenovo/thinkcloud/extensions/urls.py @@ -0,0 +1,24 @@ +# Copyright (c) 2017-2018 Lenovo 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. + +from django.conf.urls import url +from rest_framework.urlpatterns import format_suffix_patterns + +from thinkcloud.extensions.views import extensions + +urlpatterns = [ + url(r'^sions/?$', extensions.Extensions.as_view()), +] + +urlpatterns = format_suffix_patterns(urlpatterns) diff --git a/lenovo/thinkcloud/extensions/urlsV1.py b/lenovo/thinkcloud/extensions/urlsV1.py new file mode 100644 index 00000000..f6c23770 --- /dev/null +++ b/lenovo/thinkcloud/extensions/urlsV1.py @@ -0,0 +1,24 @@ +# Copyright (c) 2017-2018 Lenovo 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. + +from django.conf.urls import url +from rest_framework.urlpatterns import format_suffix_patterns + +from thinkcloud.extensions.views import extensions + +urlpatterns = [ + url(r'^sions/?$', extensions.APIv1Extensions.as_view()), +] + +urlpatterns = format_suffix_patterns(urlpatterns) diff --git a/lenovo/thinkcloud/extensions/views/__init__.py b/lenovo/thinkcloud/extensions/views/__init__.py new file mode 100644 index 00000000..5b09b2fd --- /dev/null +++ b/lenovo/thinkcloud/extensions/views/__init__.py @@ -0,0 +1,13 @@ +# Copyright (c) 2017-2018 Lenovo 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. diff --git a/lenovo/thinkcloud/extensions/views/extensions.py b/lenovo/thinkcloud/extensions/views/extensions.py new file mode 100644 index 00000000..056ad5a3 --- /dev/null +++ b/lenovo/thinkcloud/extensions/views/extensions.py @@ -0,0 +1,43 @@ +# Copyright (c) 2017-2018 Lenovo 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 + +from common.msapi import extsys +from django.conf import settings +from newton_base.extensions import extensions as newton_extensions + +logger = logging.getLogger(__name__) + +# DEBUG=True + + +class Extensions(newton_extensions.Extensions): + + def __init__(self): + self._logger = logger + self.proxy_prefix = settings.MULTICLOUD_PREFIX + + +class APIv1Extensions(Extensions): + + def __init__(self): + self._logger = logger + self.proxy_prefix = settings.MULTICLOUD_API_V1_PREFIX + + def get(self, request, cloud_owner="", cloud_region_id=""): + self._logger.info("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner, cloud_region_id)) + + vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id) + return super(APIv1Extensions, self).get(request, vimid) |