Skip to content

Commit 1816aa5

Browse files
committed
kvm, ui: fix interface when using vlan subnet for storage traffic type
Fixes #7816 Signed-off-by: Abhishek Kumar <[email protected]>
1 parent 6e19c07 commit 1816aa5

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,14 @@ public LibvirtVMDef.InterfaceDef plug(NicTO nic, String guestOsType, String nicA
252252
intf.defBridgeNet(_bridges.get("private"), null, nic.getMac(), getGuestNicModel(guestOsType, nicAdapter));
253253
} else if (nic.getType() == Networks.TrafficType.Storage) {
254254
String storageBrName = nic.getName() == null ? _bridges.get("private") : nic.getName();
255+
if (nic.getBroadcastType() == Networks.BroadcastDomainType.Storage) {
256+
vNetId = Networks.BroadcastDomainType.getValue(nic.getBroadcastUri());
257+
protocol = Networks.BroadcastDomainType.Vlan.scheme();
258+
}
259+
if (isValidProtocolAndVnetId(vNetId, protocol)) {
260+
s_logger.debug("creating a vNet dev and bridge for public traffic per traffic label {}" + trafficLabel);
261+
storageBrName = createVnetBr(vNetId, storageBrName, protocol);
262+
}
255263
intf.defBridgeNet(storageBrName, null, nic.getMac(), getGuestNicModel(guestOsType, nicAdapter));
256264
}
257265
if (nic.getPxeDisable()) {

ui/src/views/infra/network/IpRangesTabStorage.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ export default {
166166
},
167167
{
168168
title: this.$t('label.vlan'),
169-
dataIndex: 'vlanid'
169+
dataIndex: 'vlan'
170170
},
171171
{
172172
title: this.$t('label.startip'),

0 commit comments

Comments
 (0)