X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=genericparser%2Fpackages%2Fbiz%2Fsdc_service_package.py;h=0d57ceb3e329adb4a963ed05ded72e1c351657ed;hb=0c9b3a3327db0bda7a60f68279900979488eccce;hp=281dd173f54b8659f6a989323864073459ab5eb0;hpb=444b802beadb9a7f1f5b03551b67f35cce1d6179;p=modeling%2Fetsicatalog.git

diff --git a/genericparser/packages/biz/sdc_service_package.py b/genericparser/packages/biz/sdc_service_package.py
index 281dd17..0d57ceb 100644
--- a/genericparser/packages/biz/sdc_service_package.py
+++ b/genericparser/packages/biz/sdc_service_package.py
@@ -19,7 +19,7 @@ from coverage.xmlreport import os
 
 from genericparser.packages.biz.service_descriptor import ServiceDescriptor
 from genericparser.pub.config.config import GENERICPARSER_ROOT_PATH, REG_TO_MSB_REG_PARAM, GENERICPARSER_URL_PATH
-from genericparser.pub.database.models import ServicePackageModel
+from genericparser.pub.database.models import ServicePackageModel, VnfPackageModel, PnfPackageModel
 from genericparser.pub.exceptions import GenericparserException, PackageNotFoundException, \
     PackageHasExistsException
 from genericparser.pub.msapi import sdc
@@ -41,10 +41,20 @@ class ServicePackage(object):
             raise PackageHasExistsException("Service CSAR(%s) already exists." % csar_id)
 
         try:
-            artifact = sdc.get_artifact(sdc.ASSETTYPE_SERVICES, csar_id)
+            service = sdc.get_asset(sdc.ASSETTYPE_SERVICES, csar_id)
+            # check if the related resources exist
+            resources = service.get('resources', None)
+            if resources:
+                for resource in resources:
+                    if not VnfPackageModel.objects.filter(vnfPackageId=resource['resourceUUID']) and \
+                            not PnfPackageModel.objects.filter(pnfPackageId=resource['resourceUUID']):
+                        logger.error("Resource [%s] is not distributed.", resource['resourceUUID'])
+                        raise GenericparserException("Resource (%s) is not distributed." % resource['resourceUUID'])
+
+            # download csar package
             local_path = os.path.join(GENERICPARSER_ROOT_PATH, csar_id)
-            csar_name = "%s.csar" % artifact.get("name", csar_id)
-            local_file_name = sdc.download_artifacts(artifact["toscaModelURL"], local_path, csar_name)
+            csar_name = "%s.csar" % service.get("name", csar_id)
+            local_file_name = sdc.download_artifacts(service["toscaModelURL"], local_path, csar_name)
             if local_file_name.endswith(".csar") or local_file_name.endswith(".zip"):
                 fileutil.unzip_file(local_file_name, local_path, "")
             data = {