apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

vpc: Fixing Edit ACL (#572)

Browse Source 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
davidjumani 2020-08-11 14:34:25 +05:30 committed by Rohit Yadav
parent 3979f1f5d5
commit 7c86eb0329
1 changed files with 40 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
ui/src/views/network/AclListRulesTab.vue
View File

@ -46,7 +46,7 @@
</div> </div>
<div class="list__container"> <div class="list__container">
<div class="list__col"> <div class="list__col">
<div class="list__label">{{ $t('label.number') }}</div> <div class="list__label">{{ $t('label.rule.number') }}</div>
<div>{{ acl.number }}</div> <div>{{ acl.number }}</div>
</div> </div>
<div class="list__col"> <div class="list__col">
@ -136,7 +136,7 @@
<a-input-number style="width: 100%" v-decorator="['number']" /> <a-input-number style="width: 100%" v-decorator="['number']" />
</a-form-item> </a-form-item>
<a-form-item :label="$t('label.cidrlist')"> <a-form-item :label="$t('label.cidrlist')">
<a-input v-decorator="['cidr']" /> <a-input v-decorator="['cidrlist']" />
</a-form-item> </a-form-item>
<a-form-item :label="$t('label.action')"> <a-form-item :label="$t('label.action')">
<a-select v-decorator="['action']"> <a-select v-decorator="['action']">
@ -167,12 +167,12 @@
</a-form-item> </a-form-item>
</div> </div>
<div v-if="ruleForm.getFieldValue('protocol') === 'tcp' || ruleForm.getFieldValue('protocol') === 'udp' || ruleForm.getFieldValue('protocol') === 'protocolnumber'"> <div v-show="ruleForm.getFieldValue('protocol') === 'tcp' || ruleForm.getFieldValue('protocol') === 'udp' || ruleForm.getFieldValue('protocol') === 'protocolnumber'">
<a-form-item :label="$t('label.startport')"> <a-form-item :label="$t('label.startport')">
<a-input v-decorator="['startport']" /> <a-input-number style="width: 100%" v-decorator="['startport']" />
</a-form-item> </a-form-item>
<a-form-item :label="$t('label.endport')"> <a-form-item :label="$t('label.endport')">
<a-input v-decorator="['endport']" /> <a-input-number style="width: 100%" v-decorator="['endport']" />
</a-form-item> </a-form-item>
</div> </div>
@ -396,7 +396,7 @@ export default {
setTimeout(() => { setTimeout(() => {
this.ruleForm.setFieldsValue({ this.ruleForm.setFieldsValue({
number: acl.number, number: acl.number,
cidr: acl.cidrlist, cidrlist: acl.cidrlist,
action: acl.action, action: acl.action,
protocol: acl.protocol, protocol: acl.protocol,
startport: acl.startport, startport: acl.startport,
@ -406,6 +406,32 @@ export default {
}) })
}, 200) }, 200)
}, },
getDataFromForm (values) {
const data = {
cidrlist: values.cidrlist || '',
number: values.number || '',
protocol: values.protocol || '',
traffictype: values.traffictype || '',
action: values.action || '',
reason: values.reason || ''
}
if (values.protocol === 'tcp' || values.protocol === 'udp' || values.protocol === 'protocolnumber') {
data.startport = values.startport || ''
data.endport = values.endport || ''
}
if (values.protocol === 'icmp') {
data.icmptype = values.icmptype || -1
data.icmpcode = values.icmpcode || -1
}
if (values.protocol === 'protocolnumber') {
data.protocol = values.protocolnumber
}
return data
},
handleEditRule (e) { handleEditRule (e) {
e.preventDefault() e.preventDefault()
this.ruleForm.validateFields((err, values) => { this.ruleForm.validateFields((err, values) => {
@ -413,18 +439,12 @@ export default {
this.fetchLoading = true this.fetchLoading = true
this.ruleModalVisible = false this.ruleModalVisible = false
api('updateNetworkACLItem', {}, 'POST', {
id: this.selectedAcl.id, const data = this.getDataFromForm(values)
cidrlist: values.cidr, data.id = this.selectedAcl.id
number: values.number, data.partialupgrade = false
protocol: values.protocol,
traffictype: values.traffictype, api('updateNetworkACLItem', {}, 'POST', data).then(response => {
action: values.action,
reason: values.reason,
startport: values.startport,
endport: values.endport,
partialupgrade: false
}).then(response => {
this.$store.dispatch('AddAsyncJob', { this.$store.dispatch('AddAsyncJob', {
title: this.$t('label.edit.acl.rule'), title: this.$t('label.edit.acl.rule'),
jobid: response.createnetworkaclresponse.jobid, jobid: response.createnetworkaclresponse.jobid,
@ -515,29 +535,8 @@ export default {
this.fetchLoading = true this.fetchLoading = true
this.ruleModalVisible = false this.ruleModalVisible = false
const data = { const data = this.getDataFromForm(values)
aclid: this.resource.id, data.aclid = this.resource.id
cidrlist: values.cidr || '',
number: values.number || '',
protocol: values.protocol || '',
traffictype: values.traffictype || '',
action: values.action || '',
reason: values.reason || ''
}
if (values.protocol === 'tcp' || values.protocol === 'udp' || values.protocol === 'protocolnumber') {
data.startport = values.startport || ''
data.endport = values.endport || ''
}
if (values.protocol === 'icmp') {
data.icmptype = values.icmptype || -1
data.icmpcode = values.icmpcode || -1
}
if (values.protocol === 'protocolnumber') {
data.protocol = values.protocolnumber
}
api('createNetworkACL', {}, 'POST', data).then(() => { api('createNetworkACL', {}, 'POST', data).then(() => {
this.$notification.success({ this.$notification.success({