code review changes, ip address fix

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Author: shwstppr

api/src/main/java/com/cloud/vm/UserVmService.java

@@ -16,7 +16,6 @@
 // under the License.
 package com.cloud.vm;
 
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -514,8 +513,8 @@ UserVm upgradeVirtualMachine(ScaleVMCmd cmd) throws ResourceUnavailableException
 
     void collectVmNetworkStatistics (UserVm userVm);
 
-    UserVm importVM(final DataCenter zone, final Host host, final VirtualMachineTemplate template, final String hostName, final String displayName, final Account owner, final String userData, final Account caller, final Boolean isDisplayVm, final String keyboard,
-                    final long accountId, final long userId, final ServiceOffering serviceOffering, final DiskOffering rootDiskOffering, final String sshPublicKey, final LinkedHashMap<String, NicProfile> networkNicMap,
-                    final String instanceName, final HypervisorType hypervisorType, final Map<String, String> customParameters, final VirtualMachine.PowerState powerState) throws InsufficientCapacityException;
+    UserVm importVM(final DataCenter zone, final Host host, final VirtualMachineTemplate template, final String instanceName, final String displayName, final Account owner, final String userData, final Account caller, final Boolean isDisplayVm, final String keyboard,
+                    final long accountId, final long userId, final ServiceOffering serviceOffering, final DiskOffering rootDiskOffering, final String sshPublicKey,
+                    final String hostName, final HypervisorType hypervisorType, final Map<String, String> customParameters, final VirtualMachine.PowerState powerState) throws InsufficientCapacityException;
 
 }

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

@@ -229,6 +229,8 @@ public class ApiConstants {
     public static final String NETMASK = "netmask";
     public static final String NEW_NAME = "newname";
     public static final String NIC = "nic";
+    public static final String NIC_NETWORK_LIST = "nicnetworklist";
+    public static final String NIC_IP_ADDRESS_LIST = "nicipaddresslist";
     public static final String NUM_RETRIES = "numretries";
     public static final String OFFER_HA = "offerha";
     public static final String IS_SYSTEM_OFFERING = "issystem";

api/src/main/java/org/apache/cloudstack/api/command/admin/ingestion/ImportUnmanageInstanceCmd.java

@@ -24,6 +24,7 @@
 
 import javax.inject.Inject;
 
+import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.ACL;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
@@ -39,7 +40,7 @@
 import org.apache.cloudstack.api.response.TemplateResponse;
 import org.apache.cloudstack.api.response.UserVmResponse;
 import org.apache.cloudstack.context.CallContext;
-import org.apache.cloudstack.ingestion.VmImportService;
+import org.apache.cloudstack.vm.VmImportService;
 import org.apache.log4j.Logger;
 
 import com.cloud.event.EventTypes;
@@ -54,13 +55,16 @@
 import com.cloud.offering.ServiceOffering;
 import com.cloud.org.Cluster;
 import com.cloud.user.Account;
+import com.cloud.utils.net.NetUtils;
+import com.google.common.base.Strings;
 
 @APICommand(name = ImportUnmanageInstanceCmd.API_NAME,
         description = "Import unmanaged virtual machine from a given cluster.",
         responseObject = UserVmResponse.class,
         responseView = ResponseObject.ResponseView.Full,
         requestHasSensitiveInfo = false,
-        responseHasSensitiveInfo = true)
+        responseHasSensitiveInfo = true,
+        authorized = {RoleType.Admin})
 public class ImportUnmanageInstanceCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(ImportUnmanageInstanceCmd.class);
     public static final String API_NAME = "importUnmanagedInstance";
@@ -136,11 +140,16 @@ public class ImportUnmanageInstanceCmd extends BaseAsyncCmd {
             description = "the ID of the root disk offering for the virtual machine")
     private Long diskOfferingId;
 
-    @Parameter(name = "nicnetworklist",
+    @Parameter(name = ApiConstants.NIC_NETWORK_LIST,
             type = CommandType.MAP,
             description = "VM nic to network id mapping")
     private Map nicNetworkList;
 
+    @Parameter(name = ApiConstants.NIC_IP_ADDRESS_LIST,
+            type = CommandType.MAP,
+            description = "VM nic to ip address mapping")
+    private Map nicIpAddressList;
+
     @Parameter(name = ApiConstants.DATADISK_OFFERING_LIST,
             type = CommandType.MAP,
             description = "datadisk template to disk-offering mapping")
@@ -214,6 +223,25 @@ public Map<String, Long> getNicNetworkList() {
         return nicNetworkMap;
     }
 
+    public Map<String, String> getNicIpAddressList() {
+        Map<String, String> nicIpAddressMap = new HashMap<>();
+        if (nicIpAddressList != null && !nicIpAddressList.isEmpty()) {
+            Collection parameterCollection = nicIpAddressList.values();
+            Iterator iter = parameterCollection.iterator();
+            while (iter.hasNext()) {
+                HashMap<String, String> value = (HashMap<String, String>)iter.next();
+                String nic = value.get("nic");
+                String ipAddress = value.get("ipAddress");
+                if (!Strings.isNullOrEmpty(ipAddress) && NetUtils.isValidIp4(ipAddress)) {
+                    nicIpAddressMap.put(nic, ipAddress);
+                } else {
+                    throw new InvalidParameterValueException(String.format("IP Address: %s for NIC ID: %s is invalid", ipAddress, nic));
+                }
+            }
+        }
+        return nicIpAddressMap;
+    }
+
     public Map<String, Long> getDataDiskToDiskOfferingList() {
         Map<String, Long> dataDiskToDiskOfferingMap = new HashMap<>();
         if (dataDiskToDiskOfferingList != null && !dataDiskToDiskOfferingList.isEmpty()) {

api/src/main/java/org/apache/cloudstack/api/command/admin/ingestion/ListUnmanagedInstancesCmd.java

@@ -19,6 +19,7 @@
 
 import javax.inject.Inject;
 
+import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseAsyncCmd;
@@ -30,8 +31,8 @@
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.api.response.UnmanagedInstanceResponse;
 import org.apache.cloudstack.context.CallContext;
-import org.apache.cloudstack.ingestion.UnmanagedInstance;
-import org.apache.cloudstack.ingestion.VmImportService;
+import org.apache.cloudstack.vm.UnmanagedInstance;
+import org.apache.cloudstack.vm.VmImportService;
 import org.apache.log4j.Logger;
 
 import com.cloud.exception.ConcurrentOperationException;
@@ -46,7 +47,9 @@
         responseObject = UnmanagedInstanceResponse.class,
         responseView = ResponseObject.ResponseView.Full,
         entityType = {UnmanagedInstance.class},
-        requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
+        requestHasSensitiveInfo = false,
+        responseHasSensitiveInfo = true,
+        authorized = {RoleType.Admin})
 public class ListUnmanagedInstancesCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListUnmanagedInstancesCmd.class.getName());
     public static final String API_NAME = "listUnmanagedInstances";

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

@@ -23,7 +23,7 @@
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
-import org.apache.cloudstack.ingestion.UnmanagedInstance;
+import org.apache.cloudstack.vm.UnmanagedInstance;
 
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;

…udstack/ingestion/UnmanagedInstance.java …che/cloudstack/vm/UnmanagedInstance.javaapi/src/main/java/org/apache/cloudstack/ingestion/UnmanagedInstance.java renamed to api/src/main/java/org/apache/cloudstack/vm/UnmanagedInstance.java api/src/main/java/org/apache/cloudstack/ingestion/UnmanagedInstance.java renamed to api/src/main/java/org/apache/cloudstack/vm/UnmanagedInstance.java

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.cloudstack.ingestion;
+package org.apache.cloudstack.vm;
 
 import java.util.List;
 

…loudstack/ingestion/VmImportService.java …pache/cloudstack/vm/VmImportService.javaapi/src/main/java/org/apache/cloudstack/ingestion/VmImportService.java renamed to api/src/main/java/org/apache/cloudstack/vm/VmImportService.java api/src/main/java/org/apache/cloudstack/ingestion/VmImportService.java renamed to api/src/main/java/org/apache/cloudstack/vm/VmImportService.java

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.cloudstack.ingestion;
+package org.apache.cloudstack.vm;
 
 import org.apache.cloudstack.api.command.admin.ingestion.ImportUnmanageInstanceCmd;
 import org.apache.cloudstack.api.command.admin.ingestion.ListUnmanagedInstancesCmd;

core/src/main/java/com/cloud/agent/api/GetUnmanagedInstancesAnswer.java

@@ -19,7 +19,7 @@
 
 import java.util.HashMap;
 
-import org.apache.cloudstack.ingestion.UnmanagedInstance;
+import org.apache.cloudstack.vm.UnmanagedInstance;
 
 @LogLevel(LogLevel.Log4jLevel.Trace)
 public class GetUnmanagedInstancesAnswer extends Answer {

engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java

@@ -314,5 +314,5 @@ void implementNetworkElementsAndResources(DeployDestination dest, ReservationCon
      */
     void cleanupNicDhcpDnsEntry(Network network, VirtualMachineProfile vmProfile, NicProfile nicProfile);
 
-    Pair<NicProfile, Integer> importNic(final String macAddress, int deviceId, final Network network, final Boolean isDefaultNic, final VirtualMachine vm);
+    Pair<NicProfile, Integer> importNic(final String macAddress, int deviceId, final Network network, final Boolean isDefaultNic, final VirtualMachine vm, final String ipAddress);
 }

engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java

@@ -128,6 +128,23 @@ DiskProfile allocateTemplatedVolume(Type type, String name, DiskOffering offerin
 
     void updateVolumeDiskChain(long volumeId, String path, String chainInfo);
 
+    /**
+     * Imports an existing volume for a VM into database. Useful while ingesting an unmanaged VM.
+     * @param type Type of the volume - ROOT, DATADISK, etc
+     * @param name Name of the volume
+     * @param offering DiskOffering for the volume
+     * @param size DiskOffering for the volume
+     * @param minIops minimum IOPS for the disk, if not passed DiskOffering value will be used
+     * @param maxIops maximum IOPS for the disk, if not passed DiskOffering value will be used
+     * @param vm VirtualMachine this volume is attached to
+     * @param template Template of the VM of the volume
+     * @param owner owner Account for the volume
+     * @param deviceId device ID of the virtual disk
+     * @param poolId ID of pool in which volume is stored
+     * @param path image path of the volume
+     * @param chainInfo chain info for the volume. Hypervisor specific.
+     * @return  DiskProfile of imported volume
+     */
     DiskProfile importVolume(Type type, String name, DiskOffering offering, Long size, Long minIops, Long maxIops, VirtualMachine vm, VirtualMachineTemplate template,
                              Account owner, Long deviceId, Long poolId, String path, String chainInfo);
 }