From a6bd6f8c6d9c17c647b1c9f6e04b51676d14b53a Mon Sep 17 00:00:00 2001 From: Laurence Maultsby Date: Wed, 14 Sep 2016 10:11:24 -0400 Subject: [PATCH] RIFT-14581, RIFT-14582 Signed-off-by: Laurence Maultsby --- skyquake/plugins/config/src/dashboard/configStore.js | 2 +- .../launchpad/src/instantiate/instantiateInputParams.jsx | 2 +- .../plugins/launchpad/src/instantiate/instantiateStore.js | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/skyquake/plugins/config/src/dashboard/configStore.js b/skyquake/plugins/config/src/dashboard/configStore.js index 50a2cb757..675f3d689 100644 --- a/skyquake/plugins/config/src/dashboard/configStore.js +++ b/skyquake/plugins/config/src/dashboard/configStore.js @@ -118,7 +118,7 @@ export default class AccountStore { } getResourceOrchestratorSuccess = (data) => { this.alt.actions.global.hideScreenLoader.defer(); - if(data.hasOwnProperty('empty')) { + if(data && data.hasOwnProperty('empty')) { this.setAccountTemplate(false) } else { this.setState({ diff --git a/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx b/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx index 87c95921f..5f1cc8a7d 100644 --- a/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx +++ b/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx @@ -73,7 +73,7 @@ export default class InstantiateInputParams extends Component { !isOpenMano(props.ro) ? ( ) : null diff --git a/skyquake/plugins/launchpad/src/instantiate/instantiateStore.js b/skyquake/plugins/launchpad/src/instantiate/instantiateStore.js index 6b7941ec9..7d9807986 100644 --- a/skyquake/plugins/launchpad/src/instantiate/instantiateStore.js +++ b/skyquake/plugins/launchpad/src/instantiate/instantiateStore.js @@ -282,7 +282,7 @@ class LaunchNetworkServiceStore { updateSelectedCloudAccount: (cloudAccount) => { let nsd = self.nsd[0]; var newState = { - selectedCloudAccount: cloudAccount + selectedCloudAccount: JSON.parse(cloudAccount.target.value) }; if (cloudAccount['account-type'] == 'openstack') { newState.displayPlacementGroups = true; @@ -372,7 +372,7 @@ class LaunchNetworkServiceStore { if(!vnfCA.hasOwnProperty(id)) { vnfCA[id] = {}; } - vnfCA[id].account = cloudAccount; + vnfCA[id].account = JSON.parse(cloudAccount.target.value); if (cloudAccount['account-type'] == 'openmano' && this.dataCenters && self.dataCenters[cloudAccount['name']]) { let datacenter = self.dataCenters[cloudAccount['name']][0]; @@ -759,7 +759,9 @@ class LaunchNetworkServiceStore { if(vnfdCloudAccounts[k].hasOwnProperty('datacenter')) { vnf['om-datacenter'] = vnfdCloudAccounts[k].datacenter; } - payload['vnf-cloud-account-map'].push(vnf); + if(vnf['om-datacenter'] || vnf['cloud-account'] || vnf['config-agent-account']) { + payload['vnf-cloud-account-map'].push(vnf); + } } //Add SSH-Keys payload['ssh-authorized-key'] = this.state.sshKeysRef.map(function(k) { -- 2.25.1