Skip to content

Commit c028af7

Browse files
vishesh92sureshanaparti
authored and
dhslove
committed
Allow VMWare import via another host (apache#9787)
Co-authored-by: Suresh Kumar Anaparti <[email protected]>
1 parent cc54e44 commit c028af7

File tree

15 files changed

+1153
-215
lines changed

15 files changed

+1153
-215
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ public class ApiConstants {
244244
public static final String CUSTOMIMAGES = "customimages";
245245
public static final String ID = "id";
246246
public static final String IDS = "ids";
247+
public static final String IMPORT_INSTANCE_HOST_ID = "importinstancehostid";
247248
public static final String INDEX = "index";
248249
public static final String INSTANCES_DISKS_STATS_RETENTION_ENABLED = "instancesdisksstatsretentionenabled";
249250
public static final String INSTANCES_DISKS_STATS_RETENTION_TIME = "instancesdisksstatsretentiontime";

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,19 @@ public class ImportVmCmd extends ImportUnmanagedInstanceCmd {
144144
private String clusterName;
145145

146146
@Parameter(name = ApiConstants.CONVERT_INSTANCE_HOST_ID, type = CommandType.UUID, entityType = HostResponse.class,
147-
description = "(only for importing VMs from VMware to KVM) optional - the host to perform the virt-v2v migration from VMware to KVM.")
147+
description = "(only for importing VMs from VMware to KVM) optional - the host to perform the virt-v2v conversion from VMware to KVM.")
148148
private Long convertInstanceHostId;
149149

150+
@Parameter(name = ApiConstants.IMPORT_INSTANCE_HOST_ID, type = CommandType.UUID, entityType = HostResponse.class, since = "4.19.2",
151+
description = "(only for importing VMs from VMware to KVM) optional - the host to import the converted instance from VMware to KVM.")
152+
private Long importInstanceHostId;
153+
150154
@Parameter(name = ApiConstants.CONVERT_INSTANCE_STORAGE_POOL_ID, type = CommandType.UUID, entityType = StoragePoolResponse.class,
151155
description = "(only for importing VMs from VMware to KVM) optional - the temporary storage pool to perform the virt-v2v migration from VMware to KVM.")
152156
private Long convertStoragePoolId;
153157

154158
@Parameter(name = ApiConstants.FORCE_MS_TO_IMPORT_VM_FILES, type = CommandType.BOOLEAN,
155-
description = "(only for importing VMs from VMware to KVM) optional - if true, forces MS to import VM file(s) to temporary storage, else uses KVM Host if ovftool is available, falls back to MS if not.")
159+
description = "(only for importing VMs from VMware to KVM) optional - if true, forces MS to export OVF from VMware to temporary storage, else uses KVM Host if ovftool is available, falls back to MS if not.")
156160
private Boolean forceMsToImportVmFiles;
157161

158162
/////////////////////////////////////////////////////
@@ -199,6 +203,10 @@ public Long getConvertInstanceHostId() {
199203
return convertInstanceHostId;
200204
}
201205

206+
public Long getImportInstanceHostId() {
207+
return importInstanceHostId;
208+
}
209+
202210
public Long getConvertStoragePoolId() {
203211
return convertStoragePoolId;
204212
}

‎core/src/main/java/com/cloud/agent/api/ConvertInstanceAnswer.java‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,20 @@
1616
// under the License.
1717
package com.cloud.agent.api;
1818

19-
import org.apache.cloudstack.vm.UnmanagedInstanceTO;
20-
2119
public class ConvertInstanceAnswer extends Answer {
2220

21+
private String temporaryConvertUuid;
22+
2323
public ConvertInstanceAnswer() {
2424
super();
2525
}
26-
private UnmanagedInstanceTO convertedInstance;
27-
28-
public ConvertInstanceAnswer(Command command, boolean success, String details) {
29-
super(command, success, details);
30-
}
3126

32-
public ConvertInstanceAnswer(Command command, UnmanagedInstanceTO convertedInstance) {
27+
public ConvertInstanceAnswer(Command command, String temporaryConvertUuid) {
3328
super(command, true, "");
34-
this.convertedInstance = convertedInstance;
29+
this.temporaryConvertUuid = temporaryConvertUuid;
3530
}
3631

37-
public UnmanagedInstanceTO getConvertedInstance() {
38-
return convertedInstance;
32+
public String getTemporaryConvertUuid() {
33+
return temporaryConvertUuid;
3934
}
4035
}

‎core/src/main/java/com/cloud/agent/api/ConvertInstanceCommand.java‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,10 @@
2020
import com.cloud.agent.api.to.RemoteInstanceTO;
2121
import com.cloud.hypervisor.Hypervisor;
2222

23-
import java.util.List;
24-
2523
public class ConvertInstanceCommand extends Command {
2624

2725
private RemoteInstanceTO sourceInstance;
2826
private Hypervisor.HypervisorType destinationHypervisorType;
29-
private List<String> destinationStoragePools;
3027
private DataStoreTO conversionTemporaryLocation;
3128
private String templateDirOnConversionLocation;
3229
private boolean checkConversionSupport;
@@ -36,12 +33,10 @@ public class ConvertInstanceCommand extends Command {
3633
public ConvertInstanceCommand() {
3734
}
3835

39-
public ConvertInstanceCommand(RemoteInstanceTO sourceInstance, Hypervisor.HypervisorType destinationHypervisorType,
40-
List<String> destinationStoragePools, DataStoreTO conversionTemporaryLocation,
36+
public ConvertInstanceCommand(RemoteInstanceTO sourceInstance, Hypervisor.HypervisorType destinationHypervisorType, DataStoreTO conversionTemporaryLocation,
4137
String templateDirOnConversionLocation, boolean checkConversionSupport, boolean exportOvfToConversionLocation) {
4238
this.sourceInstance = sourceInstance;
4339
this.destinationHypervisorType = destinationHypervisorType;
44-
this.destinationStoragePools = destinationStoragePools;
4540
this.conversionTemporaryLocation = conversionTemporaryLocation;
4641
this.templateDirOnConversionLocation = templateDirOnConversionLocation;
4742
this.checkConversionSupport = checkConversionSupport;
@@ -56,10 +51,6 @@ public Hypervisor.HypervisorType getDestinationHypervisorType() {
5651
return destinationHypervisorType;
5752
}
5853

59-
public List<String> getDestinationStoragePools() {
60-
return destinationStoragePools;
61-
}
62-
6354
public DataStoreTO getConversionTemporaryLocation() {
6455
return conversionTemporaryLocation;
6556
}

‎core/src/main/java/com/cloud/agent/api/ImportConvertedInstanceAnswer.java‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
package com.cloud.agent.api;
18+
19+
import org.apache.cloudstack.vm.UnmanagedInstanceTO;
20+
21+
public class ImportConvertedInstanceAnswer extends Answer {
22+
23+
public ImportConvertedInstanceAnswer() {
24+
super();
25+
}
26+
private UnmanagedInstanceTO convertedInstance;
27+
28+
public ImportConvertedInstanceAnswer(Command command, boolean success, String details) {
29+
super(command, success, details);
30+
}
31+
32+
public ImportConvertedInstanceAnswer(Command command, UnmanagedInstanceTO convertedInstance) {
33+
super(command, true, "");
34+
this.convertedInstance = convertedInstance;
35+
}
36+
37+
public UnmanagedInstanceTO getConvertedInstance() {
38+
return convertedInstance;
39+
}
40+
}

‎core/src/main/java/com/cloud/agent/api/ImportConvertedInstanceCommand.java‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
package com.cloud.agent.api;
18+
19+
import com.cloud.agent.api.to.DataStoreTO;
20+
import com.cloud.agent.api.to.RemoteInstanceTO;
21+
22+
import java.util.List;
23+
24+
public class ImportConvertedInstanceCommand extends Command {
25+
26+
private RemoteInstanceTO sourceInstance;
27+
private List<String> destinationStoragePools;
28+
private DataStoreTO conversionTemporaryLocation;
29+
private String temporaryConvertUuid;
30+
31+
public ImportConvertedInstanceCommand() {
32+
}
33+
34+
public ImportConvertedInstanceCommand(RemoteInstanceTO sourceInstance,
35+
List<String> destinationStoragePools,
36+
DataStoreTO conversionTemporaryLocation, String temporaryConvertUuid) {
37+
this.sourceInstance = sourceInstance;
38+
this.destinationStoragePools = destinationStoragePools;
39+
this.conversionTemporaryLocation = conversionTemporaryLocation;
40+
this.temporaryConvertUuid = temporaryConvertUuid;
41+
}
42+
43+
public RemoteInstanceTO getSourceInstance() {
44+
return sourceInstance;
45+
}
46+
47+
public List<String> getDestinationStoragePools() {
48+
return destinationStoragePools;
49+
}
50+
51+
public DataStoreTO getConversionTemporaryLocation() {
52+
return conversionTemporaryLocation;
53+
}
54+
55+
public String getTemporaryConvertUuid() {
56+
return temporaryConvertUuid;
57+
}
58+
59+
@Override
60+
public boolean executeInSequence() {
61+
return false;
62+
}
63+
}

‎plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java‎

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -130,42 +130,33 @@ public Answer execute(ConvertInstanceCommand cmd, LibvirtComputingResource serve
130130
final String temporaryConvertUuid = UUID.randomUUID().toString();
131131
boolean verboseModeEnabled = serverResource.isConvertInstanceVerboseModeEnabled();
132132

133+
boolean cleanupSecondaryStorage = false;
133134
try {
134135
boolean result = performInstanceConversion(sourceOVFDirPath, temporaryConvertPath, temporaryConvertUuid,
135136
timeout, verboseModeEnabled);
136137
if (!result) {
137-
String err = String.format("The virt-v2v conversion for the OVF %s failed. " +
138-
"Please check the agent logs for the virt-v2v output", ovfTemplateDirOnConversionLocation);
138+
String err = String.format(
139+
"The virt-v2v conversion for the OVF %s failed. Please check the agent logs " +
140+
"for the virt-v2v output. Please try on a different kvm host which " +
141+
"has a different virt-v2v version.",
142+
ovfTemplateDirOnConversionLocation);
139143
logger.error(err);
140144
return new ConvertInstanceAnswer(cmd, false, err);
141145
}
142-
String convertedBasePath = String.format("%s/%s", temporaryConvertPath, temporaryConvertUuid);
143-
LibvirtDomainXMLParser xmlParser = parseMigratedVMXmlDomain(convertedBasePath);
144-
145-
List<KVMPhysicalDisk> temporaryDisks = xmlParser == null ?
146-
getTemporaryDisksWithPrefixFromTemporaryPool(temporaryStoragePool, temporaryConvertPath, temporaryConvertUuid) :
147-
getTemporaryDisksFromParsedXml(temporaryStoragePool, xmlParser, convertedBasePath);
148-
149-
List<KVMPhysicalDisk> destinationDisks = moveTemporaryDisksToDestination(temporaryDisks,
150-
destinationStoragePools, storagePoolMgr);
151-
152-
cleanupDisksAndDomainFromTemporaryLocation(temporaryDisks, temporaryStoragePool, temporaryConvertUuid);
153-
154-
UnmanagedInstanceTO convertedInstanceTO = getConvertedUnmanagedInstance(temporaryConvertUuid,
155-
destinationDisks, xmlParser);
156-
return new ConvertInstanceAnswer(cmd, convertedInstanceTO);
146+
return new ConvertInstanceAnswer(cmd, temporaryConvertUuid);
157147
} catch (Exception e) {
158148
String error = String.format("Error converting instance %s from %s, due to: %s",
159149
sourceInstanceName, sourceHypervisorType, e.getMessage());
160150
logger.error(error, e);
151+
cleanupSecondaryStorage = true;
161152
return new ConvertInstanceAnswer(cmd, false, error);
162153
} finally {
163154
if (ovfExported && StringUtils.isNotBlank(ovfTemplateDirOnConversionLocation)) {
164155
String sourceOVFDir = String.format("%s/%s", temporaryConvertPath, ovfTemplateDirOnConversionLocation);
165156
logger.debug("Cleaning up exported OVA at dir " + sourceOVFDir);
166157
FileUtil.deletePath(sourceOVFDir);
167158
}
168-
if (conversionTemporaryLocation instanceof NfsTO) {
159+
if (cleanupSecondaryStorage && conversionTemporaryLocation instanceof NfsTO) {
169160
logger.debug("Cleaning up secondary storage temporary location");
170161
storagePoolMgr.deleteStoragePool(temporaryStoragePool.getType(), temporaryStoragePool.getUuid());
171162
}
@@ -432,4 +423,4 @@ protected LibvirtDomainXMLParser parseMigratedVMXmlDomain(String installPath) th
432423
protected String encodeUsername(String username) {
433424
return URLEncoder.encode(username, Charset.defaultCharset());
434425
}
435-
}
426+
}

0 commit comments

Comments
 (0)