This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch 4.18
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.18 by this push:
new d8cd1228496 zone wizard: allow only one untagged physical network with
guest traffic type (#8625)
d8cd1228496 is described below
commit d8cd1228496d0b9b260ae912620518f836b88afd
Author: Vishesh <[email protected]>
AuthorDate: Fri Feb 9 21:01:06 2024 +0530
zone wizard: allow only one untagged physical network with guest traffic
type (#8625)
---
ui/public/locales/en.json | 5 +-
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 3 ++
.../zone/ZoneWizardPhysicalNetworkSetupStep.vue | 63 +++++++++++++++++-----
3 files changed, 56 insertions(+), 15 deletions(-)
diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
index 9a14bef74fa..e464d2ac1ed 100644
--- a/ui/public/locales/en.json
+++ b/ui/public/locales/en.json
@@ -2845,7 +2845,8 @@
"message.remove.vpc": "Please confirm that you want to remove the VPC",
"message.request.failed": "Request failed.",
"message.required.add.least.ip": "Please add at least 1 IP Range",
-"message.required.traffic.type": "Error in configuration! All required traffic
types should be added and with multiple physical networks each network should
have a label.",
+"message.required.traffic.type": "All required traffic types should be added
and with multiple physical networks each network should have a label.",
+"message.required.tagged.physical.network": "There can only be one untagged
physical network with guest traffic type.",
"message.reset.vpn.connection": "Please confirm that you want to reset VPN
connection.",
"message.resize.volume.failed": "Failed to resize volume.",
"message.resize.volume.processing": "Volume resize is in progress",
@@ -2881,7 +2882,7 @@
"message.set.default.nic": "Please confirm that you would like to make this
NIC the default for this VM.",
"message.set.default.nic.manual": "Please manually update the default NIC on
the VM now.",
"message.setting.updated": "Setting Updated:",
-"message.setup.physical.network.during.zone.creation": "When adding a zone,
you need to set up one or more physical networks. Each network corresponds to a
NIC on the hypervisor. Each physical network can carry one or more types of
traffic, with certain restrictions on how they may be combined. Add or remove
one or more traffic types onto each physical network.",
+"message.setup.physical.network.during.zone.creation": "When adding a zone,
you need to set up one or more physical networks. Each physical network can
carry one or more types of traffic, with certain restrictions on how they may
be combined. Add or remove one or more traffic types onto each physical
network.",
"message.setup.physical.network.during.zone.creation.basic": "When adding a
basic zone, you can set up one physical network, which corresponds to a NIC on
the hypervisor. The network carries several types of traffic.<br/><br/>You may
also <strong>add</strong> other traffic types onto the physical network.",
"message.shared.network.offering.warning": "Domain admins and regular users
can only create shared networks from network offering with the setting
specifyvlan=false. Please contact an administrator to create a network offering
if this list is empty.",
"message.specify.tag.key": "Please specify a tag key.",
diff --git a/ui/src/views/infra/zone/ZoneWizardLaunchZone.vue
b/ui/src/views/infra/zone/ZoneWizardLaunchZone.vue
index ce8769801cf..929b0bf02cd 100644
--- a/ui/src/views/infra/zone/ZoneWizardLaunchZone.vue
+++ b/ui/src/views/infra/zone/ZoneWizardLaunchZone.vue
@@ -466,6 +466,9 @@ export default {
if (physicalNetwork.isolationMethod) {
params.isolationmethods = physicalNetwork.isolationMethod
}
+ if (physicalNetwork.tags) {
+ params.tags = physicalNetwork.tags
+ }
try {
if (!this.stepData.stepMove.includes('createPhysicalNetwork' +
index)) {
diff --git a/ui/src/views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue
b/ui/src/views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue
index 97871d398d3..a9d984788ad 100644
--- a/ui/src/views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue
+++ b/ui/src/views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue
@@ -77,14 +77,17 @@
</template>
<template #traffics="{ record, index }">
<div v-for="traffic in record.traffics" :key="traffic.type">
- <a-tag
- :color="trafficColors[traffic.type]"
- style="margin:2px"
- >
- {{ traffic.type.toUpperCase() }}
+ <a-tooltip :title="traffic.type.toUpperCase() + ' (' + traffic.label
+ ')'">
+ <a-tag
+ :color="trafficColors[traffic.type]"
+ style="margin:2px"
+ >
+ {{ (traffic.type.toUpperCase() + ' (' + traffic.label +
')').slice(0, 20) }}
+ {{ (traffic.type.toUpperCase() + ' (' + traffic.label +
')').length > 20 ? '...' : '' }}
<edit-outlined class="traffic-type-action"
@click="editTraffic(record.key, traffic, $event)"/>
<delete-outlined class="traffic-type-action"
@click="deleteTraffic(record.key, traffic, $event)"/>
</a-tag>
+ </a-tooltip>
</div>
<div v-if="isShowAddTraffic(record.traffics, index)">
<div class="traffic-select-item" v-if="addingTrafficForKey ===
record.key">
@@ -133,6 +136,13 @@
</a-tag>
</div>
</template>
+ <template #tags="{ text, record, index }">
+ <a-input
+ :disabled="tungstenNetworkIndex > -1 && tungstenNetworkIndex !==
index"
+ :value="text"
+ @change="e => onCellChange(record.key, 'tags', e.target.value)"
+ />
+ </template>
<template #actions="{ record, index }">
<tooltip-button
:tooltip="$t('label.delete')"
@@ -174,10 +184,18 @@
@cancel="() => { showError = false }"
centered
>
- <div v-ctrl-enter="() => showError = false">
- <span>{{ $t('message.required.traffic.type') }}</span>
+ <div v-ctrl-enter="() => showError = false" >
+ <a-list item-layout="horizontal" :dataSource="errorList">
+ <template #renderItem="{ item }">
+ <a-list-item>
+ <exclamation-circle-outlined
+ :style="{ color: $config.theme['@error-color'], fontSize:
'20px', marginRight: '10px' }"
+ />
+ {{ item }}
+ </a-list-item>
+ </template>
+ </a-list>
<div :span="24" class="action-button">
- <a-button @click="showError = false">{{ $t('label.cancel')
}}</a-button>
<a-button type="primary" ref="submit" @click="showError = false">{{
$t('label.ok') }}</a-button>
</div>
</div>
@@ -282,6 +300,7 @@ export default {
addingTrafficForKey: '-1',
trafficLabelSelected: null,
showError: false,
+ errorList: [],
defaultTrafficOptions: [],
isChangeHyperv: false
}
@@ -298,7 +317,7 @@ export default {
columns.push({
title: this.$t('label.isolation.method'),
dataIndex: 'isolationMethod',
- width: 150,
+ width: 125,
slots: { customRender: 'isolationMethod' }
})
columns.push({
@@ -308,6 +327,13 @@ export default {
width: 250,
slots: { customRender: 'traffics' }
})
+ columns.push({
+ title: this.$t('label.tags'),
+ key: 'tags',
+ dataIndex: 'tags',
+ width: 175,
+ slots: { customRender: 'tags' }
+ })
if (this.isAdvancedZone) {
columns.push({
title: '',
@@ -399,7 +425,7 @@ export default {
return { type: item, label: '' }
})
this.count = 1
- this.physicalNetworks = [{ key: this.randomKeyTraffic(this.count), name:
'Physical Network 1', isolationMethod: 'VLAN', traffics: traffics }]
+ this.physicalNetworks = [{ key: this.randomKeyTraffic(this.count), name:
'Physical Network 1', isolationMethod: 'VLAN', traffics: traffics, tags: null }]
}
if (this.isAdvancedZone) {
this.availableTrafficToAdd.push('guest')
@@ -440,28 +466,32 @@ export default {
key: this.randomKeyTraffic(count + 1),
name: `Physical Network ${count + 1}`,
isolationMethod: 'VLAN',
- traffics: []
+ traffics: [],
+ tags: null
}
this.physicalNetworks = [...physicalNetworks, newData]
this.count = count + 1
this.hasUnusedPhysicalNetwork = this.getHasUnusedPhysicalNetwork()
},
isValidSetup () {
+ this.errorList = []
let physicalNetworks = this.physicalNetworks
if (this.tungstenNetworkIndex > -1) {
physicalNetworks = [this.physicalNetworks[this.tungstenNetworkIndex]]
}
const shouldHaveLabels = physicalNetworks.length > 1
let isValid = true
+ let countPhysicalNetworkWithoutTags = 0
this.requiredTrafficTypes.forEach(type => {
- if (!isValid) return false
let foundType = false
physicalNetworks.forEach(net => {
net.traffics.forEach(traffic => {
- if (!isValid) return false
if (traffic.type === type) {
foundType = true
}
+ if (traffic.type === 'guest' && type === 'guest' && (!net.tags ||
net.tags.length === 0)) {
+ countPhysicalNetworkWithoutTags++
+ }
if (this.hypervisor !== 'VMware') {
if (shouldHaveLabels && (!traffic.label || traffic.label.length
=== 0)) {
isValid = false
@@ -475,8 +505,15 @@ export default {
})
if (!foundType || !isValid) {
isValid = false
+ if (this.errorList.indexOf(this.$t('message.required.traffic.type'))
=== -1) {
+ this.errorList.push(this.$t('message.required.traffic.type'))
+ }
}
})
+ if (countPhysicalNetworkWithoutTags > 1) {
+
this.errorList.push(this.$t('message.required.tagged.physical.network'))
+ isValid = false
+ }
return isValid
},
handleSubmit (e) {
