Merge branch 'main' into api-keypair-restructure

Author: KlausDornsbach

api/src/main/java/com/cloud/network/NetworkModel.java

@@ -149,7 +149,7 @@ public interface NetworkModel {
 
     boolean areServicesSupportedByNetworkOffering(long networkOfferingId, Service... services);
 
-    Network getNetworkWithSGWithFreeIPs(Long zoneId);
+    Network getNetworkWithSGWithFreeIPs(Account account, Long zoneId);
 
     Network getNetworkWithSecurityGroupEnabled(Long zoneId);
 
@@ -360,6 +360,6 @@ List<String[]> generateVmData(String userData, String userDataDetails, String se
 
     boolean isSecurityGroupSupportedForZone(Long zoneId);
 
-    boolean checkSecurityGroupSupportForNetwork(DataCenter zone, List<Long> networkIds,
+    boolean checkSecurityGroupSupportForNetwork(Account account, DataCenter zone, List<Long> networkIds,
                                                 List<Long> securityGroupsIds);
 }

api/src/main/java/com/cloud/user/AccountService.java

@@ -126,6 +126,8 @@ User createUser(String userName, String password, String firstName, String lastN
 
     void validateCallingUserHasAccessToDesiredUser(Long userId);
 
+    void validateAccountHasAccessToResource(Account account, AccessType accessType, Object resource);
+
     Long finalyzeAccountId(String accountName, Long domainId, Long projectId, boolean enabledOnly);
 
     /**

api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupScheduleCmd.java

@@ -82,7 +82,7 @@ public void execute() throws ResourceUnavailableException, InsufficientCapacityE
             List<BackupSchedule> schedules = backupManager.listBackupSchedule(getVmId());
             ListResponse<BackupScheduleResponse> response = new ListResponse<>();
             List<BackupScheduleResponse> scheduleResponses = new ArrayList<>();
-            if (CollectionUtils.isNullOrEmpty(schedules)) {
+            if (!CollectionUtils.isNullOrEmpty(schedules)) {
                 for (BackupSchedule schedule : schedules) {
                     scheduleResponses.add(_responseGenerator.createBackupScheduleResponse(schedule));
                 }

api/src/main/java/org/apache/cloudstack/api/command/user/storage/sharedfs/ChangeSharedFSServiceOfferingCmd.java

@@ -70,7 +70,7 @@ public class ChangeSharedFSServiceOfferingCmd extends BaseAsyncCmd implements Us
             type = CommandType.UUID,
             entityType = ServiceOfferingResponse.class,
             required = true,
-            description = "the offering to use for the shared filesystem vm")
+            description = "the offering to use for the shared filesystem instance")
     private Long serviceOfferingId;
 
     /////////////////////////////////////////////////////

api/src/main/java/org/apache/cloudstack/api/command/user/storage/sharedfs/CreateSharedFSCmd.java

@@ -130,7 +130,7 @@ public class CreateSharedFSCmd extends BaseAsyncCreateCmd implements UserCmd {
             type = CommandType.UUID,
             required = true,
             entityType = ServiceOfferingResponse.class,
-            description = "the service offering to use for the shared filesystem VM hosting the data. The offering should be HA enabled and the cpu count and memory size should be greater than equal to sharedfsvm.min.cpu.count and sharedfsvm.min.ram.size respectively")
+            description = "the service offering to use for the shared filesystem instance hosting the data. The offering should be HA enabled and the cpu count and memory size should be greater than equal to sharedfsvm.min.cpu.count and sharedfsvm.min.ram.size respectively")
     private Long serviceOfferingId;
 
     @Parameter(name = ApiConstants.FILESYSTEM,

api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java

@@ -129,11 +129,11 @@ public class CapabilitiesResponse extends BaseResponse {
     private Integer instancesDisksStatsRetentionTime;
 
     @SerializedName(ApiConstants.SHAREDFSVM_MIN_CPU_COUNT)
-    @Param(description = "the min CPU count for the service offering used by the shared filesystem VM", since = "4.20.0")
+    @Param(description = "the min CPU count for the service offering used by the shared filesystem instance", since = "4.20.0")
     private Integer sharedFsVmMinCpuCount;
 
     @SerializedName(ApiConstants.SHAREDFSVM_MIN_RAM_SIZE)
-    @Param(description = "the min Ram size for the service offering used by the shared filesystem VM", since = "4.20.0")
+    @Param(description = "the min Ram size for the service offering used by the shared filesystem instance", since = "4.20.0")
     private Integer sharedFsVmMinRamSize;
 
     public void setSecurityGroupsEnabled(boolean securityGroupsEnabled) {

api/src/main/java/org/apache/cloudstack/storage/sharedfs/SharedFS.java

@@ -64,7 +64,7 @@ public interface SharedFS extends ControlledEntity, Identity, InternalIdentity,
             null,
             SharedFSFeatureEnabled.key());
 
-    String SharedFSVmNamePrefix = "fsvm";
+    String SharedFSVmNamePrefix = "sharedfs";
     String SharedFSPath = "/export";
 
     enum FileSystemType {

client/pom.xml

@@ -27,18 +27,7 @@
         <artifactId>cloudstack</artifactId>
         <version>4.20.0.0-SNAPSHOT</version>
     </parent>
-    <repositories>
-        <repository>
-            <id>juniper-tungsten-api</id>
-            <url>https://github.com/radu-todirica/tungsten-api/raw/master</url>
-        </repository>
-    </repositories>
     <dependencies>
-        <dependency>
-            <groupId>net.juniper.tungsten</groupId>
-            <artifactId>juniper-tungsten-api</artifactId>
-            <version>2.0</version>
-        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
@@ -282,11 +271,6 @@
             <artifactId>cloud-plugin-network-ovs</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.cloudstack</groupId>
-            <artifactId>cloud-plugin-network-tungsten</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.cloudstack</groupId>
             <artifactId>cloud-plugin-network-elb</artifactId>
@@ -1113,6 +1097,11 @@
                     <artifactId>cloud-plugin-network-nsx</artifactId>
                     <version>${project.version}</version>
                 </dependency>
+                <dependency>
+                    <groupId>org.apache.cloudstack</groupId>
+                    <artifactId>cloud-plugin-network-tungsten</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
                 <dependency>
                     <groupId>org.apache.cloudstack</groupId>
                     <artifactId>cloud-plugin-api-vmware-sioc</artifactId>

core/src/main/java/com/cloud/network/HAProxyConfigurator.java

@@ -485,7 +485,7 @@ private List<String> getRulesForPool(final LoadBalancerTO lbTO, final boolean ke
         sb.append("\tbind ").append(publicIP).append(":").append(publicPort);
         result.add(sb.toString());
         sb = new StringBuilder();
-        sb.append("\t").append("balance ").append(algorithm);
+        sb.append("\t").append("balance ").append(algorithm.toLowerCase());
         result.add(sb.toString());
 
         int i = 0;

debian/control

@@ -3,7 +3,7 @@ Section: libs
 Priority: extra
 Maintainer: Wido den Hollander <[email protected]>
 Build-Depends: debhelper (>= 9), openjdk-17-jdk | java17-sdk | java17-jdk | zulu-17 | openjdk-11-jdk | java11-sdk | java11-jdk | zulu-11, genisoimage,
- python-mysql.connector | python3-mysql.connector, maven (>= 3) | maven3,
+ python-mysql.connector | python3-mysql.connector | mysql-connector-python-py3, maven (>= 3) | maven3,
  python (>= 2.7) | python2 (>= 2.7), python3 (>= 3), python-setuptools, python3-setuptools,
  nodejs (>= 12), lsb-release, dh-systemd | debhelper (>= 13)
 Standards-Version: 3.8.1
@@ -17,7 +17,7 @@ Description: A common package which contains files which are shared by several C
 
 Package: cloudstack-management
 Architecture: all
-Depends: ${python3:Depends}, openjdk-17-jre-headless | java17-runtime-headless | java17-runtime | zulu-17, cloudstack-common (= ${source:Version}), net-tools, sudo, python3-mysql.connector, augeas-tools, mysql-client | mariadb-client, adduser, bzip2, ipmitool, file, gawk, iproute2, qemu-utils, rng-tools, python3-dnspython, lsb-release, init-system-helpers (>= 1.14~), python3-setuptools
+Depends: ${python3:Depends}, openjdk-17-jre-headless | java17-runtime-headless | java17-runtime | zulu-17, cloudstack-common (= ${source:Version}), net-tools, sudo, python3-mysql.connector | mysql-connector-python-py3, augeas-tools, mysql-client | mariadb-client, adduser, bzip2, ipmitool, file, gawk, iproute2, qemu-utils, rng-tools, python3-dnspython, lsb-release, init-system-helpers (>= 1.14~), python3-setuptools
 Conflicts: cloud-server, cloud-client, cloud-client-ui
 Description: CloudStack server library
  The CloudStack management server