diff options
| author |   fujinhua <fu.jinhua@zte.com.cn> | 2018-11-13 19:37:57 +0800 |
|---|---|---|
| committer | fujinhua <fu.jinhua@zte.com.cn> | 2018-11-13 19:37:57 +0800 |
| commit | b36a88c07da383d3596dda0936d3db34ae1b360c (patch) | |
| tree | 95c45634b1eefae6e724839aab9bfea0b2221503 | |
| parent | 92d9e175088e540099129f3e808e4750234ae68d (diff) | |
Fix ns upload logic3.0.1-ONAP3.0.0-ONAP1.2.1
Change-Id: I1c25c4a5273c531090bd406b8786d0c21f5703fc
Issue-ID: VFC-1163
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
| -rw-r--r-- | catalog/packages/biz/ns_descriptor.py | 4 |
1 files changed, 3 insertions, 1 deletions
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"]: |