X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=blobdiff_plain;f=skyquake%2Fplugins%2Flaunchpad%2Fapi%2Flaunchpad.js;h=6fb01704a1d2b5649f42238d582e6a47af168e06;hp=688d7756d9db6dbf9ff92c81dfa31d060a24a723;hb=47f1c190e7bec1588bbf094107b2641363ad36e2;hpb=f1415f5a842a1243160ba1f7c549a47cabf0d11d diff --git a/skyquake/plugins/launchpad/api/launchpad.js b/skyquake/plugins/launchpad/api/launchpad.js index 688d7756d..6fb01704a 100644 --- a/skyquake/plugins/launchpad/api/launchpad.js +++ b/skyquake/plugins/launchpad/api/launchpad.js @@ -838,7 +838,7 @@ NSR.addVnfrDataPromise = function(req, nsrs) { } } var vnfrNfviMetrics = buildNfviGraphs(vnfr.vdur, vnfrName); - if (vnfr['vnf-configuration'] && vnfr['vnf-configuration']['config-primitive'] && vnfr['vnf-configuration']['config-primitive'].length > 0) { + if (vnfr['vnf-configuration'] && vnfr['vnf-configuration']['service-primitive'] && vnfr['vnf-configuration']['service-primitive'].length > 0) { vnfrObj['service-primitives-present'] = true; } else { vnfrObj['service-primitives-present'] = false; @@ -1276,7 +1276,7 @@ VNFR.get = function(req) { returnData.forEach(function(vnfr) { vnfr['nfvi-metrics'] = buildNfviGraphs(vnfr.vdur); vnfr['epa-params'] = epa_aggregator(vnfr.vdur); - vnfr['service-primitives-present'] = (vnfr['vnf-configuration'] && vnfr['vnf-configuration']['config-primitive'] && vnfr['vnf-configuration']['config-primitive'].length > 0) ? true : false; + vnfr['service-primitives-present'] = (vnfr['vnf-configuration'] && vnfr['vnf-configuration']['service-primitive'] && vnfr['vnf-configuration']['service-primitive'].length > 0) ? true : false; vnfr['vdur'] && vnfr['vdur'].map(function(vdur, vdurIndex) { // This console-url is what front-end will hit to generate a real console-url vdur['console-url'] = 'api/vnfr/' + vnfr.id + '/vdur/' + vdur.id + '/console-url';