projects
/
osm
/
NBI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 2299 - Unable to logout from GUI when NBI uses keystone as backend
[osm/NBI.git]
/
osm_nbi
/
instance_topics.py
diff --git
a/osm_nbi/instance_topics.py
b/osm_nbi/instance_topics.py
index
8488a93
..
695a8f8
100644
(file)
--- a/
osm_nbi/instance_topics.py
+++ b/
osm_nbi/instance_topics.py
@@
-562,6
+562,7
@@
class NsrTopic(BaseTopic):
"image": [],
"affinity-or-anti-affinity-group": [],
"shared-volumes": [],
"image": [],
"affinity-or-anti-affinity-group": [],
"shared-volumes": [],
+ "vnffgd": [],
}
if "revision" in nsd["_admin"]:
nsr_descriptor["revision"] = nsd["_admin"]["revision"]
}
if "revision" in nsd["_admin"]:
nsr_descriptor["revision"] = nsd["_admin"]["revision"]
@@
-641,6
+642,17
@@
class NsrTopic(BaseTopic):
)
vld["name"] = vld["id"]
nsr_descriptor["vld"] = nsr_vld
)
vld["name"] = vld["id"]
nsr_descriptor["vld"] = nsr_vld
+ if nsd.get("vnffgd"):
+ vnffgd = nsd.get("vnffgd")
+ for vnffg in vnffgd:
+ info = {}
+ for k, v in vnffg.items():
+ if k == "id":
+ info.update({k: v})
+ if k == "nfpd":
+ info.update({k: v})
+ nsr_descriptor["vnffgd"].append(info)
+
return nsr_descriptor
def _get_affinity_or_anti_affinity_group_data_from_vnfd(
return nsr_descriptor
def _get_affinity_or_anti_affinity_group_data_from_vnfd(