This is an automated email from the ASF dual-hosted git repository.
Pearl1594 pushed a commit to branch 4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.20 by this push:
new 2cd8c5eddc7 Create bridge on dest host during SSVM migration when
using storage networks with dedicated vlan (#13379)
2cd8c5eddc7 is described below
commit 2cd8c5eddc700a15deca534b7dc079a9b038a2df
Author: Pearl Dsilva <[email protected]>
AuthorDate: Wed Sep 2 11:34:07 2026 -0400
Create bridge on dest host during SSVM migration when using storage
networks with dedicated vlan (#13379)
Co-authored-by: Pearl Dsilva <[email protected]>
---
.../java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
index b4f7fbd6dac..10793231da0 100644
---
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
+++
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
@@ -186,9 +186,16 @@ public class BridgeVifDriver extends VifDriverBase {
protected String createStorageVnetBridgeIfNeeded(NicTO nic, String
trafficLabel,
String storageBrName) throws InternalErrorException {
- if
(!Networks.BroadcastDomainType.Storage.equals(nic.getBroadcastType()) ||
nic.getBroadcastUri() == null) {
+ if (nic.getBroadcastUri() == null) {
return storageBrName;
}
+
+ boolean isStorageBroadcast =
Networks.BroadcastDomainType.Storage.equals(nic.getBroadcastType()) ||
+
Networks.BroadcastDomainType.Storage.equals(Networks.BroadcastDomainType.getSchemeValue(nic.getBroadcastUri()));
+ if (!isStorageBroadcast) {
+ return storageBrName;
+ }
+
String vNetId =
Networks.BroadcastDomainType.getValue(nic.getBroadcastUri());
String protocol = Networks.BroadcastDomainType.Vlan.scheme();
if (!isValidProtocolAndVnetId(vNetId, protocol)) {