logger.info('A PNFD(%s) has been created.' % data['id'])
return data
- def query_multiple(self, pnfdId=None):
+ def query_multiple(self, request):
+ pnfdId = request.query_params.get('pnfdId')
if pnfdId:
pnf_pkgs = PnfPackageModel.objects.filter(pnfdId=pnfdId)
else:
pnfdName = ""
if pnfd.get("pnf", "") != "":
if pnfd["pnf"].get("properties", "") != "":
- pnfd_id = pnfd["pnf"].get("properties", "").get("descriptor_id", "")
- pnfdVersion = pnfd["pnf"].get("properties", "").get("version", "")
- pnfdProvider = pnfd["pnf"].get("properties", "").get("provider", "")
- pnfdName = pnfd["pnf"].get("properties", "").get("name", "")
+ pnfd_id = pnfd["pnf"].get("properties", {}).get("descriptor_id", "")
+ pnfdVersion = pnfd["pnf"].get("properties", {}).get("version", "")
+ pnfdProvider = pnfd["pnf"].get("properties", {}).get("provider", "")
+ pnfdName = pnfd["pnf"].get("properties", {}).get("name", "")
if pnfd_id == "":
pnfd_id = pnfd["metadata"].get("descriptor_id", "")
if pnfd_id == "":
pnf_pkg.update(onboardingState=PKG_STATUS.CREATED)
def parse_pnfd(self, csar_id, inputs):
- ret = None
+
try:
pnf_pkg = PnfPackageModel.objects.filter(pnfPackageId=csar_id)
if not pnf_pkg:
csar_path = pnf_pkg[0].localFilePath
ret = {"model": toscaparsers.parse_pnfd(csar_path, inputs)}
except GenericparserException as e:
- return [1, e.message]
+ return [1, e.args[0]]
except Exception as e:
- logger.error(e.message)
- return [1, e.message]
+ logger.error(e.args[0])
+ return [1, e.args[0]]
return [0, ret]