projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert bad merge change
[osm/UI.git]
/
skyquake
/
plugins
/
launchpad
/
api
/
launchpad.js
diff --git
a/skyquake/plugins/launchpad/api/launchpad.js
b/skyquake/plugins/launchpad/api/launchpad.js
index
3972289
..
509ff77
100644
(file)
--- 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");
* Copyright 2016 RIFT.IO Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@
-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);
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')
});
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({
'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,
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 {
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;
})
data.map(function(c) {
returnData[c.name] = c.datacenters;
})