#!/bin/bash
+sudo chown onap:onap -R /service
find /service -name '*.sh'|xargs chmod a+x
if [ -z "$SERVICE_IP" ]; then
vnfd = json.JSONDecoder().decode(vnfd_json)
if not vnfd.get("vnf"):
- raise GenericparserException("VNF propeties and metadata in VNF Package(id=%s) are empty." % self.csar_id)
+ raise GenericparserException("VNF properties and metadata in VNF Package(id=%s) are empty." % self.csar_id)
vnfd_id = vnfd["vnf"]["properties"].get("descriptor_id", "")
if VnfPackageModel.objects.filter(vnfdId=vnfd_id):
logger.error("VNF package(%s) already exists.", vnfd_id)
raise GenericparserException("VNF package(%s) already exists." % vnfd_id)
JobUtil.add_job_status(self.job_id, 30, "Save CSAR(%s) to database." % self.csar_id)
- vnfd_ver = vnfd["vnf"]["properties"].get("descriptor_verison", "")
+ vnfd_ver = vnfd["vnf"]["properties"].get("descriptor_version", "")
vnf_provider = vnfd["vnf"]["properties"].get("provider", "")
vnf_software_version = vnfd["vnf"]["properties"].get("software_version", "")
vnfd_product_name = vnfd["vnf"]["properties"].get("product_name", "")
logger.error("VNF package(%s,%s) already exists.", other_pkg[0].vnfPackageId, vnfd_id)
raise GenericparserException("VNF package(%s) already exists." % vnfd_id)
vnf_provider = vnfd["vnf"]["properties"].get("provider", "")
- vnfd_ver = vnfd["vnf"]["properties"].get("descriptor_verison", "")
+ vnfd_ver = vnfd["vnf"]["properties"].get("descriptor_version", "")
vnf_software_version = vnfd["vnf"]["properties"].get("software_version", "")
vnfd_product_name = vnfd["vnf"]["properties"].get("product_name", "")
vnf_pkg.update(
artifact_path = fileutil.get_artifact_path(vnf_extract_path, artifactPath)
if not artifact_path:
raise ArtifactNotFoundException("Couldn't artifact %s" % artifactPath)
- file_content = open(artifact_path, 'rb').read()
+ with open(artifact_path, 'rb') as f:
+ file_content = f.read()
+ else:
+ raise ArtifactNotFoundException("NF Package format is not csar or zip")
return file_content
"vnf": {
"properties": {
"descriptor_id": "zte-hss-1.0",
- "descriptor_verison": "1.0.0",
+ "descriptor_version": "1.0.0",
"software_version": "1.0.0",
"provider": "zte"
},
descriptor_id = metadata.get("UUID", "")
properties["descriptor_id"] = descriptor_id
- if properties.get("descriptor_verison", "") == "":
+ if properties.get("descriptor_version", "") == "":
version = metadata.get("template_version", "")
if version == "":
version = metadata.get("version", "")
- properties["descriptor_verison"] = version
+ properties["descriptor_version"] = version
if properties.get("provider", "") == "":
provider = metadata.get("template_author", "")
descriptor_id = metadata.get("UUID", "")
properties["descriptor_id"] = descriptor_id
- if properties.get("descriptor_verison", "") == "":
+ if properties.get("descriptor_version", "") == "":
version = metadata.get("template_version", "")
if version == "":
version = metadata.get("version", "")
- properties["descriptor_verison"] = version
+ properties["descriptor_version"] = version
if properties.get("provider", "") == "":
provider = metadata.get("template_author", "")
# limitations under the License.
# ps auxww | grep "manage.py runserver 0.0.0.0:8806" | awk '{print $2}' | xargs kill -9
-ps auxww |grep 'uwsgi --http :8806 --module genericparser.wsgi --master' |awk '{print $2}' |xargs kill -9
+ps auxww |grep 'uwsgi --http' |awk '{print $1}' |xargs kill -9