From: Fu Jinhua <fu.jinhua@zte.com.cn>
Date: Wed, 29 Aug 2018 07:28:16 +0000 (+0000)
Subject: Merge "Deal with ns descriptor"
X-Git-Tag: 1.2.0~37
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8b34c4e58f372a4554a6b45623f0b9008f452b09;p=vfc%2Fnfvo%2Fcatalog.git

Merge "Deal with ns descriptor"
---

8b34c4e58f372a4554a6b45623f0b9008f452b09
diff --cc catalog/packages/biz/ns_descriptor.py
index d5fb985f,2d0b511b..278c071b
--- a/catalog/packages/biz/ns_descriptor.py
+++ b/catalog/packages/biz/ns_descriptor.py
@@@ -73,12 -70,9 +70,9 @@@ def delete_single(nsd_info_id)
      logger.info('Start to delete NSD(%s)...' % nsd_info_id)
      ns_pkgs = NSPackageModel.objects.filter(nsPackageId=nsd_info_id)
      if not ns_pkgs.exists():
 -        logger.info('NSD(%s) is deleted.' % nsd_info_id)
 +        logger.info('NSD(%s) has been deleted.' % nsd_info_id)
          return
- 
-     if ns_pkgs[0].onboardingState == 'ONBOARDED':
-         logger.error('NSD(%s) shall be non-ONBOARDED.' % nsd_info_id)
-         raise CatalogException('NSD(%s) shall be non-ONBOARDED.' % nsd_info_id)
+     '''
      if ns_pkgs[0].operationalState != 'DISABLED':
          logger.error('NSD(%s) shall be DISABLED.' % nsd_info_id)
          raise CatalogException('NSD(%s) shall be DISABLED.' % nsd_info_id)