projects
/
osm
/
NBI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug 1479 to check conflicts on deleting vnpkg
[osm/NBI.git]
/
osm_nbi
/
descriptor_topics.py
diff --git
a/osm_nbi/descriptor_topics.py
b/osm_nbi/descriptor_topics.py
index
d6b2884
..
df218cc
100644
(file)
--- a/
osm_nbi/descriptor_topics.py
+++ b/
osm_nbi/descriptor_topics.py
@@
-539,13
+539,14
@@
class VnfdTopic(DescriptorTopic):
# check vnfrs using this vnfd
_filter["vnfd-id"] = _id
if self.db.get_list("vnfrs", _filter):
# check vnfrs using this vnfd
_filter["vnfd-id"] = _id
if self.db.get_list("vnfrs", _filter):
- raise EngineException("There is at least one VNF using this descriptor", http_code=HTTPStatus.CONFLICT)
+ raise EngineException("There is at least one VNF instance using this descriptor",
+ http_code=HTTPStatus.CONFLICT)
# check NSD referencing this VNFD
del _filter["vnfd-id"]
# check NSD referencing this VNFD
del _filter["vnfd-id"]
- _filter["
constituent-vnfd.ANYINDEX.vnfd-id-ref
"] = descriptor_id
+ _filter["
vnfd-id
"] = descriptor_id
if self.db.get_list("nsds", _filter):
if self.db.get_list("nsds", _filter):
- raise EngineException("There is at least one NS
D
referencing this descriptor",
+ raise EngineException("There is at least one NS
package
referencing this descriptor",
http_code=HTTPStatus.CONFLICT)
def _validate_input_new(self, indata, storage_params, force=False):
http_code=HTTPStatus.CONFLICT)
def _validate_input_new(self, indata, storage_params, force=False):
@@
-1019,7
+1020,8
@@
class NsdTopic(DescriptorTopic):
_filter = self._get_project_filter(session)
_filter["nsd-id"] = _id
if self.db.get_list("nsrs", _filter):
_filter = self._get_project_filter(session)
_filter["nsd-id"] = _id
if self.db.get_list("nsrs", _filter):
- raise EngineException("There is at least one NS using this descriptor", http_code=HTTPStatus.CONFLICT)
+ raise EngineException("There is at least one NS instance using this descriptor",
+ http_code=HTTPStatus.CONFLICT)
# check NSD referenced by NST
del _filter["nsd-id"]
# check NSD referenced by NST
del _filter["nsd-id"]
@@
-1170,7
+1172,7
@@
class PduTopic(BaseTopic):
_filter = self._get_project_filter(session)
_filter["vdur.pdu-id"] = _id
if self.db.get_list("vnfrs", _filter):
_filter = self._get_project_filter(session)
_filter["vdur.pdu-id"] = _id
if self.db.get_list("vnfrs", _filter):
- raise EngineException("There is at least one VNF using this PDU", http_code=HTTPStatus.CONFLICT)
+ raise EngineException("There is at least one VNF
instance
using this PDU", http_code=HTTPStatus.CONFLICT)
class VnfPkgOpTopic(BaseTopic):
class VnfPkgOpTopic(BaseTopic):