mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-03 04:12:31 +01:00
infra: Fix create Zone (#567)
1. Add guest Vlan ID to network in Advanced Zone with SG enabled 2. Fix error from console in physical network step 3. Fix `Fix errors` button still present after fixing errors successfully Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
parent
552b9ae1bf
commit
2b7624e45c
@ -176,6 +176,7 @@ export default {
|
||||
},
|
||||
mounted () {
|
||||
if (this.launchZone) {
|
||||
this.processStatus = STATUS_PROCESS
|
||||
this.stepData = this.launchData
|
||||
if (this.stepChild === 'publicTraffic') {
|
||||
this.stepData.returnedPublicTraffic = []
|
||||
@ -1514,7 +1515,6 @@ export default {
|
||||
this.currentStep++
|
||||
this.addStep('message.zone.creation.complete', 'stepComplete')
|
||||
this.setStepStatus(STATUS_FINISH)
|
||||
this.currentStep++
|
||||
this.processStatus = STATUS_FINISH
|
||||
},
|
||||
async enableZoneAction () {
|
||||
|
||||
@ -260,6 +260,49 @@ export default {
|
||||
required: false
|
||||
}
|
||||
]
|
||||
},
|
||||
guestTrafficFields () {
|
||||
const fields = [
|
||||
{
|
||||
title: 'label.guest.gateway',
|
||||
key: 'guestGateway',
|
||||
placeHolder: 'message.installwizard.tooltip.configureguesttraffic.guestgateway',
|
||||
required: false
|
||||
},
|
||||
{
|
||||
title: 'label.guest.netmask',
|
||||
key: 'guestNetmask',
|
||||
placeHolder: 'message.installwizard.tooltip.configureguesttraffic.guestnetmask',
|
||||
required: false
|
||||
},
|
||||
{
|
||||
title: 'label.guest.start.ip',
|
||||
key: 'guestStartIp',
|
||||
placeHolder: 'message.installwizard.tooltip.configureguesttraffic.gueststartip',
|
||||
required: false,
|
||||
ipV4: true,
|
||||
message: 'message.error.ipv4.address'
|
||||
},
|
||||
{
|
||||
title: 'label.guest.end.ip',
|
||||
key: 'guestStopIp',
|
||||
placeHolder: 'message.installwizard.tooltip.configureguesttraffic.guestendip',
|
||||
required: false,
|
||||
ipV4: true,
|
||||
message: 'message.error.ipv4.address'
|
||||
}
|
||||
]
|
||||
|
||||
if (this.sgEnabled) {
|
||||
fields.push({
|
||||
title: 'label.vlanid',
|
||||
key: 'guestVlan',
|
||||
required: false,
|
||||
ipV4: false
|
||||
})
|
||||
}
|
||||
|
||||
return fields
|
||||
}
|
||||
},
|
||||
data () {
|
||||
@ -315,36 +358,6 @@ export default {
|
||||
ipV4: true,
|
||||
message: 'message.error.ipv4.address'
|
||||
}
|
||||
],
|
||||
guestTrafficFields: [
|
||||
{
|
||||
title: 'label.guest.gateway',
|
||||
key: 'guestGateway',
|
||||
placeHolder: 'message.installwizard.tooltip.configureguesttraffic.guestgateway',
|
||||
required: false
|
||||
},
|
||||
{
|
||||
title: 'label.guest.netmask',
|
||||
key: 'guestNetmask',
|
||||
placeHolder: 'message.installwizard.tooltip.configureguesttraffic.guestnetmask',
|
||||
required: false
|
||||
},
|
||||
{
|
||||
title: 'label.guest.start.ip',
|
||||
key: 'guestStartIp',
|
||||
placeHolder: 'message.installwizard.tooltip.configureguesttraffic.gueststartip',
|
||||
required: false,
|
||||
ipV4: true,
|
||||
message: 'message.error.ipv4.address'
|
||||
},
|
||||
{
|
||||
title: 'label.guest.end.ip',
|
||||
key: 'guestStopIp',
|
||||
placeHolder: 'message.installwizard.tooltip.configureguesttraffic.guestendip',
|
||||
required: false,
|
||||
ipV4: true,
|
||||
message: 'message.error.ipv4.address'
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
|
||||
@ -130,7 +130,7 @@
|
||||
rules: [
|
||||
{
|
||||
message: $t('message.error.ipv6.cidr'),
|
||||
initialValue: ip6cidr
|
||||
initialValue: ipv6Cidr
|
||||
}
|
||||
]
|
||||
}]"
|
||||
@ -480,6 +480,12 @@ export default {
|
||||
internalDns2 () {
|
||||
return this.prefillContent.internalDns2 ? this.prefillContent.internalDns2.value : null
|
||||
},
|
||||
ipv6Cidr () {
|
||||
return this.prefillContent.ipv6Cidr ? this.prefillContent.ipv6Cidr.value : null
|
||||
},
|
||||
ip6gateway () {
|
||||
return this.prefillContent.ip6gateway ? this.prefillContent.ip6gateway.value : null
|
||||
},
|
||||
currentHypervisor () {
|
||||
if (this.prefillContent.hypervisor) {
|
||||
return this.prefillContent.hypervisor.value
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user