projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RIFT-16227: Fix RPC's for project context in UI
[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
2febc3c
..
17a9154
100644
(file)
--- a/
skyquake/plugins/launchpad/api/launchpad.js
+++ b/
skyquake/plugins/launchpad/api/launchpad.js
@@
-48,8
+48,9
@@
APIConfig.NfviMetrics = ['vcpu', 'memory'];
RPC.executeNSServicePrimitive = function(req) {
var api_server = req.query['api_server'];
return new Promise(function(resolve, reject) {
RPC.executeNSServicePrimitive = function(req) {
var api_server = req.query['api_server'];
return new Promise(function(resolve, reject) {
+ var uri = utils.projectContextUrl(req, utils.confdPort(api_server) + APIVersion + '/api/operations/exec-ns-service-primitive');
var jsonData = {
var jsonData = {
- "input":
req.body
+ "input":
utils.addProjectContextToRPCPayload(req, uri, req.body)
};
var headers = _.extend({},
};
var headers = _.extend({},
@@
-59,7
+60,7
@@
RPC.executeNSServicePrimitive = function(req) {
}
);
request({
}
);
request({
- url: u
tils.projectContextUrl(req, utils.confdPort(api_server) + APIVersion + '/api/operations/exec-ns-service-primitive')
,
+ url: u
ri
,
method: 'POST',
headers: headers,
forever: constants.FOREVER_ON,
method: 'POST',
headers: headers,
forever: constants.FOREVER_ON,
@@
-81,8
+82,10
@@
RPC.getNSServicePrimitiveValues = function(req) {
// var nsr_id = req.body['nsr_id_ref'];
// var nsConfigPrimitiveName = req.body['name'];
return new Promise(function(resolve, reject) {
// var nsr_id = req.body['nsr_id_ref'];
// var nsConfigPrimitiveName = req.body['name'];
return new Promise(function(resolve, reject) {
+ var uri = utils.projectContextUrl(req, utils.confdPort(api_server) + APIVersion + '/api/operations/get-ns-service-primitive-values');
+
var jsonData = {
var jsonData = {
- "input":
req.body
+ "input":
utils.addProjectContextToRPCPayload(req, uri, req.body)
};
var headers = _.extend({},
};
var headers = _.extend({},
@@
-92,7
+95,7
@@
RPC.getNSServicePrimitiveValues = function(req) {
}
);
request({
}
);
request({
- uri: u
tils.projectContextUrl(req, utils.confdPort(api_server) + APIVersion + '/api/operations/get-ns-service-primitive-values')
,
+ uri: u
ri
,
method: 'POST',
headers: headers,
forever: constants.FOREVER_ON,
method: 'POST',
headers: headers,
forever: constants.FOREVER_ON,
@@
-133,6
+136,11
@@
RPC.refreshAccountConnectionStatus = function(req) {
}
}
jsonData.input[rpcInfo[Type].label] = Name;
}
}
jsonData.input[rpcInfo[Type].label] = Name;
+
+ var uri = utils.projectContextUrl(req, utils.confdPort(api_server) + APIVersion + '/api/operations/' + rpcInfo[Type].rpc);
+
+ jsonData.input = utils.addProjectContextToRPCPayload(req, uri, jsonData.input);
+
var headers = _.extend({},
constants.HTTP_HEADERS.accept.data,
constants.HTTP_HEADERS.content_type.data, {
var headers = _.extend({},
constants.HTTP_HEADERS.accept.data,
constants.HTTP_HEADERS.content_type.data, {
@@
-140,9
+148,8
@@
RPC.refreshAccountConnectionStatus = function(req) {
}
);
return new Promise(function(resolve, reject) {
}
);
return new Promise(function(resolve, reject) {
-
request({
request({
- uri: u
tils.projectContextUrl(req, utils.confdPort(api_server) + APIVersion + '/api/operations/' + rpcInfo[Type].rpc)
,
+ uri: u
ri
,
method: 'POST',
headers: headers,
forever: constants.FOREVER_ON,
method: 'POST',
headers: headers,
forever: constants.FOREVER_ON,