projects
/
osm
/
NBI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Feature 10999: Dual-Stack IP Support for VNFs in SOL003 VNFM Interface
[osm/NBI.git]
/
osm_nbi
/
instance_topics.py
diff --git
a/osm_nbi/instance_topics.py
b/osm_nbi/instance_topics.py
index
4a5293d
..
6072267
100644
(file)
--- a/
osm_nbi/instance_topics.py
+++ b/
osm_nbi/instance_topics.py
@@
-450,7
+450,8
@@
class NsrTopic(BaseTopic):
vsd.get("vdu-storage-requirements")[0].get("key") == "multiattach"
and vsd.get("vdu-storage-requirements")[0].get("value") == "True"
):
vsd.get("vdu-storage-requirements")[0].get("key") == "multiattach"
and vsd.get("vdu-storage-requirements")[0].get("value") == "True"
):
- if "shared" not in vsd["id"]:
+ # Avoid setting the volume name multiple times
+ if not match(f"shared-.*-{vnfd['id']}", vsd["id"]):
vsd["id"] = f"shared-{vsd['id']}-{vnfd['id']}"
svsd.append(vsd)
if svsd:
vsd["id"] = f"shared-{vsd['id']}-{vnfd['id']}"
svsd.append(vsd)
if svsd:
@@
-974,7
+975,7
@@
class NsrTopic(BaseTopic):
if (
cpd.get("constituent-cpd-id")
== iface_ext_cp
if (
cpd.get("constituent-cpd-id")
== iface_ext_cp
- ):
+ )
and vnf_profile.get("id") == vnf_index
:
vdu_iface["ns-vld-id"] = vlc.get(
"virtual-link-profile-id"
)
vdu_iface["ns-vld-id"] = vlc.get(
"virtual-link-profile-id"
)