diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json index 8115739da8d..15d90bc0ae5 100644 --- a/ui/public/locales/en.json +++ b/ui/public/locales/en.json @@ -2953,6 +2953,8 @@ "message.move.acl.order.failed": "Failed to move ACL rule", "message.move.acl.order.processing": "Moving ACL rule...", "message.ncc.delete.confirm": "Please confirm you want to delete this NCC", +"message.network.acl.default.allow": "Warning: With this policy all traffic will be allowed through the firewall to this VPC tier. You should consider securing your network.", +"message.network.acl.default.deny": "Warning: With this policy all traffic will be denied through the firewall to this VPC tier. In order to allow traffic through you will need to change policies.", "message.network.addvm.desc": "Please specify the network that you would like to add this VM to. A new NIC will be added for this network.", "message.network.addvmnic": "Please confirm that you would like to add a new VM NIC for this network.", "message.network.description": "Setup network and traffic", diff --git a/ui/src/views/network/VpcTab.vue b/ui/src/views/network/VpcTab.vue index a4ecb49e36b..ae349590b93 100644 --- a/ui/src/views/network/VpcTab.vue +++ b/ui/src/views/network/VpcTab.vue @@ -176,7 +176,7 @@ - {{ item.name }} + {{ item.name }} ({{ item.description }}) diff --git a/ui/src/views/network/VpcTiersTab.vue b/ui/src/views/network/VpcTiersTab.vue index 8db3954e614..ffa4477be89 100644 --- a/ui/src/views/network/VpcTiersTab.vue +++ b/ui/src/views/network/VpcTiersTab.vue @@ -190,12 +190,20 @@ v-decorator="['externalId']"> - + - {{ item.name }} + {{ item.name }} ({{ item.description }}) + + + + + + @@ -279,6 +287,7 @@ export default { showAddInternalLB: false, networkOfferings: [], networkAclList: [], + selectedNetworkAcl: {}, modalLoading: false, internalLB: {}, LBPublicIPs: {}, @@ -412,11 +421,7 @@ export default { this.modalLoading = true api('listNetworkACLLists', { vpcid: this.resource.id }).then(json => { this.networkAclList = json.listnetworkacllistsresponse.networkacllist || [] - this.$nextTick(function () { - this.form.setFieldsValue({ - acl: this.networkAclList[0].id - }) - }) + this.handleNetworkAclChange(null) }).catch(error => { this.$notifyError(error) }).finally(() => { @@ -519,6 +524,13 @@ export default { this.fetchLoading = false }) }, + handleNetworkAclChange (aclId) { + if (aclId) { + this.selectedNetworkAcl = this.networkAclList.filter(acl => acl.id === aclId)[0] + } else { + this.selectedNetworkAcl = {} + } + }, closeModal () { this.$emit('close-action') },