summaryrefslogtreecommitdiffstats
path: root/pike
diff options
context:
space:
mode:
authorHaibin Huang <haibin.huang@intel.com>2019-03-12 00:27:15 +0800
committerHaibin Huang <haibin.huang@intel.com>2019-03-12 00:27:15 +0800
commit3b5c5269cb83b6ac8a17dbf974e058ace14b5cbc (patch)
tree8bff2ba9ce19161e7be74d9ef64ef8df5866c432 /pike
parent1308091491b3efebb3ecb511a6bafaedfc34b40d (diff)
Increase Pike cover rate
Delete resource code from ocata and use newton_base code. Change-Id: I2adebca8c531da144082eda479b85bc804315ab9 Issue-ID: MULTICLOUD-501 Signed-off-by: Haibin Huang <haibin.huang@intel.com>
Diffstat (limited to 'pike')
-rw-r--r--pike/pike/resource/tests/tests_infra_workload.py4
-rw-r--r--pike/pike/resource/views/__init__.py13
-rw-r--r--pike/pike/resource/views/capacity.py144
-rw-r--r--pike/pike/resource/views/infra_workload.py420
-rw-r--r--pike/pike/urls.py4
5 files changed, 4 insertions, 581 deletions
diff --git a/pike/pike/resource/tests/tests_infra_workload.py b/pike/pike/resource/tests/tests_infra_workload.py
index a94a53f3..52a76e58 100644
--- a/pike/pike/resource/tests/tests_infra_workload.py
+++ b/pike/pike/resource/tests/tests_infra_workload.py
@@ -18,8 +18,8 @@ import unittest
from rest_framework import status
from common.msapi.helper import Helper as helper
-from pike.resource.views.infra_workload import InfraWorkload
-from pike.resource.views.infra_workload import APIv1InfraWorkload
+from newton_base.resource.infra_workload import InfraWorkload
+from newton_base.resource.infra_workload import APIv1InfraWorkload
MOCK_TOKEN_RESPONSE = {
"access": {
diff --git a/pike/pike/resource/views/__init__.py b/pike/pike/resource/views/__init__.py
deleted file mode 100644
index 5a9af6b8..00000000
--- a/pike/pike/resource/views/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (c) 2018 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.
diff --git a/pike/pike/resource/views/capacity.py b/pike/pike/resource/views/capacity.py
deleted file mode 100644
index e76c93a3..00000000
--- a/pike/pike/resource/views/capacity.py
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright (c) 2018 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 logging
-import traceback
-
-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
-
- tenant_name = None
- vim = VimDriverUtils.get_vim_info(vimid)
- sess = VimDriverUtils.get_session(vim, tenant_name)
-
- # get token:
- cloud_owner, regionid = extsys.decode_vim_id(vimid)
- interface = 'public'
- service = {'service_type': 'compute',
- 'interface': interface,
- 'region_name': vim['openstack_region_id']
- if vim.get('openstack_region_id')
- else vim['cloud_region_id']}
-
- # 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
- try:
- req_resouce = "/os-hypervisors/statistics"
- self._logger.info("check os-hypervisors statistics> URI:%s" % req_resouce)
- resp = sess.get(req_resouce, endpoint_filter=service)
- self._logger.info("check os-hypervisors statistics> status:%s" % resp.status_code)
- content = resp.json()
- hypervisor_statistics = content['hypervisor_statistics']
- self._logger.debug("check os-hypervisors statistics> resp data:%s" % content)
- except HttpError as e:
- if e.http_status == status.HTTP_403_FORBIDDEN:
- # Due to non administrator account cannot get hypervisor data,
- # so construct enough resource data
- conVCPUS = int(resource_demand['vCPU'])
- conFreeRamMB = int(resource_demand['Memory'])
- conFreeDiskGB = int(resource_demand['Storage'])
- self._logger.info("Non administator forbidden to access hypervisor statistics data")
- hypervisor_statistics = {'vcpus_used': 0, 'vcpus': conVCPUS, 'free_ram_mb': conFreeRamMB, 'free_disk_gb': conFreeDiskGB}
- else:
- # non forbiden exeption will be redirected
- raise e
-
- # 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']
- remainHypervisorVCPU = hypervisor_statistics['vcpus'] - hypervisor_statistics['vcpus_used']
-
- if (remainVCPU > remainHypervisorVCPU):
- remainVCPU = remainHypervisorVCPU
-
- remainMEM = compute_limits['maxTotalRAMSize'] - compute_limits['totalRAMUsed']
- remainHypervisorMEM = hypervisor_statistics['free_ram_mb']
- if remainMEM > remainHypervisorMEM:
- remainMEM = remainHypervisorMEM
-
- remainStorage = storage_limits['maxTotalVolumeGigabytes'] - storage_limits['totalGigabytesUsed']
- remainHypervisorStorage = hypervisor_statistics['free_disk_gb']
- if (remainStorage > remainHypervisorStorage):
- remainStorage = remainHypervisorStorage
-
- # 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)
-
-
-class APIv1CapacityCheck(CapacityCheck):
-
- def __init__(self):
- super(APIv1CapacityCheck, self).__init__()
- # self._logger = logger
-
- def post(self, request, cloud_owner="", cloud_region_id=""):
- self._logger.info("vimid, data> %s,%s, %s" % (cloud_owner, cloud_region_id, request.data))
- self._logger.debug("META> %s" % request.META)
-
- vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id)
- return super(APIv1CapacityCheck, self).post(request, vimid)
diff --git a/pike/pike/resource/views/infra_workload.py b/pike/pike/resource/views/infra_workload.py
deleted file mode 100644
index ab464da8..00000000
--- a/pike/pike/resource/views/infra_workload.py
+++ /dev/null
@@ -1,420 +0,0 @@
-# Copyright (c) 2018 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 logging
-import traceback
-
-from django.conf import settings
-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
-from common.msapi.helper import Helper as helper
-from common.utils import restcall
-from common.exceptions import VimDriverNewtonException
-
-logger = logging.getLogger(__name__)
-
-
-class InfraWorkload(APIView):
-
- def __init__(self):
- self._logger = logger
-
- def post(self, request, vimid="", requri=""):
- self._logger.info("vimid, requri: %s, %s" % (vimid, requri))
- self._logger.info("data: %s" % request.data)
- self._logger.debug("META: %s" % request.META)
-
- try:
- data = request.data
- oof_directive = data.get("oof_directives", {})
- template_type = data.get("template_type", None)
- template_data = data.get("template_data", {})
-
- resp_template = None
- if template_type and "heat" == template_type.lower():
- # update heat parameters from oof_directive
- parameters = template_data.get("parameters", {})
-
- for directive in oof_directive.get("directives", []):
- if directive["type"] == "vnfc":
- for directive2 in directive.get("directives", []):
- if directive2["type"] in ["flavor_directives", "sriovNICNetwork_directives"]:
- for attr in directive2.get("attributes", []):
- label_name = attr["attribute_name"]
- label_value = attr["attribute_value"]
- if label_name in parameters:
- template_data["parameters"][label_name] = label_value
- else:
- self._logger.warn("There is no parameter exist: %s" % label_name)
-
- # update parameters
- template_data["parameters"] = parameters
-
- # reset to make sure "files" are empty
- template_data["file"] = {}
-
- # authenticate
- cloud_owner, regionid = extsys.decode_vim_id(vimid)
- # should go via multicloud proxy so that the selflink is updated by multicloud
- retcode, v2_token_resp_json, os_status = helper.MultiCloudIdentityHelper(
- settings.MULTICLOUD_API_V1_PREFIX,
- cloud_owner, regionid, "/v2.0/tokens")
- if retcode > 0 or not v2_token_resp_json:
- logger.error("authenticate fails:%s,%s, %s" %
- (cloud_owner, regionid, v2_token_resp_json))
- return
-
- service_type = "orchestration"
- resource_uri = "/stacks"
- self._logger.info("retrieve stack resources, URI:%s" % resource_uri)
- retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner,
- regionid,
- v2_token_resp_json,
- service_type,
- resource_uri,
- template_data,
- "POST")
- stack1 = content.get('stack', None) if retcode == 0 and content else None
- resp_template = {
- "template_type": template_type,
- "workload_id": stack1["id"] if stack1 else "",
- "template_response": content
- }
- self._logger.info("RESP with data> result:%s" % resp_template)
-
- return Response(data=resp_template, status=os_status)
-
- else:
- msg = "The template type %s is not supported" % (template_type)
- self._logger.warn(msg)
- return Response(data={"error": msg}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
-
- except VimDriverNewtonException as e:
- self._logger.error("Plugin exception> status:%s,error:%s"
- % (e.status_code, e.content))
- return Response(data={'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()))
- return Response(data=e.response.json(), status=e.http_status)
- except Exception as e:
- self._logger.error(traceback.format_exc())
- return Response(data={'error': str(e)},
- status=status.HTTP_500_INTERNAL_SERVER_ERROR)
-
- def get(self, request, vimid="", requri=""):
- self._logger.info("vimid, requri: %s, %s" % (vimid, requri))
- self._logger.debug("META: %s" % request.META)
-
- try:
- # assume the workload_type is heat
- template_type = "heat"
- stack_id = requri
- cloud_owner, regionid = extsys.decode_vim_id(vimid)
- # should go via multicloud proxy so that the selflink is updated by multicloud
- retcode, v2_token_resp_json, os_status = helper.MultiCloudIdentityHelper(
- settings.MULTICLOUD_API_V1_PREFIX,
- cloud_owner, regionid, "/v2.0/tokens")
- if retcode > 0 or not v2_token_resp_json:
- logger.error("authenticate fails:%s, %s, %s" % (cloud_owner, regionid, v2_token_resp_json))
- return
-
- # get stack status
- service_type = "orchestration"
- resource_uri = "/stacks?id=%s" % stack_id if stack_id else "/stacks"
- self._logger.info("retrieve stack resources, URI:%s" % resource_uri)
- retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner, regionid, v2_token_resp_json,
- service_type, resource_uri, None, "GET")
- stacks = content.get('stacks', []) if retcode == 0 and content else []
- stack_status = stacks[0]["stack_status"] if len(stacks) > 0 else ""
-
- resp_template = {
- "template_type": template_type,
- "workload_id": stack_id,
- "workload_status": stack_status
- }
-
- if retcode > 0:
- resp_template['workload_response'] = content
-
- if ('CREATE_COMPLETE' == stack_status):
- self.heatbridge_update(request, vimid, stack_id)
-
- self._logger.info("RESP with data> result:%s" % resp_template)
- return Response(data=resp_template, status=status.HTTP_200_OK)
- except VimDriverNewtonException as e:
- self._logger.error("Plugin exception> status:%s,error:%s"
- % (e.status_code, e.content))
- return Response(data={'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()))
- return Response(data=e.response.json(), status=e.http_status)
- except Exception as e:
- self._logger.error(traceback.format_exc())
- return Response(data={'error': str(e)},
- status=status.HTTP_500_INTERNAL_SERVER_ERROR)
-
- def heatbridge_update(self, request, vimid, stack_id):
- '''
- update heat resource to AAI for the specified cloud region and tenant
- The resources includes: vserver, vserver/l-interface,
- :param request:
- :param vimid:
- :param stack_id:
- :return:
- '''
-
- cloud_owner, regionid = extsys.decode_vim_id(vimid)
- # should go via multicloud proxy so that the selflink is updated by multicloud
- retcode, v2_token_resp_json, os_status = helper.MultiCloudIdentityHelper(settings.MULTICLOUD_API_V1_PREFIX,
- cloud_owner, regionid, "/v2.0/tokens")
- if retcode > 0:
- logger.error("authenticate fails:%s, %s, %s" % (cloud_owner, regionid, v2_token_resp_json))
- return None
- tenant_id = v2_token_resp_json["access"]["token"]["tenant"]["id"]
- # tenant_name = v2_token_resp_json["access"]["token"]["tenant"]["name"]
-
- # common prefix
- aai_cloud_region = "/cloud-infrastructure/cloud-regions/cloud-region/%s/%s/tenants/tenant/%s" \
- % (cloud_owner, regionid, tenant_id)
-
- # get stack resource
- service_type = "orchestration"
- resource_uri = "/stacks/%s/resources" % (stack_id)
- self._logger.info("retrieve stack resources, URI:%s" % resource_uri)
- retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner, regionid, v2_token_resp_json, service_type, resource_uri, None, "GET")
- resources = content.get('resources', []) if retcode == 0 and content else []
-
- # find and update resources
- transactions = []
- for resource in resources:
- if resource.get('resource_status', None) != "CREATE_COMPLETE":
- continue
- if resource.get('resource_type', None) == 'OS::Nova::Server':
- # retrieve vserver details
- service_type = "compute"
- resource_uri = "/servers/%s" % (resource['physical_resource_id'])
- self._logger.info("retrieve vserver detail, URI:%s" % resource_uri)
- retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner, regionid, v2_token_resp_json, service_type,
- resource_uri, None, "GET")
- self._logger.debug(" resp data:%s" % content)
- vserver_detail = content.get('server', None) if retcode == 0 and content else None
- if vserver_detail:
- # compose inventory entry for vserver
- vserver_link = ""
- for link in vserver_detail['links']:
- if link['rel'] == 'self':
- vserver_link = link['href']
- break
- pass
-
- # note: relationship-list to flavor/image is not be update yet
- # note: volumes is not updated yet
- # note: relationship-list to vnf will be handled somewhere else
- aai_resource = {
- 'body': {
- 'vserver-name': vserver_detail['name'],
- 'vserver-name2': vserver_detail['name'],
- "vserver-id": vserver_detail['id'],
- "vserver-selflink": vserver_link,
- "prov-status": vserver_detail['status']
- },
- "uri": aai_cloud_region + "/vservers/vserver/%s"
- % (vserver_detail['id'])
- }
-
- try:
- # then update the resource
- retcode, content, status_code = \
- restcall.req_to_aai(aai_resource['uri'], "PUT", content=aai_resource['body'])
-
- if retcode == 0 and content:
- content = json.JSONDecoder().decode(content)
- self._logger.debug("AAI update %s response: %s" % (aai_resource['uri'], content))
- except Exception as e:
- self._logger.error(traceback.format_exc(e))
- pass
-
- aai_resource_transactions = {"put": [aai_resource]}
- transactions.append(aai_resource_transactions)
- # self._logger.debug("aai_resource :%s" % aai_resource_transactions)
- pass
-
- for resource in resources:
- if resource.get('resource_status', None) != "CREATE_COMPLETE":
- continue
- if resource.get('resource_type', None) == 'OS::Neutron::Port':
- # retrieve vserver details
- service_type = "network"
- resource_uri = "/v2.0/ports/%s" % (resource['physical_resource_id'])
- self._logger.info("retrieve vserver detail, URI:%s" % resource_uri)
- retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner,
- regionid,
- v2_token_resp_json,
- service_type,
- resource_uri,
- None,
- "GET")
- self._logger.debug(" resp data:%s" % content)
-
- vport_detail = content.get('port', None) if retcode == 0 and content else None
- if vport_detail:
- # compose inventory entry for vport
- # note: l3-interface-ipv4-address-list, l3-interface-ipv6-address-list are not updated yet
- # note: network-name is not update yet since the detail coming with network-id
- aai_resource = {
- "body": {
- "interface-name": vport_detail['name'],
- "interface-id": vport_detail['id'],
- "macaddr": vport_detail['mac_address']
- },
- 'uri': aai_cloud_region + "/vservers/vserver/%s/l-interfaces/l-interface/%s"
- % (vport_detail['device_id'], vport_detail['name'])
- }
- try:
- # then update the resource
- retcode, content, status_code = \
- restcall.req_to_aai(aai_resource['uri'], "PUT", content=aai_resource['body'])
-
- if retcode == 0 and content:
- content = json.JSONDecoder().decode(content)
- self._logger.debug("AAI update %s response: %s" % (aai_resource['uri'], content))
- except Exception as e:
- self._logger.error(traceback.format_exc(e))
- pass
-
- aai_resource_transactions = {"put": [aai_resource]}
- transactions.append(aai_resource_transactions)
- # self._logger.debug("aai_resource :%s" % aai_resource_transactions)
-
- pass
-
- aai_transactions = {"transactions": transactions}
- self._logger.debug("aai_transactions :%s" % aai_transactions)
-
- return aai_transactions
-
- def delete(self, request, vimid="", requri=""):
- self._logger.info("vimid, requri: %s, %s" % (vimid, requri))
- self._logger.debug("META: %s" % request.META)
-
- try:
- if requri == "":
- raise VimDriverNewtonException(
- message="workload_id is not specified",
- content="workload_id must be specified to delete the workload",
- status_code=400)
-
- # assume the workload_type is heat
- template_type = "heat"
- stack_id = requri
- cloud_owner, regionid = extsys.decode_vim_id(vimid)
- # should go via multicloud proxy so that the selflink is updated by multicloud
- retcode, v2_token_resp_json, os_status = helper.MultiCloudIdentityHelper(
- settings.MULTICLOUD_API_V1_PREFIX,
- cloud_owner, regionid, "/v2.0/tokens")
- if retcode > 0 or not v2_token_resp_json:
- logger.error("authenticate fails:%s, %s, %s" % (cloud_owner, regionid, v2_token_resp_json))
- return
- # tenant_id = v2_token_resp_json["access"]["token"]["tenant"]["id"]
- # tenant_name = v2_token_resp_json["access"]["token"]["tenant"]["name"]
-
- # get stack status
- service_type = "orchestration"
- resource_uri = "/stacks?id=%s" % stack_id if stack_id else "/stacks"
- self._logger.info("retrieve stack resources, URI:%s" % resource_uri)
- retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner, regionid, v2_token_resp_json,
- service_type, resource_uri, None, "GET")
- stacks = content.get('stacks', []) if retcode == 0 and content else []
- # assume there is at most 1 stack returned since it was filtered by id
- stack1 = stacks[0] if stacks else None
- stack_status = ""
-
- if stack1 and 'CREATE_COMPLETE' == stack1['stack_status']:
- # delete the stack
- resource_uri = "/stacks/%s/%s" % (stack1['stack_name'], stack1['id'])
- self._logger.info("delete stack, URI:%s" % resource_uri)
- retcode, content, os_status = helper.MultiCloudServiceHelper(cloud_owner, regionid, v2_token_resp_json,
- service_type, resource_uri, None, "DELETE")
- if retcode == 0:
- stack_status = "DELETE_IN_PROCESS"
- # and update AAI inventory by heatbridge-delete
- self.heatbridge_delete(request, vimid, stack1['id'])
-
- resp_template = {
- "template_type": template_type,
- "workload_id": stack_id,
- "workload_status": stack_status
- }
-
- if retcode > 0:
- resp_template["workload_response"] = content
-
- self._logger.info("RESP with data> result:%s" % resp_template)
- return Response(status=os_status)
- except VimDriverNewtonException as e:
- self._logger.error("Plugin exception> status:%s,error:%s"
- % (e.status_code, e.content))
- return Response(data={'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()))
- return Response(data=e.response.json(), status=e.http_status)
- except Exception as e:
- self._logger.error(traceback.format_exc())
- return Response(data={'error': str(e)},
- status=status.HTTP_500_INTERNAL_SERVER_ERROR)
-
- def heatbridge_delete(self, request, stack_id, vimid):
- '''
- remove heat resource from AAI for the specified cloud region and tenant
- The resources includes: vserver, vserver/l-interface,
- :param request:
- :param stack_id:
- :param vimid:
- :param tenant_id:
- :return:
- '''
- pass
-
-
-class APIv1InfraWorkload(InfraWorkload):
-
- def __init__(self):
- super(APIv1InfraWorkload, self).__init__()
- # self._logger = logger
-
- def post(self, request, cloud_owner="", cloud_region_id="", requri=""):
- # self._logger.info("cloud owner, cloud region id, data: %s,%s, %s" % (cloud_owner, cloud_region_id, request.data))
- # self._logger.debug("META: %s" % request.META)
-
- vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id)
- return super(APIv1InfraWorkload, self).post(request, vimid, requri)
-
- def get(self, request, cloud_owner="", cloud_region_id="", requri=""):
- # self._logger.info("cloud owner, cloud region id, data: %s,%s, %s" % (cloud_owner, cloud_region_id, request.data))
- # self._logger.debug("META: %s" % request.META)
-
- vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id)
- return super(APIv1InfraWorkload, self).get(request, vimid, requri)
-
- def delete(self, request, cloud_owner="", cloud_region_id="", requri=""):
- # self._logger.info("cloud owner, cloud region id, data: %s,%s, %s" % (cloud_owner, cloud_region_id, request.data))
- # self._logger.debug("META: %s" % request.META)
-
- vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id)
- return super(APIv1InfraWorkload, self).delete(request, vimid, requri)
diff --git a/pike/pike/urls.py b/pike/pike/urls.py
index dc0d43a4..3658dc1f 100644
--- a/pike/pike/urls.py
+++ b/pike/pike/urls.py
@@ -16,8 +16,8 @@ from django.conf.urls import include, url
from pike.registration.views import registration
from newton_base.openoapi import tenants
-from pike.resource.views import capacity
-from pike.resource.views import infra_workload
+from newton_base.resource import capacity
+from newton_base.resource import infra_workload
urlpatterns = [
url(r'^', include('pike.swagger.urls')),