From 525c141158ec2b9598806f0ae13752895d476681 Mon Sep 17 00:00:00 2001 From: hewei-cmss Date: Tue, 15 Oct 2019 13:51:55 +0800 Subject: [PATCH] add judge package state Issue-ID: VFC-1504 Signed-off-by: hewei-cmss Change-Id: Ibd892c036ea5a4c0a7ee7a9ee7449ccc18bffadc --- catalog/packages/biz/ns_descriptor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) -- 2.16.6