Merge "Deal with ns descriptor"

diff --cc catalog/packages/biz/ns_descriptor.py
index d5fb985,2d0b511..278c071
--- 1/catalog/packages/biz/ns_descriptor.py
--- 2/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)

diff --cc catalog/packages/views/ns_descriptor_views.py
Simple merge