(cloudstack) 01/01: Merge branch '4.19' into 4.20

[dahn]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch 4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit bf1ff10a906ba8ab342f3a07661c97a37d8bc21c
Merge: d9a7b6e511b e278bcd08ac
Author: Daan Hoogland <d...@onecht.net>
AuthorDate: Wed Jan 15 17:51:31 2025 +0100

    Merge branch '4.19' into 4.20

 .../cloudstack/secondarystorage/SecondaryStorageManagerImpl.java | 9 ++++++---
 .../java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java    | 7 +++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --cc 
services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
index ec1e8a81979,94a8f367d08..dc6b042fc3a
--- 
a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
+++ 
b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
@@@ -400,10 -402,13 +400,13 @@@ public class SecondaryStorageManagerImp
          }
          String[] cidrs = _allowedInternalSites.split(",");
          for (String cidr : cidrs) {
-             if (NetUtils.isValidIp4Cidr(cidr) || NetUtils.isValidIp4(cidr) || 
!cidr.startsWith("0.0.0.0")) {
-                 if (NetUtils.getCleanIp4Cidr(cidr).equals(cidr)) {
-                     logger.warn(String.format("Invalid CIDR %s in %s", cidr, 
SecStorageAllowedInternalDownloadSites.key()));
+             if (NetUtils.isValidIp4Cidr(cidr) && !cidr.startsWith("0.0.0.0")) 
{
+                 if (! NetUtils.getCleanIp4Cidr(cidr).equals(cidr)) {
 -                    s_logger.warn(String.format("Invalid CIDR %s in %s", 
cidr, SecStorageAllowedInternalDownloadSites.key()));
++                    logger.warn("Invalid CIDR {} in {}", cidr, 
SecStorageAllowedInternalDownloadSites.key());
                  }
+                 allowedCidrs.add(NetUtils.getCleanIp4Cidr(cidr));
+             } else if (NetUtils.isValidIp4(cidr) && 
!cidr.startsWith("0.0.0.0")) {
 -                s_logger.warn(String.format("Ip address is not a valid CIDR; 
%s consider using %s/32", cidr, cidr));
++                logger.warn("Ip address is not a valid CIDR; {} consider 
using {}/32", cidr, cidr);
                  allowedCidrs.add(cidr);
              }
          }