From: fujinhua <fu.jinhua@zte.com.cn>
Date: Tue, 13 Nov 2018 11:37:57 +0000 (+0800)
Subject: Fix ns upload logic
X-Git-Tag: 1.2.1^0
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b36a88c07da383d3596dda0936d3db34ae1b360c;p=vfc%2Fnfvo%2Fcatalog.git

Fix ns upload logic

Change-Id: I1c25c4a5273c531090bd406b8786d0c21f5703fc
Issue-ID: VFC-1163
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
---

diff --git a/catalog/packages/biz/ns_descriptor.py b/catalog/packages/biz/ns_descriptor.py
index c0b067f1..91c1ec18 100644
--- a/catalog/packages/biz/ns_descriptor.py
+++ b/catalog/packages/biz/ns_descriptor.py
@@ -137,7 +137,9 @@ class NsDescriptor(object):
         invariant_id = nsd.get("ns", {}).get("properties", {}).get("invariant_id", "")
         if nsd_id == "":
             raise CatalogException("nsd_id(%s) does not exist in metadata." % nsd_id)
-        if NSPackageModel.objects.filter(nsdId=nsd_id):
+        other_nspkg = NSPackageModel.objects.filter(nsdId=nsd_id)
+        if other_nspkg and other_nspkg[0].nsPackageId != nsd_info_id:
+            logger.warn("NSD(%s,%s) already exists.", nsd_id, other_nspkg[0].nsPackageId)
             raise CatalogException("NSD(%s) already exists." % nsd_id)
 
         for vnf in nsd["vnfs"]: