Skip to content

Commit d5adfef

Browse files
committed
ui: make vpc cidr required when not showing cidrsize
Fixes #11391 Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
1 parent 8756be5 commit d5adfef

1 file changed

Lines changed: 16 additions & 3 deletions

File tree

ui/src/views/network/CreateVpc.vue

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
:placeholder="apiParams.cidr.description"/>
7373
</a-form-item>
7474
<a-form-item
75-
v-if="selectedVpcOffering && selectedVpcOffering.networkmode === 'ROUTED'"
75+
v-if="selectedVpcOfferingRoutedNetworkMode"
7676
ref="cidrsize"
7777
name="cidrsize">
7878
<template #label>
@@ -267,7 +267,10 @@ export default {
267267
return sourcenatService && sourcenatService.length === 1
268268
}
269269
return false
270-
}
270+
},
271+
selectedVpcOfferingRoutedNetworkMode () {
272+
return this.selectedVpcOffering && this.selectedVpcOffering.networkmode === 'ROUTED'
273+
},
271274
},
272275
methods: {
273276
isAdminOrDomainAdmin,
@@ -280,6 +283,7 @@ export default {
280283
name: [{ required: true, message: this.$t('message.error.required.input') }],
281284
zoneid: [{ required: true, message: this.$t('label.required') }],
282285
vpcofferingid: [{ required: true, message: this.$t('label.required') }]
286+
cidr: [{ required: true, message: this.$t('message.error.required.input') }],
283287
})
284288
},
285289
isASNumberRequired () {
@@ -388,6 +392,7 @@ export default {
388392
handleVpcOfferingChange (value) {
389393
this.selectedVpcOffering = {}
390394
if (!value) {
395+
this.updateCidrRule()
391396
return
392397
}
393398
for (var offering of this.vpcOfferings) {
@@ -397,9 +402,17 @@ export default {
397402
if (this.isASNumberRequired()) {
398403
this.fetchZoneASNumbers()
399404
}
400-
return
405+
break
401406
}
402407
}
408+
this.updateCidrRule()
409+
},
410+
updateCidrRule () {
411+
if (!this.selectedVpcOfferingRoutedNetworkMode) {
412+
this.rules.cidr = [{ required: true, message: this.$t('message.error.required.input') }]
413+
} else {
414+
delete this.rules.cidr
415+
}
403416
},
404417
handleASNumberChange (selectedIndex) {
405418
this.selectedAsNumber = this.asNumbersZone[selectedIndex].asnumber

0 commit comments

Comments
 (0)