This is an automated email from the ASF dual-hosted git repository.
nvazquez pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit b73f634ea61ca9ce60ab88a6bfb4b949bbbc1aab
Merge: 5baac44139d 6fbdda951ac
Author: nvazquez <nicovazque...@gmail.com>
AuthorDate: Tue Aug 6 12:39:13 2024 -0300
Merge branch '4.19'
.github/workflows/ci.yml | 1 +
.../cloudstack/api/response/ClusterResponse.java | 38 +++-
.../cloudstack/api/response/HostResponse.java | 82 +++++++-
.../api/response/ManagementServerResponse.java | 4 +
.../api/response/StoragePoolResponse.java | 12 ++
.../cloudstack/api/response/UserVmResponse.java | 4 +
.../cloudstack/api/response/VolumeResponse.java | 18 +-
.../cloudstack/api/response/ZoneResponse.java | 30 ++-
.../storage/snapshot/DefaultSnapshotStrategy.java | 7 +-
.../cluster/KubernetesClusterManagerImpl.java | 3 +-
.../src/main/java/com/cloud/acl/DomainChecker.java | 68 +++++--
.../main/java/com/cloud/api/ApiResponseHelper.java | 2 +-
.../cloud/api/query/dao/DataCenterJoinDaoImpl.java | 2 +-
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 4 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 209 ++++++++++-----------
.../java/com/cloud/user/AccountManagerImpl.java | 18 +-
.../test/java/com/cloud/acl/DomainCheckerTest.java | 166 ++++++++++++++++
.../com/cloud/user/AccountManagerImplTest.java | 59 ++++++
test/integration/smoke/test_account_access.py | 198 +++++++++++++++++++
ui/public/locales/en.json | 1 +
ui/src/components/view/ListView.vue | 8 +-
ui/src/components/view/stats/ResourceStatsInfo.vue | 3 +-
ui/src/views/compute/KubernetesServiceTab.vue | 4 +-
23 files changed, 763 insertions(+), 178 deletions(-)
diff --cc
engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategy.java
index 7e902bc61fe,333272113bd..afc8be1e5f9
---
a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategy.java
+++
b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategy.java
@@@ -245,9 -248,9 +246,9 @@@ public class DefaultSnapshotStrategy ex
}
snapshot = parent;
- }
+ } while (snapshot != null &&
snapshotStatesAbleToDeleteSnapshot.contains(snapshot.getState()));
} catch (Exception e) {
- s_logger.error(String.format("Failed to delete snapshot [%s] on
storage [%s] due to [%s].", snapshotTo, storageToString, e.getMessage()), e);
+ logger.error(String.format("Failed to delete snapshot [%s] on
storage [%s] due to [%s].", snapshotTo, storageToString, e.getMessage()), e);
}
return result;
}
diff --cc server/src/main/java/com/cloud/network/NetworkServiceImpl.java
index dd788aee5d2,c58463ac708..3d392b00570
--- a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
@@@ -34,9 -34,9 +34,10 @@@ import java.util.HashMap
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.UUID;
+ import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
diff --cc server/src/test/java/com/cloud/user/AccountManagerImplTest.java
index e5c623ca6df,5ec453af485..9d780096abf
--- a/server/src/test/java/com/cloud/user/AccountManagerImplTest.java
+++ b/server/src/test/java/com/cloud/user/AccountManagerImplTest.java
@@@ -22,12 -20,12 +22,14 @@@ import java.net.InetAddress
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.HashMap;
-import org.apache.cloudstack.acl.ControlledEntity;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
+import org.apache.cloudstack.api.command.admin.user.DeleteUserCmd;
++
++import org.apache.cloudstack.acl.ControlledEntity;
import org.apache.cloudstack.api.command.admin.user.GetUserKeysCmd;
import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd;
import
org.apache.cloudstack.api.response.UserTwoFactorAuthenticationSetupResponse;
