From f80a9ca482367a2334794cd2743849c78e1c94e3 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Fri, 29 Aug 2025 03:06:03 -0400 Subject: [PATCH 1/4] UI: Prevent restriction of changeOfferingForVolume API to Admin role (#11466) --- ui/src/config/section/storage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/config/section/storage.js b/ui/src/config/section/storage.js index a869dfb6e80..5c2a6868646 100644 --- a/ui/src/config/section/storage.js +++ b/ui/src/config/section/storage.js @@ -226,7 +226,7 @@ export default { label: 'label.change.offering.for.volume', args: ['id', 'diskofferingid', 'size', 'miniops', 'maxiops', 'automigrate'], dataView: true, - show: (record, store) => { return ['Allocated', 'Ready'].includes(record.state) && ['Admin'].includes(store.userInfo.roletype) }, + show: (record, store) => { return ['Allocated', 'Ready'].includes(record.state) }, popup: true, component: shallowRef(defineAsyncComponent(() => import('@/views/storage/ChangeOfferingForVolume.vue'))) }, From 05e7a257ca5eb3bfb15225948f270288b857fdba Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 29 Aug 2025 09:21:33 +0200 Subject: [PATCH 2/4] VPC VR: return UNKNOWN redundant state if no guest nics (#11518) * VPC VR: return UNKNOWN redundant state if no guest nics --- systemvm/debian/opt/cloud/bin/checkrouter.sh | 22 +++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/systemvm/debian/opt/cloud/bin/checkrouter.sh b/systemvm/debian/opt/cloud/bin/checkrouter.sh index c3a73e9e5e3..f127187ceb4 100755 --- a/systemvm/debian/opt/cloud/bin/checkrouter.sh +++ b/systemvm/debian/opt/cloud/bin/checkrouter.sh @@ -18,13 +18,33 @@ STATUS=UNKNOWN +get_guest_nics() { + python3 -c " +import json +data = json.load(open('/etc/cloudstack/ips.json')) +for nic, objs in data.items(): + if isinstance(objs, list): + for obj in objs: + if obj.get('nw_type') == 'guest' and obj.get('add'): + print(nic) + " +} + +ROUTER_TYPE=$(cat /etc/cloudstack/cmdline.json | grep type | awk '{print $2;}' | sed -e 's/[,\"]//g') +if [ "$ROUTER_TYPE" = "vpcrouter" ];then + GUEST_NICS=$(get_guest_nics) + if [ "$GUEST_NICS" = "" ];then + echo "Status: ${STATUS}" + exit + fi +fi + if [ "$(systemctl is-active keepalived)" != "active" ] then echo "Status: FAULT" exit fi -ROUTER_TYPE=$(cat /etc/cloudstack/cmdline.json | grep type | awk '{print $2;}' | sed -e 's/[,\"]//g') if [ "$ROUTER_TYPE" = "router" ] then ROUTER_STATE=$(ip -4 addr show dev eth0 | grep inet | wc -l | xargs bash -c 'if [ $0 == 2 ]; then echo "PRIMARY"; else echo "BACKUP"; fi') From ba7ec8865049794dc5a0c8beddfcd43de497c7bc Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 29 Aug 2025 11:39:50 +0200 Subject: [PATCH 3/4] SG: Apply rules for both ipv4/ipv6 of VMs with associated account/SG (#11243) --- .../com/cloud/network/security/SecurityGroupVMMapVO.java | 7 +++++++ .../cloud/network/security/SecurityGroupManagerImpl.java | 3 +++ .../cloud/network/security/SecurityGroupManagerImpl2.java | 3 +++ 3 files changed, 13 insertions(+) diff --git a/engine/schema/src/main/java/com/cloud/network/security/SecurityGroupVMMapVO.java b/engine/schema/src/main/java/com/cloud/network/security/SecurityGroupVMMapVO.java index d12b9f9443f..59699cba1d4 100644 --- a/engine/schema/src/main/java/com/cloud/network/security/SecurityGroupVMMapVO.java +++ b/engine/schema/src/main/java/com/cloud/network/security/SecurityGroupVMMapVO.java @@ -50,6 +50,9 @@ public class SecurityGroupVMMapVO implements InternalIdentity { @Column(name = "ip4_address", table = "nics", insertable = false, updatable = false) private String guestIpAddress; + @Column(name = "ip6_address", table = "nics", insertable = false, updatable = false) + private String guestIpv6Address; + @Column(name = "state", table = "vm_instance", insertable = false, updatable = false) private State vmState; @@ -77,6 +80,10 @@ public class SecurityGroupVMMapVO implements InternalIdentity { return guestIpAddress; } + public String getGuestIpv6Address() { + return guestIpv6Address; + } + public long getInstanceId() { return instanceId; } diff --git a/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl.java index 5d4b4737cbe..585975e7898 100644 --- a/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl.java +++ b/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl.java @@ -354,6 +354,9 @@ public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGro String cidr = defaultNic.getIPv4Address(); cidr = cidr + "/32"; cidrs.add(cidr); + if (defaultNic.getIPv6Address() != null) { + cidrs.add(defaultNic.getIPv6Address() + "/64"); + } } } } else if (rule.getAllowedSourceIpCidr() != null) { diff --git a/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl2.java b/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl2.java index b75c39560cf..b8be55c4048 100644 --- a/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl2.java +++ b/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl2.java @@ -250,6 +250,9 @@ public class SecurityGroupManagerImpl2 extends SecurityGroupManagerImpl { //did a join with the nics table String cidr = ngmapVO.getGuestIpAddress() + "/32"; cidrs.add(cidr); + if (ngmapVO.getGuestIpv6Address() != null) { + cidrs.add(ngmapVO.getGuestIpv6Address() + "/64"); + } } } else if (rule.getAllowedSourceIpCidr() != null) { cidrs.add(rule.getAllowedSourceIpCidr()); From 3109e0080e5a551635669eff58bcfe650a2635dc Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Fri, 29 Aug 2025 05:47:09 -0400 Subject: [PATCH 4/4] Add response object required by go SDK for parsing response (#10152) --- .../org/apache/cloudstack/response/VmMetricsStatsResponse.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/metrics/src/main/java/org/apache/cloudstack/response/VmMetricsStatsResponse.java b/plugins/metrics/src/main/java/org/apache/cloudstack/response/VmMetricsStatsResponse.java index 33dc51de870..0205ddc686a 100644 --- a/plugins/metrics/src/main/java/org/apache/cloudstack/response/VmMetricsStatsResponse.java +++ b/plugins/metrics/src/main/java/org/apache/cloudstack/response/VmMetricsStatsResponse.java @@ -40,7 +40,7 @@ public class VmMetricsStatsResponse extends BaseResponse { private String displayName; @SerializedName("stats") - @Param(description = "the list of VM stats") + @Param(description = "the list of VM stats", responseObject = StatsResponse.class) private List stats; public void setId(String id) {