New Feature: Import VMware VMs into KVM

agent/conf/agent.properties

@@ -419,3 +419,6 @@ iscsi.session.cleanup.enabled=false
 
 # Timeout (in milliseconds) of the KVM heartbeat checker.
 # kvm.heartbeat.checker.timeout=360000
+
+# Instance Conversion from Vmware to KVM through virt-v2v. Enable verbose mode
+# virtv2v.verbose.enabled=false

agent/src/main/java/com/cloud/agent/properties/AgentProperties.java

@@ -733,6 +733,13 @@ public Property<Integer> getWorkers() {
      */
     public static final Property<Integer> IOTHREADS = new Property<>("iothreads", 1);
 
+    /**
+     * Enable verbose mode for virt-v2v Instance Conversion from Vmware to KVM
+     * Data type: Boolean.<br>
+     * Default value: <code>false</code>
+     */
+    public static final Property<Boolean> VIRTV2V_VERBOSE_ENABLED = new Property<>("virtv2v.verbose.enabled", false);
+
     /**
      * BGP controll CIDR
      * Data type: String.<br>

api/src/main/java/com/cloud/agent/api/to/RemoteInstanceTO.java

@@ -0,0 +1,88 @@
+/*
+ * 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.agent.api.to;
+
+import com.cloud.agent.api.LogLevel;
+import com.cloud.hypervisor.Hypervisor;
+
+import java.io.Serializable;
+
+public class RemoteInstanceTO implements Serializable {
+
+    private Hypervisor.HypervisorType hypervisorType;
+    private String hostName;
+    private String instanceName;
+
+    // Vmware Remote Instances parameters
+    // TODO: cloud.agent.transport.Request#getCommands() cannot handle gsoc decode for polymorphic classes
+    private String vcenterUsername;
+    @LogLevel(LogLevel.Log4jLevel.Off)
+    private String vcenterPassword;
+    private String vcenterHost;
+    private String datacenterName;
+    private String clusterName;
+
+    public RemoteInstanceTO() {
+    }
+
+    public RemoteInstanceTO(String hostName, String instanceName, String vcenterHost,
+                            String datacenterName, String clusterName,
+                            String vcenterUsername, String vcenterPassword) {
+        this.hypervisorType = Hypervisor.HypervisorType.VMware;
+        this.hostName = hostName;
+        this.instanceName = instanceName;
+        this.vcenterHost = vcenterHost;
+        this.datacenterName = datacenterName;
+        this.clusterName = clusterName;
+        this.vcenterUsername = vcenterUsername;
+        this.vcenterPassword = vcenterPassword;
+    }
+
+    public Hypervisor.HypervisorType getHypervisorType() {
+        return this.hypervisorType;
+    }
+
+    public String getInstanceName() {
+        return this.instanceName;
+    }
+
+    public String getHostName() {
+        return this.hostName;
+    }
+
+    public String getVcenterUsername() {
+        return vcenterUsername;
+    }
+
+    public String getVcenterPassword() {
+        return vcenterPassword;
+    }
+
+    public String getVcenterHost() {
+        return vcenterHost;
+    }
+
+    public String getDatacenterName() {
+        return datacenterName;
+    }
+
+    public String getClusterName() {
+        return clusterName;
+    }
+}

plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareDatacenter.java → api/src/main/java/com/cloud/dc/VmwareDatacenter.java

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package com.cloud.hypervisor.vmware;
+package com.cloud.dc;
 
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;

api/src/main/java/com/cloud/hypervisor/HypervisorGuru.java

@@ -33,6 +33,7 @@
 import com.cloud.vm.NicProfile;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachineProfile;
+import org.apache.cloudstack.vm.UnmanagedInstanceTO;
 
 public interface HypervisorGuru extends Adapter {
 
@@ -104,4 +105,25 @@ boolean attachRestoredVolumeToVirtualMachine(long zoneId, String location, Backu
      * @return a list of commands to perform for a successful migration
      */
     List<Command> finalizeMigrate(VirtualMachine vm, Map<Volume, StoragePool> volumeToPool);
+
+
+    /**
+     * Will perform a clone of a VM on an external host (if the guru can handle)
+     * @param hostIp VM's source host IP
+     * @param vmName name of the source VM to clone from
+     * @param params hypervisor specific additional parameters
+     * @return a reference to the cloned VM
+     */
+    UnmanagedInstanceTO cloneHypervisorVMOutOfBand(String hostIp, String vmName,
+                                                   Map<String, String> params);
+
+    /**
+     * Removes a VM created as a clone of a VM on an external host
+     * @param hostIp VM's source host IP
+     * @param vmName name of the VM to remove
+     * @param params hypervisor specific additional parameters
+     * @return true if the operation succeeds, false if not
+     */
+    boolean removeClonedHypervisorVMOutOfBand(String hostIp, String vmName,
+                                              Map<String, String> params);
 }

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

@@ -86,4 +86,16 @@ public interface VmDetailConstants {
     String DEPLOY_AS_IS_CONFIGURATION = "configurationId";
     String KEY_PAIR_NAMES = "keypairnames";
     String CKS_CONTROL_NODE_LOGIN_USER = "controlNodeLoginUser";
+
+    // VMware to KVM VM migrations specific
+    String VMWARE_TO_KVM_PREFIX = "vmware-to-kvm";
+    String VMWARE_VCENTER_HOST = String.format("%s-vcenter", VMWARE_TO_KVM_PREFIX);
+    String VMWARE_DATACENTER_NAME = String.format("%s-datacenter", VMWARE_TO_KVM_PREFIX);
+    String VMWARE_CLUSTER_NAME = String.format("%s-cluster", VMWARE_TO_KVM_PREFIX);
+    String VMWARE_VCENTER_USERNAME = String.format("%s-username", VMWARE_TO_KVM_PREFIX);
+    String VMWARE_VCENTER_PASSWORD = String.format("%s-password", VMWARE_TO_KVM_PREFIX);
+    String VMWARE_VM_NAME = String.format("%s-vmname", VMWARE_TO_KVM_PREFIX);
+    String VMWARE_HOST_NAME = String.format("%s-host", VMWARE_TO_KVM_PREFIX);
+    String VMWARE_DISK = String.format("%s-disk", VMWARE_TO_KVM_PREFIX);
+    String VMWARE_MAC_ADDRESSES = String.format("%s-mac-addresses", VMWARE_TO_KVM_PREFIX);
 }

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

@@ -69,6 +69,8 @@ public class ApiConstants {
     public static final String CERTIFICATE_SERIALNUM = "serialnum";
     public static final String CERTIFICATE_SUBJECT = "subject";
     public static final String CERTIFICATE_VALIDITY = "validity";
+    public static final String CONVERT_INSTANCE_HOST_ID = "convertinstancehostid";
+    public static final String CONVERT_INSTANCE_STORAGE_POOL_ID = "convertinstancepoolid";
     public static final String ENABLED_REVOCATION_CHECK = "enabledrevocationcheck";
     public static final String CONTROLLER = "controller";
     public static final String CONTROLLER_UNIT = "controllerunit";
@@ -120,6 +122,7 @@ public class ApiConstants {
     public static final String MIN_IOPS = "miniops";
     public static final String MAX_IOPS = "maxiops";
     public static final String HYPERVISOR_SNAPSHOT_RESERVE = "hypervisorsnapshotreserve";
+    public static final String DATACENTER_NAME = "datacentername";
     public static final String DATADISK_OFFERING_LIST = "datadiskofferinglist";
     public static final String DEFAULT_VALUE = "defaultvalue";
     public static final String DESCRIPTION = "description";
@@ -207,6 +210,7 @@ public class ApiConstants {
     public static final String HIDE_IP_ADDRESS_USAGE = "hideipaddressusage";
     public static final String HOST_ID = "hostid";
     public static final String HOST_IDS = "hostids";
+    public static final String HOST_IP = "hostip";
     public static final String HOST_NAME = "hostname";
     public static final String HOST_CONTROL_STATE = "hostcontrolstate";
     public static final String HOSTS_MAP = "hostsmap";
@@ -779,6 +783,7 @@ public class ApiConstants {
     public static final String VSM_CONFIG_STATE = "vsmconfigstate";
     public static final String VSM_DEVICE_STATE = "vsmdevicestate";
     public static final String VCENTER = "vcenter";
+    public static final String EXISTING_VCENTER_ID = "existingvcenterid";
     public static final String ADD_VSM_FLAG = "addvsmflag";
     public static final String END_POINT = "endpoint";
     public static final String REGION_ID = "regionid";
@@ -1059,6 +1064,7 @@ public class ApiConstants {
     public static final String SOURCE_NAT_IP = "sourcenatipaddress";
     public static final String SOURCE_NAT_IP_ID = "sourcenatipaddressid";
     public static final String HAS_RULES = "hasrules";
+    public static final String IMPORT_SOURCE = "importsource";
     public static final String OBJECT_STORAGE = "objectstore";
 
     public static final String HEURISTIC_RULE = "heuristicrule";

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

@@ -123,6 +123,7 @@
 import org.apache.cloudstack.api.response.TemplateResponse;
 import org.apache.cloudstack.api.response.TrafficMonitorResponse;
 import org.apache.cloudstack.api.response.TrafficTypeResponse;
+import org.apache.cloudstack.api.response.UnmanagedInstanceResponse;
 import org.apache.cloudstack.api.response.UpgradeRouterTemplateResponse;
 import org.apache.cloudstack.api.response.UsageRecordResponse;
 import org.apache.cloudstack.api.response.UserDataResponse;
@@ -237,6 +238,7 @@
 import com.cloud.vm.NicSecondaryIp;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.snapshot.VMSnapshot;
+import org.apache.cloudstack.vm.UnmanagedInstanceTO;
 
 public interface ResponseGenerator {
     UserResponse createUserResponse(UserAccount user);
@@ -538,6 +540,8 @@ List<TemplateResponse> createTemplateResponses(ResponseView view, VirtualMachine
 
     FirewallResponse createIpv6FirewallRuleResponse(FirewallRule acl);
 
+    UnmanagedInstanceResponse createUnmanagedInstanceResponse(UnmanagedInstanceTO instance, Cluster cluster, Host host);
+
     SecondaryStorageHeuristicsResponse createSecondaryStorageSelectorResponse(Heuristic heuristic);
 
     IpQuarantineResponse createQuarantinedIpsResponse(PublicIpQuarantine publicIp);

api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ImportUnmanagedInstanceCmd.java

@@ -124,7 +124,7 @@ public class ImportUnmanagedInstanceCmd extends BaseAsyncCmd {
             type = CommandType.UUID,
             entityType = ServiceOfferingResponse.class,
             required = true,
-            description = "the ID of the service offering for the virtual machine")
+            description = "the service offering for the virtual machine")
     private Long serviceOfferingId;
 
     @Parameter(name = ApiConstants.NIC_NETWORK_LIST,
@@ -154,7 +154,7 @@ public class ImportUnmanagedInstanceCmd extends BaseAsyncCmd {
 
     @Parameter(name = ApiConstants.FORCED,
             type = CommandType.BOOLEAN,
-            description = "VM is imported despite some of its NIC's MAC addresses are already present")
+            description = "VM is imported despite some of its NIC's MAC addresses are already present, in case the MAC address exists then a new MAC address is generated")
     private Boolean forced;
 
     /////////////////////////////////////////////////////
@@ -279,7 +279,8 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Importing unmanaged VM";
+        String vmName = this.name;
+        return String.format("Importing unmanaged VM: %s", vmName);
     }
 
     public boolean isForced() {