X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=blobdiff_plain;f=skyquake%2Fplugins%2Flaunchpad%2Fsrc%2Finstantiate%2FinstantiateStore.js;h=94ba391bb7844fcbbb71aabda869a7a848969ddc;hp=6b7941ec948884a996d6d86f6fc2581c582e2ce5;hb=354a4f472b33534f1c0405bbeb8a4cdf250a8713;hpb=dfe972ff7c9f7b6b1d730e66b0b2aa8df2ce329b diff --git a/skyquake/plugins/launchpad/src/instantiate/instantiateStore.js b/skyquake/plugins/launchpad/src/instantiate/instantiateStore.js index 6b7941ec9..94ba391bb 100644 --- a/skyquake/plugins/launchpad/src/instantiate/instantiateStore.js +++ b/skyquake/plugins/launchpad/src/instantiate/instantiateStore.js @@ -156,7 +156,7 @@ class LaunchNetworkServiceStore { let newState = { dataCenters: dataCenters || [] }; - if (this.ro['account-type'] == 'openmano') { + if (this.ro && this.ro['account-type'] == 'openmano') { newState.dataCenterID = dataCenters[this.ro.name][0].uuid } this.setState(newState) @@ -183,7 +183,11 @@ class LaunchNetworkServiceStore { return window.location.hash = 'launchpad/' + tokenizedHash[2]; } launchNSRError(error) { - Alt.actions.global.showError.defer('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; + } + Alt.actions.global.showNotification.defer(msg); Alt.actions.global.hideScreenLoader.defer(); this.setState({ isLoading: false @@ -233,7 +237,7 @@ class LaunchNetworkServiceStore { if(v['vim-network-name']) { v.type = 'vim-network-name'; } else { - v.type = 'unknown'; + v.type = 'none'; } } return v; @@ -282,7 +286,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; @@ -293,7 +297,7 @@ class LaunchNetworkServiceStore { }, updateSelectedDataCenter: (dataCenter) => { self.setState({ - dataCenterID: dataCenter.target.value + dataCenterID: JSON.parse(dataCenter.target.value) }); }, placementGroupUpdate: (i, k, value) => { @@ -372,7 +376,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]; @@ -421,7 +425,7 @@ class LaunchNetworkServiceStore { if (!vnfCA[id]) { vnfCA[id] = {}; } - vnfCA[id].datacenter = dataCenter.target.value; + vnfCA[id].datacenter = JSON.parse(dataCenter.target.value); self.setState({ vnfdCloudAccounts: vnfCA }); @@ -447,7 +451,7 @@ class LaunchNetworkServiceStore { } else { delete vld[i]['dns-server']; } - if(type == 'unknown') { + if(type == 'none') { delete vld[i]['ip-profile-ref']; delete vld[i]['vim-network-name']; } @@ -509,7 +513,9 @@ class LaunchNetworkServiceStore { } //Removing DCHP property on disable to allow instantiation if(!value) { - delete self.ipProfiles[i]['ip-profile-params']['dhcp-params']; + self.ipProfiles[i]['ip-profile-params']['dhcp-params'] = { + enabled: false + }; } else { self.ipProfiles[i]['ip-profile-params']['dhcp-params'][property] = value; } @@ -525,9 +531,9 @@ class LaunchNetworkServiceStore { let self = this; return function(e) { if(self.ipProfiles[i]['ip-profile-params']['dns-server']) { - self.ipProfiles[i]['ip-profile-params']['dns-server'].unshift('') + self.ipProfiles[i]['ip-profile-params']['dns-server'].unshift({}) } else { - self.ipProfiles[i]['ip-profile-params']['dns-server'] = ['']; + self.ipProfiles[i]['ip-profile-params']['dns-server'] = [{}]; } self.setState({ipProfiles:self.ipProfiles}); @@ -542,6 +548,14 @@ class LaunchNetworkServiceStore { } self.setState({ipProfiles:self.ipProfiles}); } + }, + updateDNS: (i, k) => { + let self = this; + return function(e) { + let value = e.target.value; + self.ipProfiles[i]['ip-profile-params']['dns-server'][k].address = value; + self.setState({ipProfiles:self.ipProfiles}); + } } } } @@ -582,18 +596,19 @@ class LaunchNetworkServiceStore { usersFn = () => { let self = this; return { - add: function() { - console.log('adding user') - let newUser = { - name: '', - gecos: '', - passwd: '' + add: function(sshKeysList) { + return function(e) { + let newUser = { + name: '', + 'user-info': '', + 'ssh-authorized-key': [sshKeysList[0].name] + } + let usersList = self.usersList; + usersList.push(newUser); + self.setState({ + usersList: usersList + }) } - let usersList = self.usersList; - usersList.push(newUser); - self.setState({ - usersList: usersList - }) }, remove: function(i) { return function() { @@ -611,6 +626,25 @@ class LaunchNetworkServiceStore { usersList: self.usersList }) } + }, + updateSSHkeyRef: function(i, j, remove){ + return function(e) { + let usersList = _.cloneDeep(self.usersList) + let keys = usersList[i]['ssh-authorized-key']; + if(!remove) { + let keyRef = JSON.parse(e.target.value).name; + if(!isNaN(j)) { + keys.splice(j, 1); + } + keys.push(keyRef); + } else { + keys.splice(j, 1); + } + usersList[i]['ssh-authorized-key'] = keys; + self.setState({ + usersList: usersList + }) + } } } } @@ -644,7 +678,7 @@ class LaunchNetworkServiceStore { nsdPayload['vnf-placement-groups'] && delete nsdPayload['vnf-placement-groups']; nsdPayload.vld = this.state.vld; nsdPayload.vld && nsdPayload.vld.map(function(v){ - delete v['unknown']; + delete v['none']; delete v.type; }) } @@ -658,7 +692,7 @@ class LaunchNetworkServiceStore { "nsd": nsdPayload } - if (this.state.ro['account-type'] == 'openmano') { + if (this.state.ro && this.state.ro['account-type'] == 'openmano') { payload['om-datacenter'] = this.state.dataCenterID; } else { payload["cloud-account"] = this.state.selectedCloudAccount.name; @@ -759,14 +793,17 @@ 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) { return {'key-pair-ref': JSON.parse(k).name}; }); //Add Users - payload['user'] = this.state.usersList; + payload['user'] = addKeyPairRefToUsers(this.state.usersList); + // console.log(payload) this.launchNSR({ 'nsr': [payload] }); @@ -774,6 +811,19 @@ class LaunchNetworkServiceStore { } +function addKeyPairRefToUsers(list) { + return list.map(function(u) { + return { + name: u.name, + 'user-info': u['user-info'], + 'ssh-authorized-key': u['ssh-authorized-key'].map(function(k) { + return { + 'key-pair-ref' : k + } + }) + } + }) +} function getMockSLA(id) { console.log('Getting mock SLA Data for id: ' + id);