Merge branch 'master' of https://osm.etsi.org/gerrit/osm/UI

Signed-off-by: Laurence Maultsby <laurence.maultsby@riftio.com>

diff --combined skyquake/plugins/launchpad/api/launchpad.js
index 6fb0170,6fb0170..d74bb3e
--- 1/skyquake/plugins/launchpad/api/launchpad.js
--- 2/skyquake/plugins/launchpad/api/launchpad.js
+++ b/skyquake/plugins/launchpad/api/launchpad.js
@@@ -790,8 -790,8 +790,14 @@@ NSR.addVnfrDataPromise = function(req, 
                  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) {