apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.19' into 4.20

Browse Source
This commit is contained in:
Suresh Kumar Anaparti 2025-07-30 11:10:17 +05:30
commit 96ed9d47bc
No known key found for this signature in database
GPG Key ID: D7CEAE3A9E71D0AA
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -250,6 +250,15 @@ public class BridgeVifDriver extends VifDriverBase {
intf.defBridgeNet(_bridges.get("private"), null, nic.getMac(), getGuestNicModel(guestOsType, nicAdapter));
} else if (nic.getType() == Networks.TrafficType.Storage) {
String storageBrName = nic.getName() == null ? _bridges.get("private") : nic.getName();
if (nic.getBroadcastType() == Networks.BroadcastDomainType.Storage) {
vNetId = Networks.BroadcastDomainType.getValue(nic.getBroadcastUri());
protocol = Networks.BroadcastDomainType.Vlan.scheme();
}
if (isValidProtocolAndVnetId(vNetId, protocol)) {
s_logger.debug(String.format("creating a vNet dev and bridge for %s traffic per traffic label %s",
Networks.TrafficType.Storage.name(), trafficLabel));
storageBrName = createVnetBr(vNetId, storageBrName, protocol);
}
intf.defBridgeNet(storageBrName, null, nic.getMac(), getGuestNicModel(guestOsType, nicAdapter));
}
if (nic.getPxeDisable()) {

2
ui/src/views/compute/CreateAutoScaleVmGroup.vue
View File

@ -738,7 +738,7 @@
{{ $t('label.isadvanced') }}
<a-switch v-model:checked="showDetails" style="margin-left: 10px"/>
</span>
<div style="margin-top: 15px" v-show="showDetails">
<div style="margin-top: 15px" v-if="showDetails">
<a-form-item :label="$t('label.sshkeypairs')">
<ssh-key-pair-selection
:items="options.sshKeyPairs"

2
ui/src/views/infra/network/IpRangesTabStorage.vue
View File

@ -166,7 +166,7 @@ export default {
},
{
title: this.$t('label.vlan'),
dataIndex: 'vlanid'
dataIndex: 'vlan'
},
{
title: this.$t('label.startip'),