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=397228942ae23c24f6ad37ed6114aadde666ffe3;hb=a58c278f6aa6cbeecc00ef76ee11612c7e867b7c;hpb=5887e136dc63a909acba0e529dacf383df9061d7 diff --git a/skyquake/plugins/launchpad/api/launchpad.js b/skyquake/plugins/launchpad/api/launchpad.js index 397228942..6fb01704a 100644 --- a/skyquake/plugins/launchpad/api/launchpad.js +++ b/skyquake/plugins/launchpad/api/launchpad.js @@ -1,5 +1,5 @@ /* - * + * * Copyright 2016 RIFT.IO Inc * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -813,7 +813,7 @@ NSR.addVnfrDataPromise = function(req, nsrs) { 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'] }); }); @@ -1664,7 +1664,7 @@ VDUR.consoleUrl.get = function(req) { 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') }); @@ -1906,7 +1906,7 @@ DataCenters.get = function(req) { '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, @@ -1915,7 +1915,7 @@ DataCenters.get = function(req) { 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; })