X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog%2Fpackages%2Fbiz%2Fsdc_ns_package.py;h=4f817a3f27b0ab5dd3385d182f6376480fa2dad9;hb=fe7fa3746a2c1085527b2355b59cab3dc37229e7;hp=553abb01f46cadf281c86dbe257e9c995eabf43b;hpb=f96008008bcbefd4142611c9ecca45899c5bb7d6;p=modeling%2Fetsicatalog.git

diff --git a/catalog/packages/biz/sdc_ns_package.py b/catalog/packages/biz/sdc_ns_package.py
index 553abb0..4f817a3 100644
--- a/catalog/packages/biz/sdc_ns_package.py
+++ b/catalog/packages/biz/sdc_ns_package.py
@@ -17,14 +17,14 @@ import os
 import sys
 import traceback
 
+from catalog.packages.biz.ns_descriptor import NsDescriptor
 from catalog.pub.config.config import CATALOG_ROOT_PATH, CATALOG_URL_PATH
 from catalog.pub.config.config import REG_TO_MSB_REG_PARAM
-from catalog.pub.database.models import NSPackageModel, VnfPackageModel, PnfPackageModel
+from catalog.pub.database.models import NSPackageModel, VnfPackageModel
 from catalog.pub.exceptions import CatalogException
 from catalog.pub.msapi import sdc
-from catalog.pub.utils import toscaparser
-from catalog.packages.biz.ns_descriptor import NsDescriptor
 from catalog.pub.utils import fileutil
+from catalog.pub.utils import toscaparser
 
 logger = logging.getLogger(__name__)
 
@@ -38,6 +38,11 @@ def fmt_ns_pkg_rsp(status, desc, error_code="500"):
 
 
 def ns_on_distribute(csar_id):
+    """
+    Get NS pckage from SDC
+    :param csar_id:
+    :return:
+    """
     ret = None
     try:
         ret = NsPackage().on_distribute(csar_id)
@@ -54,6 +59,11 @@ def ns_on_distribute(csar_id):
 
 
 def ns_delete_csar(csar_id):
+    """
+    Delete NS package
+    :param csar_id:
+    :return:
+    """
     ret = None
     try:
         ret = NsPackage().delete_csar(csar_id)
@@ -66,6 +76,10 @@ def ns_delete_csar(csar_id):
 
 
 def ns_get_csars():
+    """
+    Get NS packages
+    :return:
+    """
     ret = None
     try:
         ret = NsPackage().get_csars()
@@ -78,6 +92,11 @@ def ns_get_csars():
 
 
 def ns_get_csar(csar_id):
+    """
+    Get NS package by id
+    :param csar_id:
+    :return:
+    """
     ret = None
     try:
         ret = NsPackage().get_csar(csar_id)
@@ -91,6 +110,12 @@ def ns_get_csar(csar_id):
 
 
 def parse_nsd(csar_id, inputs):
+    """
+    Parse NSD
+    :param csar_id:
+    :param inputs:
+    :return:
+    """
     ret = None
     try:
         ns_pkg = NSPackageModel.objects.filter(nsPackageId=csar_id)
@@ -124,10 +149,14 @@ class NsPackage(object):
         resources = ns.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 CatalogException("Resource (%s) is not distributed." % resource['resourceUUID'])
+                if resource['resoucreType'].upper == 'VF' and not VnfPackageModel.objects.filter(
+                        vnfPackageId=resource['resourceUUID']):
+                    logger.error("VF [%s] is not distributed.", resource['resourceUUID'])
+                    raise CatalogException("VF (%s) is not distributed." % resource['resourceUUID'])
+                # if resource['resoucreType'] == 'PNF' and not PnfPackageModel.objects.filter(
+                #         pnfPackageId=resource['resourceUUID']):
+                #     logger.error("PNF [%s] is not distributed.", resource['resourceUUID'])
+                #     raise CatalogException("PNF (%s) is not distributed." % resource['resourceUUID'])
 
         # download csar package
         local_path = os.path.join(CATALOG_ROOT_PATH, csar_id)
@@ -147,11 +176,20 @@ class NsPackage(object):
         return [0, "CSAR(%s) distributed successfully." % csar_id]
 
     def delete_csar(self, csar_id):
+        """
+        Delete NS package by id
+        :param csar_id:
+        :return:
+        """
         nsd = NsDescriptor()
         nsd.delete_single(csar_id)
         return [0, "Delete CSAR(%s) successfully." % csar_id]
 
     def get_csars(self):
+        """
+        Get ns packages
+        :return:
+        """
         csars = []
         nss = NSPackageModel.objects.filter()
         for ns in nss:
@@ -160,6 +198,11 @@ class NsPackage(object):
         return [0, csars]
 
     def get_csar(self, csar_id):
+        """
+        Get NS package by id
+        :param csar_id:
+        :return:
+        """
         package_info = {}
         csars = NSPackageModel.objects.filter(nsPackageId=csar_id)
         if csars: