X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=blobdiff_plain;f=skyquake%2Fplugins%2Flaunchpad%2Fapi%2Flaunchpad.js;h=d74bb3e2e5362aa8d14925d4ac48c26f1d5579e3;hp=6fb01704a1d2b5649f42238d582e6a47af168e06;hb=038ea882b9b415fc47450f101fab43c934012340;hpb=a58c278f6aa6cbeecc00ef76ee11612c7e867b7c diff --git a/skyquake/plugins/launchpad/api/launchpad.js b/skyquake/plugins/launchpad/api/launchpad.js index 6fb01704a..d74bb3e2e 100644 --- a/skyquake/plugins/launchpad/api/launchpad.js +++ b/skyquake/plugins/launchpad/api/launchpad.js @@ -790,8 +790,14 @@ NSR.addVnfrDataPromise = function(req, nsrs) { try { if (nsr["monitoring-param"]) { nsr["monitoring-param"].map(function(m) { - var vnfr = vnfrs[m["vnfr-id"]] || {}; + // var vnfr = vnfrs[m["vnfr-id"]] || {}; + // m["vnfr-name"] = vnfr['name'] ? vnfr['name'] : (vnfr['short-name'] ? vnfr['short-name'] : 'VNFR'); + var groupTag = m['group-tag']; + var vnfrId = m['vnfr-mon-param-ref'] && m['vnfr-mon-param-ref'][0] && m['vnfr-mon-param-ref'][0]['vnfr-id-ref']; + var vnfr = vnfrs[vnfrId] || {}; m["vnfr-name"] = vnfr['name'] ? vnfr['name'] : (vnfr['short-name'] ? vnfr['short-name'] : 'VNFR'); + m['group-tag'] = (groupTag ? (groupTag + ' - ') : '') + m['vnfr-name'] + (vnfrId ? ' (' + vnfrId.substring(1,8) + '...)' : ''); + }); } } catch (e) {