projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "User profile first pass" into projects
[osm/UI.git]
/
skyquake
/
plugins
/
composer
/
api
/
composer.js
diff --git
a/skyquake/plugins/composer/api/composer.js
b/skyquake/plugins/composer/api/composer.js
index
d83311f
..
f98020c
100644
(file)
--- a/
skyquake/plugins/composer/api/composer.js
+++ b/
skyquake/plugins/composer/api/composer.js
@@
-34,33
+34,34
@@
var DataCenters = {};
Composer.get = function(req) {
var api_server = req.query['api_server'];
var results = {}
Composer.get = function(req) {
var api_server = req.query['api_server'];
var results = {}
+ var projectPrefix = req.session.projectId ? "project-" : "";
return new Promise(function(resolve, reject) {
Promise.all([
rp({
return new Promise(function(resolve, reject) {
Promise.all([
rp({
- uri: utils.
confdPort(api_server) + APIVersion + '/api/config/nsd-catalog/nsd?deep'
,
+ uri: utils.
projectContextUrl(req, utils.confdPort(api_server) + APIVersion + '/api/config/nsd-catalog/nsd?deep')
,
method: 'GET',
headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, {
method: 'GET',
headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, {
- 'Authorization': req.
get('Authorization')
+ 'Authorization': req.
session && req.session.authorization
}),
forever: constants.FOREVER_ON,
rejectUnauthorized: false,
resolveWithFullResponse: true
}),
rp({
}),
forever: constants.FOREVER_ON,
rejectUnauthorized: false,
resolveWithFullResponse: true
}),
rp({
- uri: utils.
confdPort(api_server) + APIVersion + '/api/config/vnfd-catalog/vnfd?deep'
,
+ uri: utils.
projectContextUrl(req, utils.confdPort(api_server) + APIVersion + '/api/config/vnfd-catalog/vnfd?deep')
,
method: 'GET',
headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, {
method: 'GET',
headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, {
- 'Authorization': req.
get('Authorization')
+ 'Authorization': req.
session && req.session.authorization
}),
forever: constants.FOREVER_ON,
rejectUnauthorized: false,
resolveWithFullResponse: true
}),
rp({
}),
forever: constants.FOREVER_ON,
rejectUnauthorized: false,
resolveWithFullResponse: true
}),
rp({
- uri: utils.
confdPort(api_server) + APIVersion + '/api/operational/ns-instance-opdata?deep'
,
+ uri: utils.
projectContextUrl(req, utils.confdPort(api_server) + APIVersion + '/api/operational/ns-instance-opdata?deep')
,
method: 'GET',
headers: _.extend({}, constants.HTTP_HEADERS.accept.data, {
method: 'GET',
headers: _.extend({}, constants.HTTP_HEADERS.accept.data, {
- 'Authorization': req.
get('Authorization')
+ 'Authorization': req.
session && req.session.authorization
}),
forever: constants.FOREVER_ON,
rejectUnauthorized: false,
}),
forever: constants.FOREVER_ON,
rejectUnauthorized: false,
@@
-73,7
+74,7
@@
Composer.get = function(req) {
// headers: _.extend({},
// constants.HTTP_HEADERS.accept.collection,
// {
// headers: _.extend({},
// constants.HTTP_HEADERS.accept.collection,
// {
- // 'Authorization': req.
get('Authorization')
+ // 'Authorization': req.
session && req.session.authorization
// }),
// forever: constants.FOREVER_ON,
// rejectUnauthorized: false,
// }),
// forever: constants.FOREVER_ON,
// rejectUnauthorized: false,
@@
-121,7
+122,7
@@
Composer.get = function(req) {
"descriptors": []
}];
if (result[0].body) {
"descriptors": []
}];
if (result[0].body) {
- response[0].descriptors = JSON.parse(result[0].body).collection['nsd:nsd'];
+ response[0].descriptors = JSON.parse(result[0].body).collection[
projectPrefix +
'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"]) {
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"]) {
@@
-141,10
+142,10
@@
Composer.get = function(req) {
}
};
if (result[1].body) {
}
};
if (result[1].body) {
- response[1].descriptors = JSON.parse(result[1].body).collection['vnfd:vnfd'];
+ response[1].descriptors = JSON.parse(result[1].body).collection[
projectPrefix +
'vnfd:vnfd'];
};
// if (result[2].body) {
};
// if (result[2].body) {
- // response[2].descriptors = JSON.parse(result[2].body).collection['pnfd:pnfd'];
+ // response[2].descriptors = JSON.parse(result[2].body).collection[
projectPrefix +
'pnfd:pnfd'];
// };
resolve({
statusCode: response.statusCode || 200,
// };
resolve({
statusCode: response.statusCode || 200,
@@
-170,10
+171,10
@@
Composer.delete = function(req) {
console.log('Deleting', catalogType, id, 'from', api_server);
return new Promise(function(resolve, reject) {
request({
console.log('Deleting', catalogType, id, 'from', api_server);
return new Promise(function(resolve, reject) {
request({
- uri: utils.
confdPort(api_server) + APIVersion + '/api/config/' + catalogType + '-catalog/' + catalogType + '/' + id
,
+ uri: utils.
projectContextUrl(req, utils.confdPort(api_server) + APIVersion + '/api/config/' + catalogType + '-catalog/' + catalogType + '/' + id)
,
method: 'DELETE',
headers: _.extend({}, constants.HTTP_HEADERS.accept.data, {
method: 'DELETE',
headers: _.extend({}, constants.HTTP_HEADERS.accept.data, {
- 'Authorization': req.
get('Authorization')
+ 'Authorization': req.
session && req.session.authorization
}),
forever: constants.FOREVER_ON,
rejectUnauthorized: false,
}),
forever: constants.FOREVER_ON,
rejectUnauthorized: false,
@@
-189,7
+190,7
@@
Composer.delete = function(req) {
Composer.getVNFD = function(req) {
var api_server = req.query['api_server'];
var vnfdID = req.body.data;
Composer.getVNFD = function(req) {
var api_server = req.query['api_server'];
var vnfdID = req.body.data;
- var authorization = req.
get('Authorization')
;
+ var authorization = req.
session && req.session.authorization
;
var VNFDs = [];
if (typeof(vnfdID) == "object" && vnfdID.constructor.name == "Array") {
vnfdID.map(function(id) {
var VNFDs = [];
if (typeof(vnfdID) == "object" && vnfdID.constructor.name == "Array") {
vnfdID.map(function(id) {
@@
-218,7
+219,7
@@
Composer.getVNFD = function(req) {
return new Promise(function(resolve, reject) {
var url = utils.confdPort(api_server) + APIVersion + '/api/config/vnfd-catalog/vnfd' + (id ? '/' + id : '') + '?deep';
request({
return new Promise(function(resolve, reject) {
var url = utils.confdPort(api_server) + APIVersion + '/api/config/vnfd-catalog/vnfd' + (id ? '/' + id : '') + '?deep';
request({
- uri: u
rl
,
+ uri: u
tils.projectContextUrl(req, url)
,
method: 'GET',
headers: _.extend({}, constants.HTTP_HEADERS.accept.data, {
'Authorization': authorization
method: 'GET',
headers: _.extend({}, constants.HTTP_HEADERS.accept.data, {
'Authorization': authorization
@@
-254,10
+255,10
@@
Composer.create = function(req) {
return new Promise(function(resolve, reject) {
var requestHeaders = {};
_.extend(requestHeaders, constants.HTTP_HEADERS.accept.data, constants.HTTP_HEADERS.content_type.data, {
return new Promise(function(resolve, reject) {
var requestHeaders = {};
_.extend(requestHeaders, constants.HTTP_HEADERS.accept.data, constants.HTTP_HEADERS.content_type.data, {
- 'Authorization': req.
get('Authorization')
+ 'Authorization': req.
session && req.session.authorization
});
request({
});
request({
- uri: utils.
confdPort(api_server) + '/api/config/' + catalogType + '-catalog'
,
+ uri: utils.
projectContextUrl(req, utils.confdPort(api_server) + '/api/config/' + catalogType + '-catalog')
,
method: 'POST',
headers: requestHeaders,
forever: constants.FOREVER_ON,
method: 'POST',
headers: requestHeaders,
forever: constants.FOREVER_ON,
@@
-284,10
+285,10
@@
Composer.updateSave = function(req) {
return new Promise(function(resolve, reject) {
var requestHeaders = {};
_.extend(requestHeaders, constants.HTTP_HEADERS.accept.data, constants.HTTP_HEADERS.content_type.data, {
return new Promise(function(resolve, reject) {
var requestHeaders = {};
_.extend(requestHeaders, constants.HTTP_HEADERS.accept.data, constants.HTTP_HEADERS.content_type.data, {
- 'Authorization': req.
get('Authorization')
+ 'Authorization': req.
session && req.session.authorization
});
request({
});
request({
- uri: utils.
confdPort(api_server) + APIVersion + '/api/config/' + catalogType + '-catalog' + '/' + catalogType + '/' + id
,
+ uri: utils.
projectContextUrl(req, utils.confdPort(api_server) + APIVersion + '/api/config/' + catalogType + '-catalog' + '/' + catalogType + '/' + id)
,
method: 'PUT',
headers: requestHeaders,
forever: constants.FOREVER_ON,
method: 'PUT',
headers: requestHeaders,
forever: constants.FOREVER_ON,
@@
-312,7
+313,7
@@
Composer.update = function(req) {
var download_host = req.query['dev_download_server'];
if (!download_host) {
var download_host = req.query['dev_download_server'];
if (!download_host) {
- download_host = api_server + ':' + utils.getPortForProtocol(req.protocol);
+ download_host =
req.protocol + '://' + req.get('host');//
api_server + ':' + utils.getPortForProtocol(req.protocol);
}
var input = {
'external-url': download_host + '/composer/update/' + req.file.filename,
}
var input = {
'external-url': download_host + '/composer/update/' + req.file.filename,
@@
-322,10
+323,10
@@
Composer.update = function(req) {
return new Promise(function(resolve, reject) {
Promise.all([
rp({
return new Promise(function(resolve, reject) {
Promise.all([
rp({
- uri: utils.
confdPort(api_server) + '/api/operations/package-update'
,
+ uri: utils.
projectContextUrl(req, utils.confdPort(api_server) + '/api/operations/package-update')
,
method: 'POST',
headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, {
method: 'POST',
headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, {
- 'Authorization': req.
get('Authorization')
+ 'Authorization': req.
session && req.session.authorization
}),
forever: constants.FOREVER_ON,
rejectUnauthorized: false,
}),
forever: constants.FOREVER_ON,
rejectUnauthorized: false,
@@
-368,16
+369,16
@@
Composer.upload = function(req) {
var download_host = req.query['dev_download_server'];
if (!download_host) {
var download_host = req.query['dev_download_server'];
if (!download_host) {
- download_host = api_server + ':' + utils.getPortForProtocol(req.protocol);
+ download_host =
req.protocol + '://' + req.get('host');//req.
api_server + ':' + utils.getPortForProtocol(req.protocol);
}
return new Promise(function(resolve, reject) {
Promise.all([
rp({
}
return new Promise(function(resolve, reject) {
Promise.all([
rp({
- uri: utils.
confdPort(api_server) + '/api/operations/package-create'
,
+ uri: utils.
projectContextUrl(req, utils.confdPort(api_server) + '/api/operations/package-create')
,
method: 'POST',
headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, {
method: 'POST',
headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, {
- 'Authorization': req.
get('Authorization')
+ 'Authorization': req.
session && req.session.authorization
}),
forever: constants.FOREVER_ON,
rejectUnauthorized: false,
}),
forever: constants.FOREVER_ON,
rejectUnauthorized: false,
@@
-425,7
+426,7
@@
Composer.addFile = function(req) {
var package_type = req.query['package_type'].toUpperCase();
var package_path = req.query['package_path'];
if (!download_host) {
var package_type = req.query['package_type'].toUpperCase();
var package_path = req.query['package_path'];
if (!download_host) {
- download_host = api_server + ':' + utils.getPortForProtocol(req.protocol);
+ download_host =
req.protocol + '://' + req.get('host');//
api_server + ':' + utils.getPortForProtocol(req.protocol);
}
var input = {
'external-url': download_host + '/composer/upload/' + req.query['package_id'] + '/' + req.file.filename,
}
var input = {
'external-url': download_host + '/composer/upload/' + req.query['package_id'] + '/' + req.file.filename,
@@
-436,10
+437,10
@@
Composer.addFile = function(req) {
return new Promise(function(resolve, reject) {
Promise.all([
rp({
return new Promise(function(resolve, reject) {
Promise.all([
rp({
- uri: utils.
confdPort(api_server) + '/api/operations/package-file-add'
,
+ uri: utils.
projectContextUrl(req, utils.confdPort(api_server) + '/api/operations/package-file-add')
,
method: 'POST',
headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, {
method: 'POST',
headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, {
- 'Authorization': req.
get('Authorization')
+ 'Authorization': req.
session && req.session.authorization
}),
forever: constants.FOREVER_ON,
rejectUnauthorized: false,
}),
forever: constants.FOREVER_ON,
rejectUnauthorized: false,
@@
-474,10
+475,10
@@
Composer.exportPackage = function(req) {
return new Promise(function(resolve, reject) {
Promise.all([
rp({
return new Promise(function(resolve, reject) {
Promise.all([
rp({
- uri: utils.
confdPort(api_server) + '/api/operations/package-export'
,
+ uri: utils.
projectContextUrl(req, utils.confdPort(api_server) + '/api/operations/package-export')
,
method: 'POST',
headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, {
method: 'POST',
headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, {
- 'Authorization': req.
get('Authorization')
+ 'Authorization': req.
session && req.session.authorization
}),
forever: constants.FOREVER_ON,
rejectUnauthorized: false,
}),
forever: constants.FOREVER_ON,
rejectUnauthorized: false,
@@
-532,10
+533,10
@@
FileManager.get = function(req) {
function deleteFile(payload) {
return new Promise(function(resolve, reject) {
rp({
function deleteFile(payload) {
return new Promise(function(resolve, reject) {
rp({
- uri: utils.
confdPort(api_server) + '/api/operations/rw-pkg-mgmt:package-file-delete'
,
+ uri: utils.
projectContextUrl(req, utils.confdPort(api_server) + '/api/operations/rw-pkg-mgmt:package-file-delete')
,
method: 'POST',
headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, {
method: 'POST',
headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, {
- 'Authorization': req.
get('Authorization')
+ 'Authorization': req.
session && req.session.authorization
}),
json: payload,
forever: constants.FOREVER_ON,
}),
json: payload,
forever: constants.FOREVER_ON,
@@
-554,10
+555,10
@@
FileManager.get = function(req) {
function download(payload) {
return new Promise(function(resolve, reject) {
rp({
function download(payload) {
return new Promise(function(resolve, reject) {
rp({
- uri: utils.
confdPort(api_server) + '/api/operations/rw-pkg-mgmt:package-file-add'
,
+ uri: utils.
projectContextUrl(req, utils.confdPort(api_server) + '/api/operations/rw-pkg-mgmt:package-file-add')
,
method: 'POST',
headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, {
method: 'POST',
headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, {
- 'Authorization': req.
get('Authorization')
+ 'Authorization': req.
session && req.session.authorization
}),
json: payload,
forever: constants.FOREVER_ON,
}),
json: payload,
forever: constants.FOREVER_ON,
@@
-576,10
+577,10
@@
FileManager.get = function(req) {
function list(payload) {
return new Promise(function(resolve, reject) {
rp({
function list(payload) {
return new Promise(function(resolve, reject) {
rp({
- uri: utils.
confdPort(api_server) + '/api/operations/get-package-endpoint'
,
+ uri: utils.
projectContextUrl(req, utils.confdPort(api_server) + '/api/operations/get-package-endpoint')
,
method: 'POST',
headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, {
method: 'POST',
headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, {
- 'Authorization': req.
get('Authorization')
+ 'Authorization': req.
session && req.session.authorization
}),
json: payload,
forever: constants.FOREVER_ON,
}),
json: payload,
forever: constants.FOREVER_ON,
@@
-597,10
+598,10
@@
FileManager.get = function(req) {
}
parsedEndpoint = URL.parse(endpoint);
rp({
}
parsedEndpoint = URL.parse(endpoint);
rp({
- uri:
api_server + ':' + parsedEndpoint.port + parsedEndpoint.path
,
+ uri:
utils.projectContextUrl(req, api_server + ':' + parsedEndpoint.port + parsedEndpoint.path)
,
method: 'GET',
headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, {
method: 'GET',
headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, {
- 'Authorization': req.
get('Authorization')
+ 'Authorization': req.
session && req.session.authorization
}),
forever: constants.FOREVER_ON,
rejectUnauthorized: false,
}),
forever: constants.FOREVER_ON,
rejectUnauthorized: false,
@@
-628,10
+629,10
@@
FileManager.job = function(req) {
var id = req.params['id'];
return new Promise(function(resolve, reject) {
request({
var id = req.params['id'];
return new Promise(function(resolve, reject) {
request({
- url: u
ri + url + '?deep'
,
+ url: u
tils.projectContextUrl(req, uri + url + '?deep')
,
method: 'GET',
headers: _.extend({}, constants.HTTP_HEADERS.accept.data, {
method: 'GET',
headers: _.extend({}, constants.HTTP_HEADERS.accept.data, {
- 'Authorization': req.
get('Authorization')
+ 'Authorization': req.
session && req.session.authorization
}),
forever: constants.FOREVER_ON,
rejectUnauthorized: false,
}),
forever: constants.FOREVER_ON,
rejectUnauthorized: false,