Skip to content

Fixed and enhanced vlan field validation in the UI #10983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixed and enhanced vlan field validation in the UI #10983

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 46 additions & 13 deletions ui/src/views/infra/zone/AdvancedGuestTrafficForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
<a-form-item
name="vlanRangeStart"
ref="vlanRangeStart"
:validate-status="validStatus"
has-feedback
:style="{ display: 'inline-block', width: 'calc(50% - 12px)' }">
<a-input-number
Expand All @@ -53,7 +54,6 @@
<a-form-item
name="vlanRangeEnd"
ref="vlanRangeEnd"
has-feedback
:style="{ display: 'inline-block', width: 'calc(50% - 12px)' }">
<a-input-number
v-model:value="form.vlanRangeEnd"
Expand Down Expand Up @@ -102,9 +102,24 @@ export default {
labelCol: { span: 8 },
wrapperCol: { span: 12 }
},
validStatus: '',
validMessage: '',
formModel: {}
validStatus: 'error',
validMessage: this.$t('message.error.vlan.range'),
formModel: {},
rangeLimits: {
VLAN: {
min: 1,
max: 4094
},
VXLAN: {
min: 4096,
max: 16777214
},
GRE: {
min: 0,
max: 4294967295
}
},
isolationMethod: ''
}
},
watch: {
Expand All @@ -120,6 +135,7 @@ export default {
this.initForm()
},
mounted () {
this.getIsolationMethod()
this.fillValue()
},
methods: {
Expand All @@ -143,9 +159,15 @@ export default {
})
},
fillValue () {
this.form.vlanRangeStart = this.getPrefilled('vlanRangeStart')
this.form.vlanRangeEnd = this.getPrefilled('vlanRangeEnd')
const vlanStart = this.getPrefilled('vlanRangeStart')
const vlanEnd = this.getPrefilled('vlanRangeEnd')
this.form.vlanRangeStart = vlanStart
this.form.vlanRangeEnd = vlanEnd
this.formModel = toRaw(this.form)
if (this.checkFromTo(vlanStart, vlanEnd)) {
this.validStatus = 'success'
this.validMessage = ''
}
},
getPrefilled (key) {
return this.prefillContent?.[key] || null
Expand All @@ -156,7 +178,7 @@ export default {

this.formRef.value.validate().then(() => {
const values = toRaw(this.form)
if (!values.vlanRangeStart || (values.vlanRangeEnd && !this.checkFromTo(values.vlanRangeStart, values.vlanRangeEnd))) {
if (!this.checkFromTo(values.vlanRangeStart, values.vlanRangeEnd)) {
this.validStatus = 'error'
this.validMessage = this.$t('message.error.vlan.range')
return
Expand Down Expand Up @@ -185,19 +207,30 @@ export default {
toVal = value
fromVal = this.form[rule.compare]
}
if (fromVal && toVal && !this.checkFromTo(fromVal, toVal)) {
if (!this.checkFromTo(fromVal, toVal)) {
this.validStatus = 'error'
this.validMessage = this.$t('message.error.vlan.range')
}
return Promise.resolve()
},
checkFromTo (fromVal, toVal) {
if (!fromVal) fromVal = 0
if (!toVal) toVal = 0
if (fromVal > toVal) {
return false
const vlanRange = this.rangeLimits[this.isolationMethod] ? this.rangeLimits[this.isolationMethod] : this.rangeLimits.VLAN
switch (true) {
case ((fromVal === null) || (toVal === null)):
case fromVal === toVal:
case fromVal > toVal:
case toVal > vlanRange.max:
case fromVal < vlanRange.min:
return false
default:
this.validStatus = 'success'
this.validMessage = ''
return true
}
return true
},
getIsolationMethod () {
const phyNetworks = this.getPrefilled('physicalNetworks')
this.isolationMethod = phyNetworks[phyNetworks.length - 1].isolationMethod
}
}
}
Expand Down
Loading