aboutsummaryrefslogtreecommitdiffstats
path: root/aria
AgeCommit message (Expand)AuthorFilesLines
2018-03-27Fix version to reside in setup.pyJeremy Phelps3-9/+2
2018-03-27Dependency version updates for BeijingRob Daugherty4-4/+1
2018-03-24Merge "Add files to help build python package"Seshu Kumar M3-0/+55
2018-03-23Add files to help build python packageJeremy Phelps3-0/+55
2018-03-23Remove aria-rest from the build - merge job failsRob Daugherty1-1/+1
2018-03-21Disable the deploy phasesubhash kumar singh1-2/+2
2018-03-19testcases refactored for MsoVnfAdapterseshukm1-1/+0
2018-03-19Pom had reference to dev nexus`dfilppi1-2/+2
2018-03-17Re-enable aria rest api builddfilppi1-1/+1
2018-03-17fixing python build/deploydfilppi3-91/+94
2018-03-16AriaClientFactoryTest throws exceptionRob Daugherty1-0/+4
2018-03-15Merge "Adding Junit"Seshu Kumar M10-0/+390
2018-03-15Adding JunitAS0046505910-0/+390
2018-03-14AT&T 1712 and 1802 release codeRob Daugherty3-2/+33
2018-03-13Fixed parent referencedfilppi2-2/+2
2018-03-09Pom parents fixed in aria build.dfilppi2-1/+11
2018-03-09Remove redundant groupId inherited from parentMunir Ahmad1-1/+0
2018-02-23Add ARIA subtree to builddfilppi1-0/+21
2018-02-21ARIA REST client bugsdfilppi2-8/+9
2018-02-20Added ability to PUT binary CSARdfilppi3-368/+421
2018-02-14Fixed build.dfilppi21-1/+59
2017-12-27Added copyright headerdfilppi1-0/+18
2017-12-26Added module to build for aria-rest-serverdfilppi1-3/+3
2017-12-26Updated build to create wheel and push to Pypidfilppi3-45/+121
2017-12-09Null POST/PUT bodies were causing REST failuresdfilppi1-6/+6
2017-12-07added PUT capability. fixed ARIA version refdfilppi2-15/+68
2017-12-01Bump minor versionJessica Wagantall3-5/+5
2017-11-13Removed bad docsdfilppi11-1331/+0
2017-09-21Added support for userdata and metadatadfilppi2-546/+770
2017-09-07Added pom for aria rest server builddfilppi1-0/+116
2017-09-07reorg and add pom build for wheeldfilppi71-0/+95
2017-08-31changed email and updated aria versiondfilppi1-2/+2
2017-08-29changed var from openstack to multivimdfilppi1-1/+1
2017-08-10Merge "ARIA java binding initial"Seshu Kumar M22-0/+1314
2017-08-10Merge "ARIA multivim plugin initial checkin"Seshu Kumar M72-0/+10952
2017-08-07ARIA multivim plugin initial checkindfilppi72-0/+10952
2017-08-07ARIA java binding initialdfilppi22-0/+1314
2017-08-03ARIA REST server initial commitdfilppi9-0/+832
ass="n">query = VimDriverUtils.get_query_part(request) vim = VimDriverUtils.get_vim_info(vimid) sess = VimDriverUtils.get_session(vim, tenantid) resp = self._get_flavor(sess, request, flavorid) content = resp.json() if flavorid: flavor = content.pop("flavor", None) extraResp = self._get_flavor_extra_specs(sess, flavor["id"]) extraContent = extraResp.json() if extraContent["extra_specs"]: extraSpecs = [] self._convert_extra_specs(extraSpecs, extraContent["extra_specs"], True) flavor["extraSpecs"] = extraSpecs VimDriverUtils.replace_key_by_mapping(flavor, self.keys_mapping) content.update(flavor) else: wanted = None #check if query contains name="flavorname" if query: for queryone in query.split('&'): k,v = queryone.split('=') if k == "name": wanted = v break if wanted: oldFlavors = content.pop("flavors", None) content["flavors"] = [] for flavor in oldFlavors: if wanted == flavor["name"]: content["flavors"].append(flavor) #iterate each flavor to get extra_specs for flavor in content["flavors"]: extraResp = self._get_flavor_extra_specs(sess, flavor["id"]) extraContent = extraResp.json() if extraContent["extra_specs"]: extraSpecs = [] self._convert_extra_specs(extraSpecs, extraContent["extra_specs"], True) flavor["extraSpecs"] = extraSpecs VimDriverUtils.replace_key_by_mapping(flavor, self.keys_mapping) #add extra keys vim_dict = { "vimName": vim["name"], "vimId": vim["vimId"], "tenantId": tenantid, } content.update(vim_dict) return Response(data=content, status=resp.status_code) except VimDriverNewtonException as e: return Response(data={'error': e.content}, status=e.status_code) except HttpError as e: 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: logger.error(traceback.format_exc()) return Response(data={'error': str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) def _get_flavor_extra_specs(self, sess, flavorid): if flavorid: logger.debug("Flavors--get_extra_specs::> %s" % flavorid) # prepare request resource to vim instance req_resouce = "/flavors/%s/os-extra_specs" % flavorid resp = sess.get(req_resouce, endpoint_filter=self.service) return resp return {} def _get_flavor(self, sess, request, flavorid=""): logger.debug("Flavors--get basic") if sess: # prepare request resource to vim instance req_resouce = "/flavors" if flavorid: req_resouce += "/%s" % flavorid else: req_resouce += "/detail" query = VimDriverUtils.get_query_part(request) if query: req_resouce += "?%s" % query return sess.get(req_resouce, endpoint_filter=self.service) return {} def post(self, request, vimid="", tenantid="", flavorid=""): logger.debug("Flavors--post::> %s" % request.data) sess = None resp = None resp_body = None try: # prepare request resource to vim instance vim = VimDriverUtils.get_vim_info(vimid) sess = VimDriverUtils.get_session(vim, tenantid) #check if the flavor is already created: name or id tmpresp = self._get_flavor(sess, request) content = tmpresp.json() #iterate each flavor to get extra_specs existed = False for flavor in content["flavors"]: if flavor["name"] == request.data["name"]: existed = True break elif hasattr(request.data, "id") and flavor["id"] == request.data["id"]: existed = True break if existed: extraResp = self._get_flavor_extra_specs(sess, flavor["id"]) extraContent = extraResp.json() if extraContent["extra_specs"]: extraSpecs = [] self._convert_extra_specs(extraSpecs, extraContent["extra_specs"], True) flavor["extraSpecs"] = extraSpecs VimDriverUtils.replace_key_by_mapping(flavor, self.keys_mapping) vim_dict = { "vimName": vim["name"], "vimId": vim["vimId"], "tenantId": tenantid, "returnCode": 0, } flavor.update(vim_dict) return Response(data=flavor, status=tmpresp.status_code) extraSpecs = request.data.pop("extraSpecs", None) #create flavor first resp = self._create_flavor(sess, request) if resp.status_code == 202: resp_body = resp.json()["flavor"] else: return resp flavorid = resp_body['id'] if extraSpecs: extra_specs={} self._convert_extra_specs(extraSpecs, extra_specs, False) # logger.debug("extraSpecs:%s" % extraSpecs) # logger.debug("extra_specs:%s" % extra_specs) extraResp = self._create_flavor_extra_specs(sess, extra_specs, flavorid) if extraResp.status_code == 200: #combine the response body and return tmpSpecs = [] tmpRespBody = extraResp.json() self._convert_extra_specs(tmpSpecs, tmpRespBody['extra_specs'], True) resp_body.update({"extraSpecs":tmpSpecs}) else: #rollback self._delete_flavor(self, request, vimid, tenantid, flavorid) return extraResp VimDriverUtils.replace_key_by_mapping(resp_body, self.keys_mapping) vim_dict = { "vimName": vim["name"], "vimId": vim["vimId"], "tenantId": tenantid, "returnCode": 1, } resp_body.update(vim_dict) return Response(data=resp_body, status=resp.status_code) except VimDriverNewtonException as e: if sess and resp and resp.status_code == 200: self._delete_flavor(sess, flavorid) return Response(data={'error': e.content}, status=e.status_code) except HttpError as e: 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: logger.error(traceback.format_exc()) if sess and resp and resp.status_code == 200: self._delete_flavor(sess, flavorid) return Response(data={'error': str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) def _create_flavor(self, sess, request): logger.debug("Flavors--create::> %s" % request.data) # prepare request resource to vim instance req_resouce = "/flavors" flavor = request.data VimDriverUtils.replace_key_by_mapping(flavor, self.keys_mapping, True) req_body = json.JSONEncoder().encode({"flavor": flavor}) return sess.post(req_resouce, data=req_body, endpoint_filter=self.service) def _create_flavor_extra_specs(self, sess, extraspecs, flavorid): logger.debug("Flavors extra_specs--post::> %s" % extraspecs) # prepare request resource to vim instance req_resouce = "/flavors" if flavorid: req_resouce += "/%s/os-extra_specs" % flavorid else: raise VimDriverNewtonException(message="VIM newton exception", content="internal bug in creating flavor extra specs", status_code=500) req_body = json.JSONEncoder().encode({"extra_specs": extraspecs}) return sess.post(req_resouce, data=req_body, endpoint_filter=self.service) def delete(self, request, vimid="", tenantid="", flavorid=""): logger.debug("Flavors--delete::> %s" % request.data) try: # prepare request resource to vim instance vim = VimDriverUtils.get_vim_info(vimid) sess = VimDriverUtils.get_session(vim, tenantid) #delete extra specs one by one resp = self._delete_flavor_extra_specs(sess, flavorid) #delete flavor resp = self._delete_flavor(sess, flavorid) #return results return Response(status=resp.status_code) except VimDriverNewtonException as e: return Response(data={'error': e.content}, status=e.status_code) except HttpError as e: 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: logger.error(traceback.format_exc()) return Response(data={'error': str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) def _delete_flavor_extra_specs(self, sess, flavorid): logger.debug("Flavors--delete extra::> %s" % flavorid) #delete extra specs one by one resp = self._get_flavor_extra_specs(sess, flavorid) extra_specs = resp.json() if extra_specs and extra_specs["extra_specs"]: for k, _ in extra_specs["extra_specs"].items(): # just try to delete extra spec, but do not care if succeeded self._delete_flavor_one_extra_spec(sess, flavorid, k) return resp def _delete_flavor_one_extra_spec(self, sess, flavorid, extra_spec_key): logger.debug("Flavors--delete 1 extra::> %s" % extra_spec_key) # prepare request resource to vim instance try: req_resouce = "/flavors" if flavorid and extra_spec_key: req_resouce += "/%s" % flavorid req_resouce += "/os-extra_specs/%s" % extra_spec_key else: raise VimDriverNewtonException(message="VIM newton exception", content="internal bug in deleting flavor extra specs: %s" % extra_spec_key, status_code=status.HTTP_500_INTERNAL_SERVER_ERROR) return sess.delete(req_resouce, endpoint_filter=self.service) except HttpError as e: 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: logger.error(traceback.format_exc()) return Response(data={'error': str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) def _delete_flavor(self, sess, flavorid): logger.debug("Flavors--delete basic::> %s" % flavorid) # prepare request resource to vim instance req_resouce = "/flavors" if flavorid: req_resouce += "/%s" % flavorid else: raise VimDriverNewtonException(message="VIM newton exception", content="internal bug in deleting flavor", status_code=500) return sess.delete(req_resouce, endpoint_filter=self.service)