diff options
Diffstat (limited to 'newton')
| -rw-r--r-- | newton/.gitignore | 2 | ||||
| -rw-r--r-- | newton/newton/extensions/views/epacaps.py | 2 | ||||
| -rw-r--r-- | newton/newton/extensions/views/extensions.py | 2 | ||||
| -rw-r--r-- | newton/newton/proxy/views/identityV3.py | 2 | ||||
| -rw-r--r-- | newton/newton/proxy/views/services.py | 2 | ||||
| -rw-r--r-- | newton/newton/registration/views/registration.py | 2 | ||||
| -rw-r--r-- | newton/newton/resource/__init__.py | 14 | ||||
| -rw-r--r-- | newton/newton/resource/tests/__init__.py | 14 | ||||
| -rw-r--r-- | newton/newton/resource/tests/test_capacity.py | 120 | ||||
| -rw-r--r-- | newton/newton/resource/views/__init__.py | 14 | ||||
| -rw-r--r-- | newton/newton/resource/views/capacity.py | 117 | ||||
| -rw-r--r-- | newton/newton/settings.py | 4 | ||||
| -rw-r--r-- | newton/newton/urls.py | 4 | ||||
| -rw-r--r-- | newton/pom.xml | 4 | ||||
| -rw-r--r-- | newton/tox.ini | 4 |
15 files changed, 296 insertions, 11 deletions
diff --git a/newton/.gitignore b/newton/.gitignore index d0dc4903..224c808e 100644 --- a/newton/.gitignore +++ b/newton/.gitignore @@ -15,3 +15,5 @@ openstack_multicloud.egg-info/ .eggs/ build/ test-reports/ +coverage.xml + diff --git a/newton/newton/extensions/views/epacaps.py b/newton/newton/extensions/views/epacaps.py index 77542b31..7efb71a6 100644 --- a/newton/newton/extensions/views/epacaps.py +++ b/newton/newton/extensions/views/epacaps.py @@ -23,7 +23,7 @@ from newton_base.extensions import epacaps as newton_epacaps logger = logging.getLogger(__name__) -DEBUG=True +#DEBUG=True class EpaCaps(newton_epacaps.EpaCaps): diff --git a/newton/newton/extensions/views/extensions.py b/newton/newton/extensions/views/extensions.py index 851bc7ea..a40ccdd3 100644 --- a/newton/newton/extensions/views/extensions.py +++ b/newton/newton/extensions/views/extensions.py @@ -19,7 +19,7 @@ from newton_base.extensions import extensions as newton_extensions logger = logging.getLogger(__name__) -DEBUG=True +#DEBUG=True class Extensions(newton_extensions.Extensions): diff --git a/newton/newton/proxy/views/identityV3.py b/newton/newton/proxy/views/identityV3.py index dd280314..c831d017 100644 --- a/newton/newton/proxy/views/identityV3.py +++ b/newton/newton/proxy/views/identityV3.py @@ -19,7 +19,7 @@ from newton_base.proxy import identityV3 as newton_identityV3 logger = logging.getLogger(__name__) -DEBUG=True +#DEBUG=True class Tokens(newton_identityV3.Tokens): diff --git a/newton/newton/proxy/views/services.py b/newton/newton/proxy/views/services.py index 4bfecdbc..c1d4f194 100644 --- a/newton/newton/proxy/views/services.py +++ b/newton/newton/proxy/views/services.py @@ -21,7 +21,7 @@ from newton_base.proxy import services as newton_services logger = logging.getLogger(__name__) -DEBUG=True +#DEBUG=True class Services(newton_services.Services): diff --git a/newton/newton/registration/views/registration.py b/newton/newton/registration/views/registration.py index e9f1a357..f07428a1 100644 --- a/newton/newton/registration/views/registration.py +++ b/newton/newton/registration/views/registration.py @@ -26,7 +26,7 @@ from newton_base.openoapi.flavor import Flavors logger = logging.getLogger(__name__) -DEBUG=True +#DEBUG=True class Registry(newton_registration.Registry): diff --git a/newton/newton/resource/__init__.py b/newton/newton/resource/__init__.py new file mode 100644 index 00000000..afa702d3 --- /dev/null +++ b/newton/newton/resource/__init__.py @@ -0,0 +1,14 @@ +# 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. + diff --git a/newton/newton/resource/tests/__init__.py b/newton/newton/resource/tests/__init__.py new file mode 100644 index 00000000..afa702d3 --- /dev/null +++ b/newton/newton/resource/tests/__init__.py @@ -0,0 +1,14 @@ +# 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. + diff --git a/newton/newton/resource/tests/test_capacity.py b/newton/newton/resource/tests/test_capacity.py new file mode 100644 index 00000000..071997e3 --- /dev/null +++ b/newton/newton/resource/tests/test_capacity.py @@ -0,0 +1,120 @@ +# 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 mock + +from rest_framework import status + +from common.utils import restcall +from newton_base.tests import mock_info +from newton_base.tests import test_base +from newton_base.util import VimDriverUtils + +MOCK_GET_TENANT_LIMIT_RESPONSE = { + "limits" : { + "rate" : [], + "absolute" : { + "maxTotalRAMSize" : 128*1024, + "totalRAMUsed" : 8*1024, + "totalCoresUsed" : 4, + "maxTotalCores" : 20, + } + } +} + +MOCK_GET_HYPER_STATATICS_RESPONSE = { + "hypervisor_statistics" : { + "vcpus_used" : 4, + "free_ram_mb" : 120*1024, + "vcpus" : 10, + "free_disk_gb" : 300 + } +} + +MOCK_GET_STORAGE_RESPONSE = { + "limits" : { + "rate" : [], + "absolute" : { + "totalGigabytesUsed" : 200, + "maxTotalVolumeGigabytes" : 500, + } + } +} + +TEST_REQ_SUCCESS_SOURCE = { + "vCPU": "4", + "Memory": "4096", + "Storage": "200" +} + +TEST_REQ_FAILED_SOURCE = { + "vCPU": "17", + "Memory": "4096", + "Storage": "200" +} + +class TestCapacity(test_base.TestRequest): + def setUp(self): + super(TestCapacity, self).setUp() + + def _get_mock_response(self, return_value=None): + mock_response = mock.Mock(spec=test_base.MockResponse) + mock_response.status_code = status.HTTP_200_OK + mock_response.json.return_value = return_value + return mock_response + + @mock.patch.object(VimDriverUtils, 'get_session') + @mock.patch.object(VimDriverUtils, 'get_vim_info') + def test_capacity_check_success(self, mock_get_vim_info, mock_get_session): + mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO + mock_get_session.return_value = test_base.get_mock_session( + ["get"], { + "side_effect": [ + self._get_mock_response(MOCK_GET_TENANT_LIMIT_RESPONSE), + self._get_mock_response(MOCK_GET_HYPER_STATATICS_RESPONSE), + self._get_mock_response(MOCK_GET_STORAGE_RESPONSE), + ] + }) + + response = self.client.post(( + "/api/%s/v0/windriver-hudson-dc_RegionOne/" + "capacity_check" % test_base.MULTIVIM_VERSION), + TEST_REQ_SUCCESS_SOURCE, + HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID) + + self.assertEquals(status.HTTP_200_OK, response.status_code) + self.assertEqual({"result": True}, response.data) + + @mock.patch.object(VimDriverUtils, 'get_session') + @mock.patch.object(VimDriverUtils, 'get_vim_info') + def test_capacity_check_nova_limits_failed(self, mock_get_vim_info, mock_get_session): + mock_get_vim_info.return_value = mock_info.MOCK_VIM_INFO + mock_get_session.return_value = test_base.get_mock_session( + ["get"], { + "side_effect": [ + self._get_mock_response(MOCK_GET_TENANT_LIMIT_RESPONSE), + self._get_mock_response(MOCK_GET_HYPER_STATATICS_RESPONSE), + self._get_mock_response(MOCK_GET_STORAGE_RESPONSE), + ] + }) + + response = self.client.post(( + "/api/%s/v0/windriver-hudson-dc_RegionOne/" + "capacity_check" % test_base.MULTIVIM_VERSION), + TEST_REQ_FAILED_SOURCE, + HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID) + + self.assertEquals(status.HTTP_200_OK, response.status_code) + self.assertEqual({"result": False}, response.data) + diff --git a/newton/newton/resource/views/__init__.py b/newton/newton/resource/views/__init__.py new file mode 100644 index 00000000..afa702d3 --- /dev/null +++ b/newton/newton/resource/views/__init__.py @@ -0,0 +1,14 @@ +# 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. + diff --git a/newton/newton/resource/views/capacity.py b/newton/newton/resource/views/capacity.py new file mode 100644 index 00000000..d73cc0fb --- /dev/null +++ b/newton/newton/resource/views/capacity.py @@ -0,0 +1,117 @@ +# 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 rest_framework import status + +from django.conf import settings +from common.exceptions import VimDriverNewtonException +from newton_base.util import VimDriverUtils + +from keystoneauth1.exceptions import HttpError +from rest_framework import status +from rest_framework.response import Response +from rest_framework.views import APIView +from common.msapi import extsys + + +logger = logging.getLogger(__name__) + + +class CapacityCheck(APIView): + + def __init__(self): + self._logger = logger + + def post(self, request, vimid=""): + self._logger.info("CapacityCheck--post::vimid, data> %s, %s" % (vimid, request.data)) + self._logger.debug("CapacityCheck--post::META> %s" % request.META) + + hasEnoughResource = False + try : + resource_demand = request.data + + #get token: + cloud_owner, regionid = extsys.decode_vim_id(vimid) + interface = 'public' + service = {'service_type': 'compute', + 'interface': interface, + 'region_id': regionid} + + tenant_name = None + vim = VimDriverUtils.get_vim_info(vimid) + sess = VimDriverUtils.get_session(vim, tenant_name) + + #get limit for this tenant + req_resouce = "/limits" + resp = sess.get(req_resouce, endpoint_filter=service) + content = resp.json() + compute_limits = content['limits']['absolute'] + + #get total resource of this cloud region + req_resouce = "/os-hypervisors/statistics" + resp = sess.get(req_resouce, endpoint_filter=service) + content = resp.json() + hypervisor_statistics = content['hypervisor_statistics'] + + #get storage limit for this tenant + service['service_type'] = 'volumev2' + req_resouce = "/limits" + resp = sess.get(req_resouce, endpoint_filter=service) + content = resp.json() + storage_limits = content['limits']['absolute'] + + # compute actual available resource for this tenant + remainVCPU = compute_limits['maxTotalCores'] - compute_limits['totalCoresUsed'] + + if (compute_limits['maxTotalCores'] > hypervisor_statistics['vcpus']): + if hypervisor_statistics['vcpus'] > compute_limits['totalCoresUsed']: + remainVCPU = hypervisor_statistics['vcpus'] - compute_limits['totalCoresUsed'] + else: + remainVCPU = 0 + + remainMEM = compute_limits['maxTotalRAMSize'] - compute_limits['totalRAMUsed'] + if hypervisor_statistics['free_ram_mb'] > remainMEM: + remainMEM = hypervisor_statistics['free_ram_mb'] + + remainStorage = storage_limits['maxTotalVolumeGigabytes'] - storage_limits['totalGigabytesUsed'] + if (remainStorage < hypervisor_statistics['free_disk_gb']): + remainStorage = hypervisor_statistics['free_disk_gb'] + + # compare resource demanded with available + if (int(resource_demand['vCPU']) >= remainVCPU): + hasEnoughResource = False + elif (int(resource_demand['Memory']) >= remainMEM): + hasEnoughResource = False + elif (int(resource_demand['Storage']) >= remainStorage): + hasEnoughResource = False + else: + hasEnoughResource = True + + return Response(data={'result': hasEnoughResource}, status=status.HTTP_200_OK) + except VimDriverNewtonException as e: + return Response(data={'result': hasEnoughResource,'error': e.content}, status=e.status_code) + except HttpError as e: + self._logger.error("HttpError: status:%s, response:%s" % (e.http_status, e.response.json())) + resp = e.response.json() + resp.update({'result': hasEnoughResource}) + return Response(data=e.response.json(), status=e.http_status) + except Exception as e: + self._logger.error(traceback.format_exc()) + return Response(data={'result': hasEnoughResource, 'error': str(e)}, + status=status.HTTP_500_INTERNAL_SERVER_ERROR) + diff --git a/newton/newton/settings.py b/newton/newton/settings.py index a5585a68..4a78f98b 100644 --- a/newton/newton/settings.py +++ b/newton/newton/settings.py @@ -38,9 +38,9 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) SECRET_KEY = '3o-wney!99y)^h3v)0$j16l9=fdjxcb+a8g+q3tfbahcnu2b0o' # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True +#DEBUG = True -ALLOWED_HOSTS = [] +ALLOWED_HOSTS = ['*'] # Application definition diff --git a/newton/newton/urls.py b/newton/newton/urls.py index ca827480..ab09346d 100644 --- a/newton/newton/urls.py +++ b/newton/newton/urls.py @@ -16,6 +16,7 @@ from django.conf.urls import include, url from newton.registration.views import registration from newton_base.openoapi import tenants +from newton.resource.views import capacity urlpatterns = [ url(r'^', include('newton.swagger.urls')), @@ -32,6 +33,9 @@ urlpatterns = [ tenants.Tenants.as_view()), url(r'^api/multicloud-newton/v0/(?P<vimid>[0-9a-zA-Z_-]+)/' '(?P<tenantid>[0-9a-zA-Z_-]{20,})/', include('newton.requests.urls')), + # CapacityCheck + url(r'^api/multicloud-newton/v0/(?P<vimid>[0-9a-zA-Z_-]+)/capacity_check/?$', + capacity.CapacityCheck.as_view()), ] diff --git a/newton/pom.xml b/newton/pom.xml index 4f16383f..1fda1076 100644 --- a/newton/pom.xml +++ b/newton/pom.xml @@ -36,7 +36,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <nexusproxy>https://nexus.onap.org</nexusproxy> - <sonar.sources>.</sonar.sources> + <sonar.sources>.,../share</sonar.sources> <sonar.junit.reportsPath>xunit-results.xml</sonar.junit.reportsPath> <sonar.python.coverage.reportPath>coverage.xml</sonar.python.coverage.reportPath> <sonar.language>py</sonar.language> @@ -52,7 +52,7 @@ <artifactId>exec-maven-plugin</artifactId> <version>1.2.1</version> <configuration> - <executable>${session.executionRootDirectory}/mvn-phase-script.sh</executable> + <executable>${project.basedir}/mvn-phase-script.sh</executable> <environmentVariables> <!-- make mvn properties as env for our script --> <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID> diff --git a/newton/tox.ini b/newton/tox.ini index e3334cf1..ec17886d 100644 --- a/newton/tox.ini +++ b/newton/tox.ini @@ -16,12 +16,12 @@ setenv = deps = -r{toxinidir}/requirements.txt commands = coverage run --branch manage.py test newton - coverage report --omit="./venv-tox/*,./.tox/*,*tests*,*__init__.py,*newton_base*,*common*" --fail-under=30 + coverage report --omit="./venv-tox/*,./.tox/*,*tests*,*__init__.py" --fail-under=30 [testenv:pep8] deps=flake8 commands=flake8 [testenv:cov] -commands = coverage xml --omit="./venv-tox/*,./.tox/*,*tests*,*__init__.py,*newton_base*,*common*, *site-packages*" +commands = coverage xml --omit="./venv-tox/*,./.tox/*,*tests*,*__init__.py, *site-packages*" |