speedup iptables setup

agent/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.2-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
   <dependencies>
     <dependency>

api/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.2-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
   <dependencies>
     <dependency>

api/src/com/cloud/network/guru/NetworkGuruAdditionalFunctions.java

@@ -0,0 +1,28 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.network.guru;
+
+import java.util.Map;
+
+public interface NetworkGuruAdditionalFunctions {
+
+    public static final String NSX_LSWITCH_UUID = "logicalswitch";
+    public static final String NSX_LSWITCHPORT_UUID = "logicalswitchport";
+
+    void finalizeNetworkDesign(long networkId, String vlanIdAsUUID);
+    Map<String, ? extends Object> listAdditionalNicParams(String nicUuid);
+}

api/src/com/cloud/vm/VmDetailConstants.java

@@ -19,7 +19,7 @@
 public interface VmDetailConstants {
     public static final String KEYBOARD = "keyboard";
     public static final String NIC_ADAPTER = "nicAdapter";
-    public static final String ROOK_DISK_CONTROLLER = "rootDiskController";
+    public static final String ROOT_DISK_CONTROLLER = "rootDiskController";
     public static final String NESTED_VIRTUALIZATION_FLAG = "nestedVirtualizationFlag";
     public static final String HYPERVISOR_TOOLS_VERSION = "hypervisortoolsversion";
     public static final String DATA_DISK_CONTROLLER = "dataDiskController";

api/src/com/cloud/vm/VmStats.java

@@ -32,4 +32,10 @@ public interface VmStats {
 
     public double getDiskWriteKBs();
 
+    public double getMemoryKBs();
+
+    public double getIntFreeMemoryKBs();
+
+    public double getTargetMemoryKBs();
+
 }

api/src/org/apache/cloudstack/api/ApiConstants.java

@@ -499,6 +499,7 @@ public class ApiConstants {
     public static final String NICIRA_NVP_TRANSPORT_ZONE_UUID = "transportzoneuuid";
     public static final String NICIRA_NVP_DEVICE_NAME = "niciradevicename";
     public static final String NICIRA_NVP_GATEWAYSERVICE_UUID = "l3gatewayserviceuuid";
+    public static final String NICIRA_NVP_L2_GATEWAYSERVICE_UUID = "l2gatewayserviceuuid";
     public static final String S3_ACCESS_KEY = "accesskey";
     public static final String S3_SECRET_KEY = "secretkey";
     public static final String S3_END_POINT = "endpoint";

api/src/org/apache/cloudstack/api/command/user/snapshot/RevertSnapshotCmd.java

@@ -36,7 +36,7 @@
 import com.cloud.storage.Snapshot;
 import com.cloud.user.Account;
 
-@APICommand(name = "revertSnapshot", description = "revert a volume snapshot.", responseObject = SnapshotResponse.class, entityType = {Snapshot.class},
+@APICommand(name = "revertSnapshot", description = "This is supposed to revert a volume snapshot. This command is only supported with KVM so far", responseObject = SnapshotResponse.class, entityType = {Snapshot.class},
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class RevertSnapshotCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(RevertSnapshotCmd.class.getName());

api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java

@@ -474,7 +474,7 @@ public void execute() {
             response.setResponseName(getCommandName());
             setResponseObject(response);
         } else {
-            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to deploy vm");
+            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to deploy vm uuid:"+getEntityUuid());
         }
     }
 
@@ -556,7 +556,7 @@ public void create() throws ResourceAllocationException {
             VirtualMachineTemplate template = _entityMgr.findById(VirtualMachineTemplate.class, templateId);
             // Make sure a valid template ID was specified
             if (template == null) {
-                throw new InvalidParameterValueException("Unable to use template " + templateId);
+                throw new InvalidParameterValueException("Unable to find the template " + templateId);
             }
 
             DiskOffering diskOffering = null;

api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java

@@ -51,7 +51,7 @@ public class CreateVpnCustomerGatewayCmd extends BaseAsyncCmd {
     @Parameter(name = ApiConstants.CIDR_LIST, type = CommandType.STRING, required = true, description = "guest cidr list of the customer gateway")
     private String peerCidrList;
 
-    @Parameter(name = ApiConstants.IPSEC_PSK, type = CommandType.STRING, required = true, description = "IPsec Preshared-Key of the customer gateway")
+    @Parameter(name = ApiConstants.IPSEC_PSK, type = CommandType.STRING, required = true, description = "IPsec Preshared-Key of the customer gateway. Cannot contain newline or double quotes.")
     private String ipsecPsk;
 
     @Parameter(name = ApiConstants.IKE_POLICY, type = CommandType.STRING, required = true, description = "IKE policy of the customer gateway")

api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java

@@ -57,7 +57,7 @@ public class UpdateVpnCustomerGatewayCmd extends BaseAsyncCmd {
     @Parameter(name = ApiConstants.CIDR_LIST, type = CommandType.STRING, required = true, description = "guest cidr of the customer gateway")
     private String guestCidrList;
 
-    @Parameter(name = ApiConstants.IPSEC_PSK, type = CommandType.STRING, required = true, description = "IPsec Preshared-Key of the customer gateway")
+    @Parameter(name = ApiConstants.IPSEC_PSK, type = CommandType.STRING, required = true, description = "IPsec Preshared-Key of the customer gateway. Cannot contain newline or double quotes.")
     private String ipsecPsk;
 
     @Parameter(name = ApiConstants.IKE_POLICY, type = CommandType.STRING, required = true, description = "IKE policy of the customer gateway")

api/src/org/apache/cloudstack/api/response/NicResponse.java

@@ -102,6 +102,14 @@ public class NicResponse extends BaseResponse {
     @Param(description = "Id of the vm to which the nic belongs")
     private String vmId;
 
+    @SerializedName("nsxlogicalswitch")
+    @Param(description = "Id of the NSX Logical Switch (if NSX based), null otherwise", since="4.6.0")
+    private String nsxLogicalSwitch;
+
+    @SerializedName("nsxlogicalswitchport")
+    @Param(description = "Id of the NSX Logical Switch Port (if NSX based), null otherwise", since="4.6.0")
+    private String nsxLogicalSwitchPort;
+
     public void setVmId(String vmId) {
         this.vmId = vmId;
     }
@@ -205,4 +213,12 @@ public void setSecondaryIps(List<NicSecondaryIpResponse> ipList) {
         this.secondaryIps = ipList;
     }
 
+    public void setNsxLogicalSwitch(String nsxLogicalSwitch) {
+        this.nsxLogicalSwitch = nsxLogicalSwitch;
+    }
+
+    public void setNsxLogicalSwitchPort(String nsxLogicalSwitchPort) {
+        this.nsxLogicalSwitchPort = nsxLogicalSwitchPort;
+    }
+
 }

api/src/org/apache/cloudstack/api/response/UserVmResponse.java

@@ -196,6 +196,18 @@ public class UserVmResponse extends BaseResponse implements ControlledEntityResp
     @Param(description = "the write (bytes) of disk on the vm")
     private Long diskKbsWrite;
 
+    @SerializedName("memorykbs")
+    @Param(description = "the memory used by the vm")
+    private Long memoryKBs;
+
+    @SerializedName("memoryintfreekbs")
+    @Param(description = "the internal memory thats free in vm")
+    private Long memoryIntFreeKBs;
+
+    @SerializedName("memorytargetkbs")
+    @Param(description = "the target memory in vm")
+    private Long memoryTargetKBs;
+
     @SerializedName("diskioread")
     @Param(description = "the read (io) of disk on the vm")
     private Long diskIORead;
@@ -466,6 +478,18 @@ public Long getDiskKbsWrite() {
         return diskKbsWrite;
     }
 
+    public Long getMemoryKBs() {
+        return memoryKBs;
+    }
+
+    public Long getMemoryIntFreeKBs() {
+        return memoryIntFreeKBs;
+    }
+
+    public Long getMemoryTargetKBs() {
+        return memoryTargetKBs;
+    }
+
     public Long getDiskIORead() {
         return diskIORead;
     }
@@ -645,6 +669,18 @@ public void setDiskIORead(Long diskIORead) {
         this.diskIORead = diskIORead;
     }
 
+    public void setMemoryKBs(Long memoryKBs) {
+        this.memoryKBs = memoryKBs;
+    }
+
+    public void setMemoryIntFreeKBs(Long memoryIntFreeKBs) {
+        this.memoryIntFreeKBs = memoryIntFreeKBs;
+    }
+
+    public void setMemoryTargetKBs(Long memoryTargetKBs) {
+        this.memoryTargetKBs = memoryTargetKBs;
+    }
+
     public void setDiskIOWrite(Long diskIOWrite) {
         this.diskIOWrite = diskIOWrite;
     }

client/WEB-INF/classes/resources/messages.properties

@@ -942,6 +942,7 @@ label.nfs.storage=NFS Storage
 label.nfs=NFS
 label.nic.adapter.type=NIC adapter type
 label.nicira.controller.address=Controller Address
+label.nicira.l2gatewayserviceuuid=L2 Gateway Service Uuid
 label.nicira.l3gatewayserviceuuid=L3 Gateway Service Uuid
 label.nicira.transportzoneuuid=Transport Zone Uuid
 label.brocade.vcs.address=Vcs Switch Address

client/pom.xml

@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.2-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
   <dependencies>
     <dependency>

core/pom.xml

@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.2-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
   <dependencies>
     <dependency>

core/src/com/cloud/agent/api/BackupSnapshotCommand.java

@@ -39,6 +39,7 @@ public class BackupSnapshotCommand extends SnapshotCommand {
     private S3TO s3;
     StorageFilerTO pool;
     private Long secHostId;
+    private String nfsVersion;
 
     protected BackupSnapshotCommand() {
 
@@ -107,4 +108,12 @@ public Long getSnapshotId() {
     public Long getSecHostId() {
         return secHostId;
     }
+
+    public String getNfsVersion() {
+        return nfsVersion;
+    }
+
+    public void setNfsVersion(String nfsVersion) {
+        this.nfsVersion = nfsVersion;
+    }
 }

core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java

@@ -28,6 +28,7 @@ public class CreatePrivateTemplateFromSnapshotCommand extends SnapshotCommand {
     private String origTemplateInstallPath;
     private Long newTemplateId;
     private String templateName;
+    private String nfsVersion;
 
     protected CreatePrivateTemplateFromSnapshotCommand() {
 
@@ -72,4 +73,12 @@ public Long getNewTemplateId() {
     public String getTemplateName() {
         return templateName;
     }
+
+    public String getNfsVersion() {
+        return nfsVersion;
+    }
+
+    public void setNfsVersion(String nfsVersion) {
+        this.nfsVersion = nfsVersion;
+    }
 }

core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java

@@ -32,6 +32,7 @@ public class CreatePrivateTemplateFromVolumeCommand extends SnapshotCommand {
     StorageFilerTO _primaryPool;
     // For XenServer
     private String _secondaryStorageUrl;
+    private String nfsVersion;
 
     public CreatePrivateTemplateFromVolumeCommand() {
     }
@@ -99,4 +100,12 @@ public Long getAccountId() {
     public void setTemplateId(long templateId) {
         _templateId = templateId;
     }
+
+    public String getNfsVersion() {
+        return nfsVersion;
+    }
+
+    public void setNfsVersion(String nfsVersion) {
+        this.nfsVersion = nfsVersion;
+    }
 }

core/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java

@@ -26,6 +26,8 @@
  */
 public class CreateVolumeFromSnapshotCommand extends SnapshotCommand {
 
+    private String nfsVersion;
+
     protected CreateVolumeFromSnapshotCommand() {
 
     }
@@ -50,4 +52,12 @@ public CreateVolumeFromSnapshotCommand(StoragePool pool, String secondaryStorage
         super(pool, secondaryStoragePoolURL, backedUpSnapshotUuid, backedUpSnapshotName, dcId, accountId, volumeId);
         setWait(wait);
     }
+
+    public String getNfsVersion() {
+        return nfsVersion;
+    }
+
+    public void setNfsVersion(String nfsVersion) {
+        this.nfsVersion = nfsVersion;
+    }
 }

core/src/com/cloud/agent/api/GetStorageStatsCommand.java

@@ -30,6 +30,7 @@ public class GetStorageStatsCommand extends Command {
     private StoragePoolType pooltype;
     private String secUrl;
     private DataStoreTO store;
+    private String nfsVersion;
 
     public String getSecUrl() {
         return secUrl;
@@ -54,6 +55,11 @@ public GetStorageStatsCommand(DataStoreTO store) {
         this.store = store;
     }
 
+    public GetStorageStatsCommand(DataStoreTO store, String nfsVersion) {
+        this.store = store;
+        this.nfsVersion = nfsVersion;
+    }
+
     public GetStorageStatsCommand(String secUrl) {
         this.secUrl = secUrl;
     }
@@ -81,6 +87,14 @@ public DataStoreTO getStore() {
         return this.store;
     }
 
+    public String getNfsVersion() {
+        return nfsVersion;
+    }
+
+    public void setNfsVersion(String nfsVersion) {
+        this.nfsVersion = nfsVersion;
+    }
+
     @Override
     public boolean executeInSequence() {
         return false;

core/src/com/cloud/agent/api/SecStorageSetupCommand.java

@@ -28,6 +28,7 @@ public class SecStorageSetupCommand extends Command {
     private String secUrl;
     private KeystoreManager.Certificates certs;
     private String postUploadKey;
+    private String nfsVersion;
 
 
     public SecStorageSetupCommand() {
@@ -74,4 +75,12 @@ public String getPostUploadKey() {
     public void setPostUploadKey(String postUploadKey) {
         this.postUploadKey = postUploadKey;
     }
+
+    public String getNfsVersion() {
+        return nfsVersion;
+    }
+
+    public void setNfsVersion(String nfsVersion) {
+        this.nfsVersion = nfsVersion;
+    }
 }