This is an automated email from the ASF dual-hosted git repository. nvazquez pushed a commit to branch 4.22 in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit dfaae63a461b919ea8ee806ed1dec6acc4867ae7 Merge: 99f348e0f94 376c1b40174 Author: nvazquez <[email protected]> AuthorDate: Mon Oct 19 11:37:40 2026 -0300 Merge branch '4.20' into 4.22 .../cloud/configuration/dao/ResourceLimitDao.java | 11 + .../configuration/dao/ResourceLimitDaoImpl.java | 31 +++ plugins/hypervisors/kvm/pom.xml | 36 +++ .../network/security/SecurityGroupManagerImpl.java | 2 +- .../security/SecurityGroupManagerImpl2.java | 2 +- .../resourcelimit/ResourceLimitManagerImpl.java | 153 +++++++++++- .../SecurityGroupManagerImpl2Ipv6RuleTest.java | 82 +++++++ .../SecurityGroupManagerImplIpv6RuleTest.java | 90 ++++++++ .../ResourceLimitManagerImplTest.java | 256 +++++++++++++++++++++ 9 files changed, 660 insertions(+), 3 deletions(-) diff --cc plugins/hypervisors/kvm/pom.xml index 965856ec03e,c72e0c67b4a..3f3d34f740d --- a/plugins/hypervisors/kvm/pom.xml +++ b/plugins/hypervisors/kvm/pom.xml @@@ -107,11 -137,13 +137,17 @@@ <artifactId>cloud-plugin-storage-volume-scaleio</artifactId> <version>${project.version}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxrs</artifactId> + </exclusion> + </exclusions> </dependency> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + </dependency> </dependencies> <build> <plugins> diff --cc server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java index a79b074685d,210c70e607a..d002133a986 --- a/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java +++ b/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java @@@ -20,8 -20,8 +20,9 @@@ import static com.cloud.utils.NumbersUt import java.util.ArrayList; import java.util.Arrays; + import java.util.Collections; import java.util.Date; +import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; diff --cc server/src/test/java/com/cloud/resourcelimit/ResourceLimitManagerImplTest.java index b7d3a4d0f4c,78d69365abb..881e68f49f0 --- a/server/src/test/java/com/cloud/resourcelimit/ResourceLimitManagerImplTest.java +++ b/server/src/test/java/com/cloud/resourcelimit/ResourceLimitManagerImplTest.java @@@ -22,12 -19,13 +22,15 @@@ import static org.mockito.Mockito.when import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Arrays; +import java.util.EnumSet; + import java.util.Collections; import java.util.HashMap; + import java.util.HashSet; import java.util.List; import java.util.Map; + import java.util.Set; +import org.apache.cloudstack.api.ApiCommandResourceType; import org.apache.cloudstack.api.response.AccountResponse; import org.apache.cloudstack.api.response.DomainResponse; import org.apache.cloudstack.api.response.TaggedResourceLimitAndCountResponse;
