X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=multivimbroker%2Fmultivimbroker%2Fforwarder%2Fviews.py;h=83d31726a3bd5e07fad79f19a4b19fc637d523bc;hb=887f8f1071c7327b6e24546ee9fa33722463e064;hp=c2ea50587697e12855dfc3b0e0f9fb58d6b17041;hpb=2906f8863e3af3559a5ba288cbc2363f31c9f507;p=multicloud%2Fframework.git diff --git a/multivimbroker/multivimbroker/forwarder/views.py b/multivimbroker/multivimbroker/forwarder/views.py index c2ea505..83d3172 100644 --- a/multivimbroker/multivimbroker/forwarder/views.py +++ b/multivimbroker/multivimbroker/forwarder/views.py @@ -20,8 +20,7 @@ from rest_framework.views import APIView from rest_framework.views import Response from rest_framework.views import status from multivimbroker.forwarder.base import BaseHandler - -# +from multivimbroker.pub.utils.syscomm import originHeaders class BaseServer(BaseHandler, APIView): @@ -50,18 +49,21 @@ class Identity(BaseServer): def get(self, request, vimid): - return self.send(vimid, request.get_full_path(), request.body, "GET") + return self.send(vimid, request.get_full_path(), request.body, "GET", + headers=originHeaders(request)) def post(self, request, vimid): - return self.send(vimid, request.get_full_path(), request.body, "POST") + return self.send(vimid, request.get_full_path(), request.body, "POST", + headers=originHeaders(request)) class Registry(BaseServer): def post(self, request, vimid): - return self.send(vimid, request.get_full_path(), request.body, "POST") + return self.send(vimid, request.get_full_path(), request.body, "POST", + headers=originHeaders(request)) class UnRegistry(BaseServer): @@ -69,14 +71,15 @@ class UnRegistry(BaseServer): def delete(self, request, vimid): return self.send(vimid, request.get_full_path(), request.body, - "DELETE") + "DELETE", headers=originHeaders(request)) class Extension(BaseServer): def get(self, request, vimid): - return self.send(vimid, request.get_full_path(), request.body, "GET") + return self.send(vimid, request.get_full_path(), request.body, "GET", + headers=originHeaders(request)) class VIMTypes(BaseServer): @@ -87,8 +90,45 @@ class VIMTypes(BaseServer): '../pub/config/provider-plugin.json') with open(json_file, "r") as f: plugins = json.load(f) - data = {"vim_types": plugins} - return Response(data=data, status=status.HTTP_200_OK) + ret = [] + for k, v in plugins.items(): + item = {} + item["vim_type"] = v.get("vim_type") + item["versions"] = [k for k in v.get('versions', {})] + ret.append(item) + return Response(data=ret, status=status.HTTP_200_OK) + + +class CheckCapacity(BaseServer): + + def post(self, request): + try: + body = json.loads(request.body) + except ValueError as e: + return Response( + data={'error': 'Invalidate request body %s.' % e}, + status=status.HTTP_400_BAD_REQUEST) + + ret = {"VIMs": []} + newbody = { + "vCPU": body.get("vCPU", 0), + "Memory": body.get("Memory", 0), + "Storage": body.get("Storage", 0) + } + for vim in body.get("VIMs", []): + url = request.get_full_path().replace( + "check_vim_capacity", "%s/capacity_check" % vim) + resp = self.send(vim, url, newbody, "POST") + if resp.status_code != status.HTTP_200_OK: + continue + try: + resp_body = json.loads(resp.body) + except ValueError: + continue + if not resp_body.get("result", False): + continue + ret['VIMs'].append(vim) + return Response(data=ret, status=status.HTTP_200_OK) # forward handler