/*
- *
+ *
* Copyright 2016 RIFT.IO Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
response[0].descriptors = JSON.parse(result[0].body).collection['nsd:nsd'];
if (result[2].body) {
var data = JSON.parse(result[2].body);
- if (data && data["nsr:ns-instance-opdata"] && data["nsr:ns-instance-opdata"]["rw-nsr:nsd-ref-count"]) {
- var nsdRefCountCollection = data["nsr:ns-instance-opdata"]["rw-nsr:nsd-ref-count"];
+ if (data && data["nsr:ns-instance-opdata"]) {
response[0].descriptors.map(function(nsd) {
if (!nsd["meta"]) {
nsd["meta"] = {};
if (typeof nsd['meta'] == 'string') {
nsd['meta'] = JSON.parse(nsd['meta']);
}
- nsd["meta"]["instance-ref-count"] = _.findWhere(nsdRefCountCollection, {
- "nsd-id-ref": nsd.id
- })["instance-ref-count"];
nsd["constituent-vnfd"] && nsd["constituent-vnfd"].map(function(v) {
v.name = vnfdDict[v["vnfd-id-ref"]];
})
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) {
vdur['console-url'] = 'api/vnfr/' + vnfr.id + '/vdur/' + vdur.id + '/console-url';
nsr['console-urls'].push({
id: vdur.id,
- name: vdur.name,
+ name: vnfr.name,
'console-url': vdur['console-url']
});
});
CloudAccount.get = function(req) {
var api_server = req.query["api_server"];
var uri = utils.confdPort(api_server);
- uri += APIVersion + '/api/config/cloud/account?deep';
+ uri += APIVersion + '/api/operational/cloud/account?deep';
var headers = _.extend({}, constants.HTTP_HEADERS.accept.collection, {
'Authorization': req.get('Authorization')
});
'Authorization': req.get('Authorization')
});
request({
- url: utils.confdPort(api_server) + APIVersion + '/api/operational/datacenters/cloud-accounts?deep',
+ url: utils.confdPort(api_server) + APIVersion + '/api/operational/datacenters?deep',
method: 'GET',
headers: requestHeaders,
forever: constants.FOREVER_ON,
if (utils.validateResponse('DataCenters.get', error, response, body, resolve, reject)) {
var returnData = {};
try {
- data = JSON.parse(response.body)['rw-launchpad:cloud-accounts'];
+ data = JSON.parse(response.body)["rw-launchpad:datacenters"]["ro-accounts"];
data.map(function(c) {
returnData[c.name] = c.datacenters;
})