X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=skyquake%2Fplugins%2Fcomposer%2Fapi%2Fcomposer.js;h=b9d35ad541d56f20079cb149f2985538c3c9d380;hb=c939d026fe2116d17370970e9359e93a440a5a5f;hp=447e1d923f22b5de81fab24e97f20c7203a059d3;hpb=168f7b61f09549d4bf25ecd0805435b2cc3a5243;p=osm%2FUI.git diff --git a/skyquake/plugins/composer/api/composer.js b/skyquake/plugins/composer/api/composer.js index 447e1d923..b9d35ad54 100644 --- a/skyquake/plugins/composer/api/composer.js +++ b/skyquake/plugins/composer/api/composer.js @@ -29,11 +29,13 @@ var PackageFileHandler = require('./packageFileHandler.js'); var Composer = {}; var FileManager = {}; +var PackageManager = {}; var DataCenters = {}; // Catalog module methods 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({ @@ -121,7 +123,7 @@ Composer.get = function(req) { "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"]) { @@ -141,10 +143,10 @@ Composer.get = function(req) { } }; 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) { - // 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, @@ -303,8 +305,8 @@ Composer.updateSave = function(req) { }); } -Composer.update = function(req) { - console.log(' Updating file', req.file.originalname, 'as', req.file.filename); +PackageManager.upload = function(req) { + console.log(' Uploading file', req.file.originalname, 'as', req.file.filename); var api_server = req.query['api_server']; // dev_download_server is for testing purposes. // It is the direct IP address of the Node server where the @@ -312,17 +314,23 @@ Composer.update = function(req) { var download_host = req.query['dev_download_server']; if (!download_host) { - download_host = req.protocol + '://' + req.get('host');//api_server + ':' + utils.getPortForProtocol(req.protocol); + download_host = req.protocol + '://' + req.get('host');//req.api_server + ':' + utils.getPortForProtocol(req.protocol); } + var input = { - 'external-url': download_host + '/composer/update/' + req.file.filename, + 'external-url': download_host + '/composer/upload/' + req.file.filename, 'package-type': 'VNFD', 'package-id': uuid() } + + var uri = utils.projectContextUrl(req, utils.confdPort(api_server) + '/api/operations/package-create'); + + input = utils.addProjectContextToRPCPayload(req, uri, input); + return new Promise(function(resolve, reject) { Promise.all([ rp({ - uri: utils.projectContextUrl(req, utils.confdPort(api_server) + '/api/operations/package-update'), + uri: uri, method: 'POST', headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, { 'Authorization': req.session && req.session.authorization @@ -340,7 +348,7 @@ Composer.update = function(req) { data['transaction_id'] = result[0].body['output']['transaction-id']; // Add a status checker on the transaction and then to delete the file later - PackageFileHandler.checkCreatePackageStatusAndHandleFile(req, data['transaction_id'], true); + PackageFileHandler.checkCreatePackageStatusAndHandleFile(req, data['transaction_id'], false); // Return status to composer UI to update the status. resolve({ @@ -349,7 +357,7 @@ Composer.update = function(req) { }); }).catch(function(error) { var res = {}; - console.log('Problem with Composer.upload', error); + console.log('Problem with PackageManager.upload', error); res.statusCode = error.statusCode || 500; res.errorMessage = { error: 'Failed to upload package ' + req.file.originalname + '. Error: ' + error @@ -359,8 +367,8 @@ Composer.update = function(req) { }); }; -Composer.upload = function(req) { - console.log(' Uploading file', req.file.originalname, 'as', req.file.filename); +PackageManager.update = function(req) { + console.log(' Updating file', req.file.originalname, 'as', req.file.filename); var api_server = req.query['api_server']; // dev_download_server is for testing purposes. // It is the direct IP address of the Node server where the @@ -368,13 +376,22 @@ Composer.upload = function(req) { var download_host = req.query['dev_download_server']; if (!download_host) { - download_host = req.protocol + '://' + req.get('host');//req.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, + 'package-type': 'VNFD', + 'package-id': uuid() + }; + + var uri = utils.projectContextUrl(req, utils.confdPort(api_server) + '/api/operations/package-update'); + + input = utils.addProjectContextToRPCPayload(req, uri, input); return new Promise(function(resolve, reject) { Promise.all([ rp({ - uri: utils.projectContextUrl(req, utils.confdPort(api_server) + '/api/operations/package-create'), + uri: uri, method: 'POST', headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, { 'Authorization': req.session && req.session.authorization @@ -384,11 +401,7 @@ Composer.upload = function(req) { resolveWithFullResponse: true, json: true, body: { - input: { - 'external-url': download_host + '/composer/upload/' + req.file.filename, - 'package-type': 'VNFD', - 'package-id': uuid() - } + input: input } }) ]).then(function(result) { @@ -396,7 +409,7 @@ Composer.upload = function(req) { data['transaction_id'] = result[0].body['output']['transaction-id']; // Add a status checker on the transaction and then to delete the file later - PackageFileHandler.checkCreatePackageStatusAndHandleFile(req, data['transaction_id']); + PackageFileHandler.checkCreatePackageStatusAndHandleFile(req, data['transaction_id'], true); // Return status to composer UI to update the status. resolve({ @@ -415,28 +428,16 @@ Composer.upload = function(req) { }); }; - - -Composer.addFile = function(req) { - console.log(' Uploading file', req.file.originalname, 'as', req.file.filename); +PackageManager.export = function(req) { + // /api/operations/package-export var api_server = req.query['api_server']; - var download_host = req.query['dev_download_server']; - var package_id = req.query['package_id']; - var package_type = req.query['package_type'].toUpperCase(); - var package_path = req.query['package_path']; - if (!download_host) { - 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, - 'package-type': package_type, - 'package-id': package_id, - 'package-path': package_path + '/' + req.file.filename - } + var uri = utils.projectContextUrl(req, utils.confdPort(api_server) + '/api/operations/package-export'); + var input = req.body; + input = utils.addProjectContextToRPCPayload(req, uri, input); return new Promise(function(resolve, reject) { Promise.all([ rp({ - uri: utils.projectContextUrl(req, utils.confdPort(api_server) + '/api/operations/package-file-add'), + uri: utils.confdPort(api_server) + '/api/operations/package-export', method: 'POST', headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, { 'Authorization': req.session && req.session.authorization @@ -445,36 +446,37 @@ Composer.addFile = function(req) { rejectUnauthorized: false, resolveWithFullResponse: true, json: true, - body: { - input: input - } + body: { "input": input } }) ]).then(function(result) { var data = {}; - data['transaction_id'] = result[0].body['output']['task-id']; resolve({ statusCode: constants.HTTP_RESPONSE_CODES.SUCCESS.OK, - data: data + data: result[0].body }); }).catch(function(error) { var res = {}; - console.log('Problem with Composer.upload', error); + console.log('Problem with PackageManager.export', error); res.statusCode = error.statusCode || 500; res.errorMessage = { - error: 'Failed to upload package ' + req.file.originalname + '. Error: ' + error + error: error }; reject(res); }); }); } -Composer.exportPackage = function(req) { - // /api/operations/package-export +PackageManager.copy = function(req) { + // /api/operations/package-copy var api_server = req.query['api_server']; + var uri = utils.projectContextUrl(req, utils.confdPort(api_server) + '/api/operations/package-copy'); + var input = req.body; + input = utils.addProjectContextToRPCPayload(req, uri, input); + return new Promise(function(resolve, reject) { Promise.all([ rp({ - uri: utils.projectContextUrl(req, utils.confdPort(api_server) + '/api/operations/package-export'), + uri: uri, method: 'POST', headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, { 'Authorization': req.session && req.session.authorization @@ -483,7 +485,7 @@ Composer.exportPackage = function(req) { rejectUnauthorized: false, resolveWithFullResponse: true, json: true, - body: { "input": req.body} + body: { "input": input} }) ]).then(function(result) { var data = {}; @@ -493,7 +495,7 @@ Composer.exportPackage = function(req) { }); }).catch(function(error) { var res = {}; - console.log('Problem with Composer.exportPackage', error); + console.log('Problem with PackageManager.copy', error); res.statusCode = error.statusCode || 500; res.errorMessage = { error: error @@ -503,6 +505,100 @@ Composer.exportPackage = function(req) { }); } +/** + * This methods retrieves the status of package operations. It takes an optional + * transaction id (id) this if present will return only that status otherwise + * an array of status' will be response. + */ +PackageManager.getJobStatus = function(req) { + var api_server = req.query["api_server"]; + var uri = utils.confdPort(api_server); + var id = req.params['id']; + var url = utils.projectContextUrl(req, uri + '/api/operational/copy-jobs' + (id ? '/job/' + id : '')); + return new Promise(function(resolve, reject) { + request({ + url: url, + method: 'GET', + headers: _.extend({}, constants.HTTP_HEADERS.accept.data, { + 'Authorization': req.session && req.session.authorization + }), + forever: constants.FOREVER_ON, + rejectUnauthorized: false + }, function(error, response, body) { + if (utils.validateResponse('PackageManager.getJobStatus', error, response, body, resolve, reject)) { + var returnData; + if (id) { + returnData = JSON.parse(response.body)['rw-pkg-mgmt:job']; + } else { + var data = JSON.parse(response.body)['rw-pkg-mgmt:copy-jobs']; + returnData = (data && data.job) || []; + } + resolve({ + statusCode: response.statusCode, + data: returnData + }) + }; + }) + }) +} + +FileManager.addFile = function(req) { + console.log(' Uploading file', req.file.originalname, 'as', req.file.filename); + var api_server = req.query['api_server']; + var download_host = req.query['dev_download_server']; + var package_id = req.query['package_id']; + var package_type = req.query['package_type'].toUpperCase(); + var package_path = req.query['package_path']; + if (!download_host) { + 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, + 'package-type': package_type, + 'package-id': package_id, + 'package-path': package_path + '/' + req.file.filename + }; + + var uri = utils.projectContextUrl(req, utils.confdPort(api_server) + '/api/operations/package-file-add'); + + input = utils.addProjectContextToRPCPayload(req, uri, input); + + + return new Promise(function(resolve, reject) { + Promise.all([ + rp({ + uri: uri, + method: 'POST', + headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, { + 'Authorization': req.session && req.session.authorization + }), + forever: constants.FOREVER_ON, + rejectUnauthorized: false, + resolveWithFullResponse: true, + json: true, + body: { + input: input + } + }) + ]).then(function(result) { + var data = {}; + data['transaction_id'] = result[0].body['output']['task-id']; + resolve({ + statusCode: constants.HTTP_RESPONSE_CODES.SUCCESS.OK, + data: data + }); + }).catch(function(error) { + var res = {}; + console.log('Problem with Composer.upload', error); + res.statusCode = error.statusCode || 500; + res.errorMessage = { + error: 'Failed to upload package ' + req.file.originalname + '. Error: ' + error + }; + reject(res); + }); + }); +} + FileManager.get = function(req) { var api_server = req.query['api_server']; var type = req.query['package_type'] && req.query['package_type'].toUpperCase(); @@ -530,9 +626,11 @@ FileManager.get = function(req) { } function deleteFile(payload) { + var uri = utils.projectContextUrl(req, utils.confdPort(api_server) + '/api/operations/rw-pkg-mgmt:package-file-delete'); + payload.input = utils.addProjectContextToRPCPayload(req, uri, payload.input); return new Promise(function(resolve, reject) { rp({ - uri: utils.projectContextUrl(req, utils.confdPort(api_server) + '/api/operations/rw-pkg-mgmt:package-file-delete'), + uri: uri, method: 'POST', headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, { 'Authorization': req.session && req.session.authorization @@ -552,9 +650,11 @@ FileManager.get = function(req) { }) } function download(payload) { + var uri = utils.projectContextUrl(req, utils.confdPort(api_server) + '/api/operations/rw-pkg-mgmt:package-file-add'); + payload.input = utils.addProjectContextToRPCPayload(req, uri, payload.input); return new Promise(function(resolve, reject) { rp({ - uri: utils.projectContextUrl(req, utils.confdPort(api_server) + '/api/operations/rw-pkg-mgmt:package-file-add'), + uri: uri, method: 'POST', headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, { 'Authorization': req.session && req.session.authorization @@ -574,9 +674,11 @@ FileManager.get = function(req) { }) } function list(payload) { + var uri = utils.projectContextUrl(req, utils.confdPort(api_server) + '/api/operations/get-package-endpoint'); + payload.input = utils.addProjectContextToRPCPayload(req, uri, payload.input); return new Promise(function(resolve, reject) { rp({ - uri: utils.projectContextUrl(req, utils.confdPort(api_server) + '/api/operations/get-package-endpoint'), + uri: uri, method: 'POST', headers: _.extend({}, constants.HTTP_HEADERS.accept.collection, { 'Authorization': req.session && req.session.authorization @@ -654,5 +756,6 @@ FileManager.job = function(req) { } module.exports = { Composer:Composer, - FileManager: FileManager + FileManager: FileManager, + PackageManager: PackageManager };