projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 341 - input-parameter-xpath complains errors
[osm/UI.git]
/
skyquake
/
plugins
/
launchpad
/
src
/
instantiate
/
instantiateStore.js
diff --git
a/skyquake/plugins/launchpad/src/instantiate/instantiateStore.js
b/skyquake/plugins/launchpad/src/instantiate/instantiateStore.js
index
3ec2a80
..
dacf316
100644
(file)
--- a/
skyquake/plugins/launchpad/src/instantiate/instantiateStore.js
+++ b/
skyquake/plugins/launchpad/src/instantiate/instantiateStore.js
@@
-140,7
+140,7
@@
class LaunchNetworkServiceStore {
Alt.actions.global.showNotification.defer({type: 'warning', msg: 'One or more VIM accounts have failed to connect'});
}
if(cloudAccounts && cloudAccounts.length > 0) {
Alt.actions.global.showNotification.defer({type: 'warning', msg: 'One or more VIM accounts have failed to connect'});
}
if(cloudAccounts && cloudAccounts.length > 0) {
- newState.selectedCloudAccount = cloudAccounts[0];
+ newState.selectedCloudAccount =
newState.
cloudAccounts[0];
if (cloudAccounts[0]['account-type'] == 'openstack') {
newState.displayPlacementGroups = true;
} else {
if (cloudAccounts[0]['account-type'] == 'openstack') {
newState.displayPlacementGroups = true;
} else {
@@
-189,10
+189,13
@@
class LaunchNetworkServiceStore {
});
return window.location.hash = 'launchpad/' + tokenizedHash[2];
}
});
return window.location.hash = 'launchpad/' + tokenizedHash[2];
}
- launchNSRError(
error
) {
+ launchNSRError(
data
) {
var msg = 'Something went wrong while trying to instantiate. Check the error logs for more information';
var msg = 'Something went wrong while trying to instantiate. Check the error logs for more information';
- if(error) {
- msg = error;
+ if(data) {
+ msg = data;
+ }
+ if (data.error) {
+ msg = data.error;
}
Alt.actions.global.showNotification.defer(msg);
Alt.actions.global.hideScreenLoader.defer();
}
Alt.actions.global.showNotification.defer(msg);
Alt.actions.global.hideScreenLoader.defer();
@@
-252,9
+255,13
@@
class LaunchNetworkServiceStore {
ipProfiles: NSD['ip-profiles']
};
newState.selectedNSD = data;
ipProfiles: NSD['ip-profiles']
};
newState.selectedNSD = data;
+ newState['input-parameters'] = [];
if (NSD['input-parameter-xpath']) {
newState.hasConfigureNSD = true;
if (NSD['input-parameter-xpath']) {
newState.hasConfigureNSD = true;
- newState['input-parameters'] = NSD['input-parameter-xpath'];
+ NSD['input-parameter-xpath'].map(function(p) {
+ newState.hasConfigureNSD = true;
+ newState['input-parameters'].push(_cloneDeep(p));
+ })
} else {
newState.hasConfigureNSD = false;
newState['input-parameters'] = null;
} else {
newState.hasConfigureNSD = false;
newState['input-parameters'] = null;
@@
-307,14
+314,16
@@
class LaunchNetworkServiceStore {
dataCenterID: JSON.parse(dataCenter.target.value)
});
},
dataCenterID: JSON.parse(dataCenter.target.value)
});
},
- placementGroupUpdate: (i, k, value) => {
+ placementGroupUpdate: (i, k, event) => {
+ let value = event.target.value;
let pg = self['ns-placement-groups'];
pg[i][k] = value;
self.setState({
'ns-placement-groups': pg
})
},
let pg = self['ns-placement-groups'];
pg[i][k] = value;
self.setState({
'ns-placement-groups': pg
})
},
- hostAggregateUpdate: (pgi, hai, k, value) => {
+ hostAggregateUpdate: (pgi, hai, k, event) => {
+ let value = event.target.value;
let pg = self['ns-placement-groups'];
let ha = pg[pgi]['host-aggregate'][hai];
ha[k] = value;
let pg = self['ns-placement-groups'];
let ha = pg[pgi]['host-aggregate'][hai];
ha[k] = value;
@@
-346,14
+355,16
@@
class LaunchNetworkServiceStore {
vnfFn = () => {
let self = this;
return {
vnfFn = () => {
let self = this;
return {
- placementGroupUpdate: (i, k, value) => {
+ placementGroupUpdate: (i, k, event) => {
+ let value = event.target.value;
let pg = self['vnf-placement-groups'];
pg[i][k] = value;
self.setState({
'vnf-placement-groups': pg
})
},
let pg = self['vnf-placement-groups'];
pg[i][k] = value;
self.setState({
'vnf-placement-groups': pg
})
},
- hostAggregateUpdate: (pgi, hai, k, value) => {
+ hostAggregateUpdate: (pgi, hai, k, event) => {
+ let value = event.target.value;
let pg = self['vnf-placement-groups'];
let ha = pg[pgi]['host-aggregate'][hai];
ha[k] = value;
let pg = self['vnf-placement-groups'];
let ha = pg[pgi]['host-aggregate'][hai];
ha[k] = value;
@@
-707,14
+718,22
@@
class LaunchNetworkServiceStore {
if (this.state.ro && this.state.ro['account-type'] == 'openmano') {
payload['om-datacenter'] = this.state.dataCenterID;
} else {
if (this.state.ro && this.state.ro['account-type'] == 'openmano') {
payload['om-datacenter'] = this.state.dataCenterID;
} else {
+ if(!this.state.selectedCloudAccount) {
+ Alt.actions.global.showNotification.defer("No VIM Account Selected");
+ return;
+ }
payload["cloud-account"] = this.state.selectedCloudAccount.name;
}
payload["cloud-account"] = this.state.selectedCloudAccount.name;
}
+ //Clean Input Parameters
if (this.state.hasConfigureNSD) {
if (this.state.hasConfigureNSD) {
- let ips = this.state['input-parameters'];
+ let ips = _cloneDeep(this.state['input-parameters']);
+
let ipsToSend = ips.filter(function(ip) {
if (ip.value && ip.value != "") {
let ipsToSend = ips.filter(function(ip) {
if (ip.value && ip.value != "") {
-
ip.uuid = GUID()
;
+
delete ip.label
;
delete ip.name;
delete ip.name;
+ delete ip['default-value'];
+
return true;
}
return false;
return true;
}
return false;