From ab1a488edf76171354e4278c1fb11bac9069cf68 Mon Sep 17 00:00:00 2001 From: KIRAN KASHALKAR Date: Mon, 27 Mar 2017 16:38:05 -0400 Subject: [PATCH 1/1] Bug 209 Signed-off-by: KIRAN KASHALKAR --- .../widgets/skyquake_container/skyquakeContainerSource.js | 2 +- skyquake/plugins/accounts/src/account/accountSource.js | 2 +- .../src/src/components/filemanager/FileManagerSource.js | 4 ++-- skyquake/plugins/launchpad/src/launchpadFleetSource.js | 2 +- .../plugins/launchpad/src/recordViewer/recordViewSource.js | 6 +++--- .../launchpad/src/topologyL2View/topologyL2Source.js | 2 +- .../plugins/launchpad/src/topologyView/topologySource.js | 2 +- skyquake/plugins/launchpad/src/vnfr/vnfrSource.js | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/skyquake/framework/widgets/skyquake_container/skyquakeContainerSource.js b/skyquake/framework/widgets/skyquake_container/skyquakeContainerSource.js index ae2147a59..fca997e67 100644 --- a/skyquake/framework/widgets/skyquake_container/skyquakeContainerSource.js +++ b/skyquake/framework/widgets/skyquake_container/skyquakeContainerSource.js @@ -78,7 +78,7 @@ export default { remote: function(state, location, streamSource) { return new Promise((resolve, reject) => { $.ajax({ - url: '//' + window.location.hostname + ':' + window.location.port + '/socket-polling', + url: '//' + window.location.hostname + ':' + window.location.port + '/socket-polling?api_server=' + API_SERVER, type: 'POST', beforeSend: Utils.addAuthorizationStub, data: { diff --git a/skyquake/plugins/accounts/src/account/accountSource.js b/skyquake/plugins/accounts/src/account/accountSource.js index 08fb9f386..52af8578b 100644 --- a/skyquake/plugins/accounts/src/account/accountSource.js +++ b/skyquake/plugins/accounts/src/account/accountSource.js @@ -38,7 +38,7 @@ module.exports = function(Alt) { return resolve(false); } $.ajax({ - url: '/socket-polling', + url: '/socket-polling?api_server=' + API_SERVER, type: 'POST', beforeSend: Utils.addAuthorizationStub, data: { diff --git a/skyquake/plugins/composer/src/src/components/filemanager/FileManagerSource.js b/skyquake/plugins/composer/src/src/components/filemanager/FileManagerSource.js index 325d0263c..57f88dbd2 100644 --- a/skyquake/plugins/composer/src/src/components/filemanager/FileManagerSource.js +++ b/skyquake/plugins/composer/src/src/components/filemanager/FileManagerSource.js @@ -146,7 +146,7 @@ const FileManagerSource = { return new Promise(function(resolve, reject) { //api/operational/download-jobs/job/ $.ajax({ - url: '/socket-polling', + url: '/socket-polling?api_server=' + API_SERVER, type: 'POST', beforeSend: Utils.addAuthorizationStub, data: { @@ -171,7 +171,7 @@ const FileManagerSource = { return new Promise(function(resolve, reject) { //api/operational/download-jobs/job/ $.ajax({ - url: '/socket-polling', + url: '/socket-polling?api_server=' + API_SERVER, type: 'POST', beforeSend: Utils.addAuthorizationStub, data: { diff --git a/skyquake/plugins/launchpad/src/launchpadFleetSource.js b/skyquake/plugins/launchpad/src/launchpadFleetSource.js index cde71160f..fff6fae8c 100644 --- a/skyquake/plugins/launchpad/src/launchpadFleetSource.js +++ b/skyquake/plugins/launchpad/src/launchpadFleetSource.js @@ -106,7 +106,7 @@ module.exports = function(Alt) { return resolve(false); } $.ajax({ - url: '/socket-polling', + url: '/socket-polling?api_server=' + API_SERVER, type: 'POST', beforeSend: Utils.addAuthorizationStub, data: { diff --git a/skyquake/plugins/launchpad/src/recordViewer/recordViewSource.js b/skyquake/plugins/launchpad/src/recordViewer/recordViewSource.js index a3b2d6796..49c312288 100644 --- a/skyquake/plugins/launchpad/src/recordViewer/recordViewSource.js +++ b/skyquake/plugins/launchpad/src/recordViewer/recordViewSource.js @@ -94,7 +94,7 @@ export default { return new Promise(function(resolve, reject) { console.log('Getting NSR Socket'); $.ajax({ - url: '/socket-polling', + url: '/socket-polling?api_server=' + API_SERVER, type: 'POST', beforeSend: Utils.addAuthorizationStub, data: { @@ -117,7 +117,7 @@ export default { return new Promise(function(resolve, reject) { console.log('Getting Job Socket'); $.ajax({ - url: '/socket-polling', + url: '/socket-polling?api_server=' + API_SERVER, type: 'POST', beforeSend: Utils.addAuthorizationStub, data: { @@ -139,7 +139,7 @@ export default { return new Promise(function(resolve, reject) { console.log('Getting VNFR Socket for: ' + state.recordID); $.ajax({ - url: '/socket-polling', + url: '/socket-polling?api_server=' + API_SERVER, type: 'POST', beforeSend: Utils.addAuthorizationStub, data: { diff --git a/skyquake/plugins/launchpad/src/topologyL2View/topologyL2Source.js b/skyquake/plugins/launchpad/src/topologyL2View/topologyL2Source.js index fd38d84da..756c775e4 100644 --- a/skyquake/plugins/launchpad/src/topologyL2View/topologyL2Source.js +++ b/skyquake/plugins/launchpad/src/topologyL2View/topologyL2Source.js @@ -41,7 +41,7 @@ export default { return resolve(false); } $.ajax({ - url: '/socket-polling', + url: '/socket-polling?api_server=' + API_SERVER, type: 'POST', beforeSend: Utils.addAuthorizationStub, data: { diff --git a/skyquake/plugins/launchpad/src/topologyView/topologySource.js b/skyquake/plugins/launchpad/src/topologyView/topologySource.js index 04e1c66b8..b570082ec 100644 --- a/skyquake/plugins/launchpad/src/topologyView/topologySource.js +++ b/skyquake/plugins/launchpad/src/topologyView/topologySource.js @@ -42,7 +42,7 @@ export default { return resolve(false); } $.ajax({ - url: '/socket-polling', + url: '/socket-polling?api_server=' + API_SERVER, type: 'POST', beforeSend: Utils.addAuthorizationStub, data: { diff --git a/skyquake/plugins/launchpad/src/vnfr/vnfrSource.js b/skyquake/plugins/launchpad/src/vnfr/vnfrSource.js index 782f32263..327bdb9f1 100644 --- a/skyquake/plugins/launchpad/src/vnfr/vnfrSource.js +++ b/skyquake/plugins/launchpad/src/vnfr/vnfrSource.js @@ -42,7 +42,7 @@ export default { } console.log(nsr_id) $.ajax({ - url: '//' + window.location.hostname + ':' + window.location.port + '/socket-polling', + url: '//' + window.location.hostname + ':' + window.location.port + '/socket-polling?api_server=' + API_SERVER, type: 'POST', beforeSend: Utils.addAuthorizationStub, data: { -- 2.17.1