From: hewei-cmss <hewei@cmss.chinamobile.com>
Date: Tue, 15 Oct 2019 05:51:55 +0000 (+0800)
Subject: add judge package state
X-Git-Tag: 1.3.7~24
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=525c141158ec2b9598806f0ae13752895d476681;p=vfc%2Fnfvo%2Fcatalog.git

add judge package state

Issue-ID: VFC-1504

Signed-off-by: hewei-cmss <hewei@cmss.chinamobile.com>
Change-Id: Ibd892c036ea5a4c0a7ee7a9ee7449ccc18bffadc
---

diff --git a/catalog/packages/biz/ns_descriptor.py b/catalog/packages/biz/ns_descriptor.py
index bb6da1ea..18f6b88d 100644
--- a/catalog/packages/biz/ns_descriptor.py
+++ b/catalog/packages/biz/ns_descriptor.py
@@ -89,10 +89,10 @@ class NsDescriptor(object):
         if ns_pkgs[0].operationalState != PKG_STATUS.DISABLED:
             logger.error('NSD(%s) shall be DISABLED.' % nsd_info_id)
             raise CatalogException('NSD(%s) shall be DISABLED.' % nsd_info_id)
-        if ns_pkgs[0].usageState != PKG_STATUS.NOT_IN_USE:
+        '''
+        if ns_pkgs[0].usageState == PKG_STATUS.IN_USE:
             logger.error('NSD(%s) shall be NOT_IN_USE.' % nsd_info_id)
             raise CatalogException('NSD(%s) shall be NOT_IN_USE.' % nsd_info_id)
-        '''
         ns_pkgs.delete()
         ns_pkg_path = os.path.join(CATALOG_ROOT_PATH, nsd_info_id)
         fileutil.delete_dirs(ns_pkg_path)