/*
- *
+ *
* Copyright 2016 RIFT.IO Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
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']
});
});
}
}
var vnfrNfviMetrics = buildNfviGraphs(vnfr.vdur, vnfrName);
- if (vnfr['vnf-configuration'] && vnfr['vnf-configuration']['service-primitive'] && vnfr['vnf-configuration']['service-primitive'].length > 0) {
+ if (vnfr['vnf-configuration'] && vnfr['vnf-configuration']['config-primitive'] && vnfr['vnf-configuration']['config-primitive'].length > 0) {
vnfrObj['service-primitives-present'] = true;
} else {
vnfrObj['service-primitives-present'] = false;
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']['service-primitive'] && vnfr['vnf-configuration']['service-primitive'].length > 0) ? true : false;
+ vnfr['service-primitives-present'] = (vnfr['vnf-configuration'] && vnfr['vnf-configuration']['config-primitive'] && vnfr['vnf-configuration']['config-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';
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;
})