Skip to content
This repository was archived by the owner on Jan 20, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/views/infra/zone/ZoneWizardLaunchZone.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down Expand Up @@ -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 () {
Expand Down
73 changes: 43 additions & 30 deletions src/views/infra/zone/ZoneWizardNetworkSetupStep.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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 () {
Expand Down Expand Up @@ -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'
}
]
}
},
Expand Down
8 changes: 7 additions & 1 deletion src/views/infra/zone/ZoneWizardZoneDetailsStep.vue
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
rules: [
{
message: $t('message.error.ipv6.cidr'),
initialValue: ip6cidr
initialValue: ipv6Cidr
}
]
}]"
Expand Down Expand Up @@ -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
Expand Down