X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=blobdiff_plain;f=skyquake%2Fplugins%2Faccounts%2Fsrc%2Faccount%2FaccountStore.js;h=5d5bd2f922845062a6df0f887b66677c91667b88;hp=002a9e10c284346452ebca151cacc7033021578a;hb=6a75ef8c106be47c44d24125bab256ad9e43f607;hpb=8d06f92bda77338e7772a912ef3cde474f2a06ed diff --git a/skyquake/plugins/accounts/src/account/accountStore.js b/skyquake/plugins/accounts/src/account/accountStore.js index 002a9e10c..5d5bd2f92 100644 --- a/skyquake/plugins/accounts/src/account/accountStore.js +++ b/skyquake/plugins/accounts/src/account/accountStore.js @@ -18,7 +18,7 @@ import AccountActions from './accountActions.js'; import AccountSource from './accountSource.js'; - +var Utils = require('utils/utils.js'); var rw = require('utils/rw.js'); var altImage = rw.getSearchParams(window.location).alt_image; @@ -125,6 +125,18 @@ let AccountMeta = { label: 'Floating IP Pool', ref: 'floating-ip-pool', optional: true + }, { + label: "User Domain", + ref: 'user-domain', + optional: true + }, { + label: "Project Domain", + ref: 'project-domain', + optional: true + }, { + label: "Region", + ref: 'region', + optional: true }], "openvim": [{ label: "Host", @@ -252,7 +264,6 @@ export default class AccountStore { openAccountSocketSuccess = (connection) => { let self = this; let ws = window.multiplexer.channel(connection); - if (!connection) return; this.setState({ socket: ws.ws, @@ -261,6 +272,9 @@ export default class AccountStore { ws.onmessage = (socket) => { try { var data = JSON.parse(socket.data); + Utils.checkAuthentication(data.statusCode, function() { + self.closeSocket(); + }); let SdnOptions = [{ label: 'Select an SDN Account', value: false @@ -350,7 +364,7 @@ export default class AccountStore { } generateOptionsByName(data) { let results = []; - if (data.constructor.name == "Array") { + if (data && data.constructor.name == "Array") { data.map(function(d) { results.push({ label: d.name, @@ -407,18 +421,3 @@ export default class AccountStore { } } - -/** - *Cloud - * - * {"name":"eng2","account-type":"openstack","openstack":{"key":"lmaultsb","secret":"mypasswd","auth_url":"http://engstack.eng.riftio.com:5000/v3/","tenant":"lmaultsb","mgmt-network":"private"}} -Name -Path - - -SDN - - - * - * - */