Skip to content

Commit 9654c99

Browse files
swillswill
committed
Merge pull request #1365 from shapeblue/4.7-vmware-diskchain
[4.7] vmware: improve support for disks- Improve disk chain usage while attaching, migrating disks - Gets root disk controller based diskDeviceBusName from volume's chain info * pr/1365: vmware: improve support for disks Signed-off-by: Will Stevens <[email protected]>
2 parents 1979f42 + 8e4644e commit 9654c99

File tree

14 files changed

+190
-42
lines changed

14 files changed

+190
-42
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
public interface VmDetailConstants {
2020
public static final String KEYBOARD = "keyboard";
2121
public static final String NIC_ADAPTER = "nicAdapter";
22-
public static final String ROOK_DISK_CONTROLLER = "rootDiskController";
22+
public static final String ROOT_DISK_CONTROLLER = "rootDiskController";
2323
public static final String NESTED_VIRTUALIZATION_FLAG = "nestedVirtualizationFlag";
2424
public static final String HYPERVISOR_TOOLS_VERSION = "hypervisortoolsversion";
2525
public static final String DATA_DISK_CONTROLLER = "dataDiskController";

‎plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,10 +200,10 @@ public VirtualMachineTO implement(VirtualMachineProfile vm) {
200200
}
201201
}
202202

203-
String diskDeviceType = details.get(VmDetailConstants.ROOK_DISK_CONTROLLER);
203+
String diskDeviceType = details.get(VmDetailConstants.ROOT_DISK_CONTROLLER);
204204
if (userVm) {
205205
if (diskDeviceType == null) {
206-
details.put(VmDetailConstants.ROOK_DISK_CONTROLLER, _vmwareMgr.getRootDiskController());
206+
details.put(VmDetailConstants.ROOT_DISK_CONTROLLER, _vmwareMgr.getRootDiskController());
207207
}
208208
}
209209
String diskController = details.get(VmDetailConstants.DATA_DISK_CONTROLLER);

‎plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236
import com.cloud.hypervisor.vmware.mo.NetworkDetails;
237237
import com.cloud.hypervisor.vmware.mo.TaskMO;
238238
import com.cloud.hypervisor.vmware.mo.VirtualEthernetCardType;
239-
import com.cloud.hypervisor.vmware.mo.VirtualMachineDiskInfo;
239+
import org.apache.cloudstack.utils.volume.VirtualMachineDiskInfo;
240240
import com.cloud.hypervisor.vmware.mo.VirtualMachineDiskInfoBuilder;
241241
import com.cloud.hypervisor.vmware.mo.VirtualMachineMO;
242242
import com.cloud.hypervisor.vmware.mo.VirtualSwitchType;
@@ -1412,7 +1412,7 @@ protected StartAnswer execute(StartCommand cmd) {
14121412
String vmInternalCSName = names.first();
14131413
String vmNameOnVcenter = names.second();
14141414
String dataDiskController = vmSpec.getDetails().get(VmDetailConstants.DATA_DISK_CONTROLLER);
1415-
String rootDiskController = vmSpec.getDetails().get(VmDetailConstants.ROOK_DISK_CONTROLLER);
1415+
String rootDiskController = vmSpec.getDetails().get(VmDetailConstants.ROOT_DISK_CONTROLLER);
14161416

14171417
// If root disk controller is scsi, then data disk controller would also be scsi instead of using 'osdefault'
14181418
// This helps avoid mix of different scsi subtype controllers in instance.
@@ -1451,7 +1451,7 @@ protected StartAnswer execute(StartCommand cmd) {
14511451
s_logger.error(msg);
14521452
throw new Exception(msg);
14531453
}
1454-
1454+
String guestOsId = translateGuestOsIdentifier(vmSpec.getArch(), vmSpec.getOs(), vmSpec.getPlatformEmulator()).value();
14551455
DiskTO[] disks = validateDisks(vmSpec.getDisks());
14561456
assert (disks.length > 0);
14571457
NicTO[] nics = vmSpec.getNics();
@@ -1564,7 +1564,7 @@ protected StartAnswer execute(StartCommand cmd) {
15641564
tearDownVm(vmMo);
15651565
}else if (!hyperHost.createBlankVm(vmNameOnVcenter, vmInternalCSName, vmSpec.getCpus(), vmSpec.getMaxSpeed().intValue(),
15661566
getReservedCpuMHZ(vmSpec), vmSpec.getLimitCpuUse(), (int)(vmSpec.getMaxRam() / (1024 * 1024)), getReservedMemoryMb(vmSpec),
1567-
translateGuestOsIdentifier(vmSpec.getArch(), vmSpec.getOs(), vmSpec.getPlatformEmulator()).value(), rootDiskDataStoreDetails.first(), false, controllerInfo, systemVm)) {
1567+
guestOsId, rootDiskDataStoreDetails.first(), false, controllerInfo, systemVm)) {
15681568
throw new Exception("Failed to create VM. vmName: " + vmInternalCSName);
15691569
}
15701570
}
@@ -1588,7 +1588,6 @@ protected StartAnswer execute(StartCommand cmd) {
15881588
}
15891589

15901590
VirtualMachineConfigSpec vmConfigSpec = new VirtualMachineConfigSpec();
1591-
String guestOsId = translateGuestOsIdentifier(vmSpec.getArch(), vmSpec.getOs(), vmSpec.getPlatformEmulator()).value();
15921591

15931592
VmwareHelper.setBasicVmConfig(vmConfigSpec, vmSpec.getCpus(), vmSpec.getMaxSpeed(),
15941593
getReservedCpuMHZ(vmSpec), (int)(vmSpec.getMaxRam() / (1024 * 1024)), getReservedMemoryMb(vmSpec),
@@ -2322,14 +2321,14 @@ private int getDiskController(VirtualMachineDiskInfo matchingExistingDisk, DiskT
23222321

23232322
if (vol.getType() == Volume.Type.ROOT) {
23242323
Map<String, String> vmDetails = vmSpec.getDetails();
2325-
if (vmDetails != null && vmDetails.get(VmDetailConstants.ROOK_DISK_CONTROLLER) != null) {
2326-
if (vmDetails.get(VmDetailConstants.ROOK_DISK_CONTROLLER).equalsIgnoreCase("scsi")) {
2324+
if (vmDetails != null && vmDetails.get(VmDetailConstants.ROOT_DISK_CONTROLLER) != null) {
2325+
if (vmDetails.get(VmDetailConstants.ROOT_DISK_CONTROLLER).equalsIgnoreCase("scsi")) {
23272326
s_logger.info("Chose disk controller for vol " + vol.getType() + " -> scsi, based on root disk controller settings: " +
2328-
vmDetails.get(VmDetailConstants.ROOK_DISK_CONTROLLER));
2327+
vmDetails.get(VmDetailConstants.ROOT_DISK_CONTROLLER));
23292328
controllerKey = scsiControllerKey;
23302329
} else {
23312330
s_logger.info("Chose disk controller for vol " + vol.getType() + " -> ide, based on root disk controller settings: " +
2332-
vmDetails.get(VmDetailConstants.ROOK_DISK_CONTROLLER));
2331+
vmDetails.get(VmDetailConstants.ROOT_DISK_CONTROLLER));
23332332
controllerKey = ideControllerKey;
23342333
}
23352334
} else {

‎plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import java.util.concurrent.Executors;
3434
import java.util.concurrent.TimeUnit;
3535

36+
import com.google.common.base.Strings;
3637
import org.apache.commons.lang.StringUtils;
3738
import org.apache.log4j.Logger;
3839

@@ -88,7 +89,7 @@
8889
import com.cloud.hypervisor.vmware.mo.HostStorageSystemMO;
8990
import com.cloud.hypervisor.vmware.mo.HypervisorHostHelper;
9091
import com.cloud.hypervisor.vmware.mo.NetworkDetails;
91-
import com.cloud.hypervisor.vmware.mo.VirtualMachineDiskInfo;
92+
import org.apache.cloudstack.utils.volume.VirtualMachineDiskInfo;
9293
import com.cloud.hypervisor.vmware.mo.VirtualMachineMO;
9394
import com.cloud.hypervisor.vmware.mo.VmwareHypervisorHost;
9495
import com.cloud.hypervisor.vmware.resource.VmwareResource;
@@ -1363,24 +1364,15 @@ private Answer attachVolume(Command cmd, DiskTO disk, boolean isAttach, boolean
13631364
AttachAnswer answer = new AttachAnswer(disk);
13641365

13651366
if (isAttach) {
1366-
String dataDiskController = controllerInfo.get(VmDetailConstants.DATA_DISK_CONTROLLER);
1367-
String rootDiskController = controllerInfo.get(VmDetailConstants.ROOK_DISK_CONTROLLER);
1368-
DiskControllerType rootDiskControllerType = DiskControllerType.getType(rootDiskController);
1369-
1370-
if (dataDiskController == null) {
1371-
dataDiskController = getLegacyVmDataDiskController();
1372-
} else if ((rootDiskControllerType == DiskControllerType.lsilogic) ||
1373-
(rootDiskControllerType == DiskControllerType.lsisas1068) ||
1374-
(rootDiskControllerType == DiskControllerType.pvscsi) ||
1375-
(rootDiskControllerType == DiskControllerType.buslogic)) {
1376-
//TODO: Support mix of SCSI controller types for single VM. If root disk is already over
1377-
//a SCSI controller then use the same for data volume as well. This limitation will go once mix
1378-
//of SCSI controller types for single VM.
1379-
dataDiskController = rootDiskController;
1380-
} else if (DiskControllerType.getType(dataDiskController) == DiskControllerType.osdefault) {
1381-
dataDiskController = vmMo.getRecommendedDiskController(null);
1367+
String diskController = getLegacyVmDataDiskController();
1368+
if (controllerInfo != null &&
1369+
!Strings.isNullOrEmpty(controllerInfo.get(VmDetailConstants.DATA_DISK_CONTROLLER))) {
1370+
diskController = controllerInfo.get(VmDetailConstants.DATA_DISK_CONTROLLER);
13821371
}
1383-
vmMo.attachDisk(new String[] {datastoreVolumePath}, morDs, dataDiskController);
1372+
if (DiskControllerType.getType(diskController) == DiskControllerType.osdefault) {
1373+
diskController = vmMo.getRecommendedDiskController(null);
1374+
}
1375+
vmMo.attachDisk(new String[] {datastoreVolumePath}, morDs, diskController);
13841376
} else {
13851377
vmMo.removeAllSnapshots();
13861378
vmMo.detachDisk(datastoreVolumePath, false);

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<cs.servlet.version>2.5</cs.servlet.version>
9393
<cs.jstl.version>1.2</cs.jstl.version>
9494
<cs.selenium.server.version>1.0-20081010.060147</cs.selenium.server.version>
95-
<cs.vmware.api.version>5.5</cs.vmware.api.version>
95+
<cs.vmware.api.version>6.0</cs.vmware.api.version>
9696
<org.springframework.version>3.2.12.RELEASE</org.springframework.version>
9797
<cs.mockito.version>1.9.5</cs.mockito.version>
9898
<cs.powermock.version>1.5.3</cs.powermock.version>

‎server/src/com/cloud/storage/VolumeApiServiceImpl.java‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,18 @@
3030

3131
import com.cloud.utils.EncryptionUtil;
3232
import com.cloud.utils.db.TransactionCallbackWithException;
33+
import com.google.common.base.Strings;
3334
import com.google.gson.Gson;
3435
import com.google.gson.GsonBuilder;
36+
import com.google.gson.JsonParseException;
3537

3638
import org.apache.cloudstack.api.command.user.volume.GetUploadParamsForVolumeCmd;
3739
import org.apache.cloudstack.api.response.GetUploadParamsResponse;
3840
import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
3941
import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint;
4042
import org.apache.cloudstack.storage.command.TemplateOrVolumePostUploadCommand;
4143
import org.apache.cloudstack.utils.imagestore.ImageStoreUtil;
44+
import org.apache.cloudstack.utils.volume.VirtualMachineDiskInfo;
4245
import org.apache.log4j.Logger;
4346
import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd;
4447
import org.apache.cloudstack.api.command.user.volume.CreateVolumeCmd;
@@ -112,12 +115,14 @@
112115
import com.cloud.hypervisor.HypervisorCapabilitiesVO;
113116
import com.cloud.hypervisor.dao.HypervisorCapabilitiesDao;
114117
import com.cloud.org.Grouping;
118+
import com.cloud.serializer.GsonHelper;
115119
import com.cloud.service.dao.ServiceOfferingDetailsDao;
116120
import com.cloud.storage.Storage.ImageFormat;
117121
import com.cloud.storage.dao.DiskOfferingDao;
118122
import com.cloud.storage.dao.SnapshotDao;
119123
import com.cloud.storage.dao.VMTemplateDao;
120124
import com.cloud.storage.dao.VolumeDao;
125+
import com.cloud.storage.dao.VolumeDetailsDao;
121126
import com.cloud.storage.snapshot.SnapshotApiService;
122127
import com.cloud.storage.snapshot.SnapshotManager;
123128
import com.cloud.template.TemplateManager;
@@ -146,6 +151,7 @@
146151
import com.cloud.utils.exception.CloudRuntimeException;
147152
import com.cloud.utils.fsm.NoTransitionException;
148153
import com.cloud.utils.fsm.StateMachine2;
154+
import com.cloud.vm.UserVmManager;
149155
import com.cloud.vm.UserVmVO;
150156
import com.cloud.vm.VMInstanceVO;
151157
import com.cloud.vm.VirtualMachine;
@@ -191,6 +197,8 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
191197
@Inject
192198
VolumeDao _volsDao;
193199
@Inject
200+
VolumeDetailsDao _volDetailDao;
201+
@Inject
194202
HostDao _hostDao;
195203
@Inject
196204
SnapshotDao _snapshotDao;
@@ -240,6 +248,9 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
240248
VmWorkJobDao _workJobDao;
241249
@Inject
242250
ClusterDetailsDao _clusterDetailsDao;
251+
@Inject
252+
UserVmManager _userVmMgr;
253+
protected Gson _gson;
243254

244255
private List<StoragePoolAllocator> _storagePoolAllocators;
245256

@@ -253,6 +264,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
253264

254265
protected VolumeApiServiceImpl() {
255266
_volStateMachine = Volume.State.getStateMachine();
267+
_gson = GsonHelper.getGsonLogger();
256268
}
257269

258270
/*
@@ -1835,6 +1847,26 @@ private Volume orchestrateDetachVolumeFromVM(long vmId, long volumeId) {
18351847
}
18361848
}
18371849

1850+
public void updateMissingRootDiskController(final VMInstanceVO vm, final String rootVolChainInfo) {
1851+
if (vm == null || !VirtualMachine.Type.User.equals(vm.getType()) || Strings.isNullOrEmpty(rootVolChainInfo)) {
1852+
return;
1853+
}
1854+
String rootDiskController = null;
1855+
try {
1856+
final VirtualMachineDiskInfo infoInChain = _gson.fromJson(rootVolChainInfo, VirtualMachineDiskInfo.class);
1857+
if (infoInChain != null) {
1858+
rootDiskController = infoInChain.getControllerFromDeviceBusName();
1859+
}
1860+
final UserVmVO userVmVo = _userVmDao.findById(vm.getId());
1861+
if ((rootDiskController != null) && (!rootDiskController.isEmpty())) {
1862+
_userVmDao.loadDetails(userVmVo);
1863+
_userVmMgr.persistDeviceBusInfo(userVmVo, rootDiskController);
1864+
}
1865+
} catch (JsonParseException e) {
1866+
s_logger.debug("Error parsing chain info json: " + e.getMessage());
1867+
}
1868+
}
1869+
18381870
@DB
18391871
@Override
18401872
@ActionEvent(eventType = EventTypes.EVENT_VOLUME_MIGRATE, eventDescription = "migrating volume", async = true)
@@ -1924,6 +1956,7 @@ public Volume migrateVolume(MigrateVolumeCmd cmd) {
19241956
throw new InvalidParameterValueException("Cannot migrate ROOT volume of a stopped VM to a storage pool in a different VMware datacenter");
19251957
}
19261958
}
1959+
updateMissingRootDiskController(vm, vol.getChainInfo());
19271960
}
19281961
}
19291962
}
@@ -2472,9 +2505,10 @@ private VolumeVO sendAttachVolumeCommand(UserVmVO vm, VolumeVO volumeToAttach, L
24722505
}
24732506
_userVmDao.loadDetails(vm);
24742507
Map<String, String> controllerInfo = new HashMap<String, String>();
2475-
controllerInfo.put(VmDetailConstants.ROOK_DISK_CONTROLLER, vm.getDetail(VmDetailConstants.ROOK_DISK_CONTROLLER));
2508+
controllerInfo.put(VmDetailConstants.ROOT_DISK_CONTROLLER, vm.getDetail(VmDetailConstants.ROOT_DISK_CONTROLLER));
24762509
controllerInfo.put(VmDetailConstants.DATA_DISK_CONTROLLER, vm.getDetail(VmDetailConstants.DATA_DISK_CONTROLLER));
24772510
cmd.setControllerInfo(controllerInfo);
2511+
s_logger.debug("Attach volume id:" + volumeToAttach.getId() + " on VM id:" + vm.getId() + " has controller info:" + controllerInfo);
24782512

24792513
try {
24802514
answer = (AttachAnswer)_agentMgr.send(hostId, cmd);

‎server/src/com/cloud/vm/UserVmManager.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,4 +114,6 @@ UserVm updateVirtualMachine(long id, String displayName, String group, Boolean h
114114
public void removeCustomOfferingDetails(long vmId);
115115

116116
void generateUsageEvent(VirtualMachine vm, boolean isDisplay, String eventType);
117+
118+
void persistDeviceBusInfo(UserVmVO paramUserVmVO, String paramString);
117119
}

‎server/src/com/cloud/vm/UserVmManagerImpl.java‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
9090
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
9191
import org.apache.commons.codec.binary.Base64;
92+
import org.apache.commons.lang.StringUtils;
9293
import org.apache.log4j.Logger;
9394

9495
import com.cloud.agent.AgentManager;
@@ -3509,15 +3510,15 @@ public UserVmVO doInTransaction(TransactionStatus status) throws InsufficientCap
35093510
if (hypervisorType.equals(HypervisorType.VMware)) {
35103511
if (guestOS.getDisplayName().toLowerCase().contains("apple mac os")) {
35113512
vm.setDetail("smc.present", "TRUE");
3512-
vm.setDetail(VmDetailConstants.ROOK_DISK_CONTROLLER, "scsi");
3513+
vm.setDetail(VmDetailConstants.ROOT_DISK_CONTROLLER, "scsi");
35133514
vm.setDetail(VmDetailConstants.DATA_DISK_CONTROLLER, "scsi");
35143515
vm.setDetail("firmware", "efi");
35153516
s_logger.info("guestOS is OSX : overwrite root disk controller to scsi, use smc and efi");
35163517
} else {
35173518
String controllerSetting = _configDao.getValue("vmware.root.disk.controller");
35183519
// Don't override if VM already has root/data disk controller detail
3519-
if (vm.getDetail(VmDetailConstants.ROOK_DISK_CONTROLLER) == null) {
3520-
vm.setDetail(VmDetailConstants.ROOK_DISK_CONTROLLER, controllerSetting);
3520+
if (vm.getDetail(VmDetailConstants.ROOT_DISK_CONTROLLER) == null) {
3521+
vm.setDetail(VmDetailConstants.ROOT_DISK_CONTROLLER, controllerSetting);
35213522
}
35223523
if (vm.getDetail(VmDetailConstants.DATA_DISK_CONTROLLER) == null) {
35233524
if (controllerSetting.equalsIgnoreCase("scsi")) {
@@ -5455,6 +5456,17 @@ private void encryptAndStorePassword(UserVmVO vm, String password) {
54555456
}
54565457
}
54575458

5459+
public void persistDeviceBusInfo(UserVmVO vm, String rootDiskController) {
5460+
String existingVmRootDiskController = vm.getDetail(VmDetailConstants.ROOT_DISK_CONTROLLER);
5461+
if (StringUtils.isEmpty(existingVmRootDiskController) && !StringUtils.isEmpty(rootDiskController)) {
5462+
vm.setDetail(VmDetailConstants.ROOT_DISK_CONTROLLER, rootDiskController);
5463+
_vmDao.saveDetails(vm);
5464+
if (s_logger.isDebugEnabled()) {
5465+
s_logger.debug("Persisted device bus information rootDiskController=" + rootDiskController + " for vm: " + vm.getDisplayName());
5466+
}
5467+
}
5468+
}
5469+
54585470
@Override
54595471
public String getConfigComponentName() {
54605472
return UserVmManager.class.getSimpleName();

‎server/test/com/cloud/storage/VolumeApiServiceImplTest.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@
1818

1919
import static org.mockito.Matchers.any;
2020
import static org.mockito.Matchers.anyLong;
21+
import static org.mockito.Matchers.anyString;
22+
import static org.mockito.Matchers.eq;
2123
import static org.mockito.Mockito.doNothing;
24+
import static org.mockito.Mockito.times;
25+
import static org.mockito.Mockito.verify;
2226
import static org.mockito.Mockito.when;
2327

2428
import java.lang.reflect.Field;
@@ -28,7 +32,10 @@
2832

2933
import javax.inject.Inject;
3034

35+
import com.cloud.serializer.GsonHelper;
3136
import com.cloud.user.User;
37+
import com.cloud.vm.UserVmManager;
38+
import com.cloud.vm.VirtualMachine;
3239
import junit.framework.Assert;
3340
import org.apache.cloudstack.api.command.user.volume.CreateVolumeCmd;
3441
import org.junit.After;
@@ -101,6 +108,8 @@ public class VolumeApiServiceImplTest {
101108
VolumeService volService;
102109
@Mock
103110
CreateVolumeCmd createVol;
111+
@Mock
112+
UserVmManager _userVmMgr;
104113

105114
DetachVolumeCmd detachCmd = new DetachVolumeCmd();
106115
Class<?> _detachCmdClass = detachCmd.getClass();
@@ -118,6 +127,8 @@ public void setup() throws Exception {
118127
_svc._jobMgr = _jobMgr;
119128
_svc.volFactory = _volFactory;
120129
_svc.volService = volService;
130+
_svc._userVmMgr = _userVmMgr;
131+
_svc._gson = GsonHelper.getGsonLogger();
121132

122133
// mock caller context
123134
AccountVO account = new AccountVO("admin", 1L, "networkDomain", Account.ACCOUNT_TYPE_NORMAL, "uuid");
@@ -383,6 +394,20 @@ public void testNonEmptyGetVolumeNameFromCmd() {
383394
Assert.assertSame(_svc.getVolumeNameFromCommand(createVol), "abc");
384395
}
385396

397+
@Test
398+
public void testUpdateMissingRootDiskControllerWithNullChainInfo() {
399+
_svc.updateMissingRootDiskController(null, null);
400+
verify(_svc._userVmMgr, times(0)).persistDeviceBusInfo(any(UserVmVO.class), anyString());
401+
}
402+
403+
@Test
404+
public void testUpdateMissingRootDiskControllerWithValidChainInfo() {
405+
UserVmVO vm = _svc._userVmDao.findById(1L);
406+
assert vm.getType() == VirtualMachine.Type.User;
407+
_svc.updateMissingRootDiskController(vm, "{\"diskDeviceBusName\":\"scsi0:0\",\"diskChain\":[\"[somedatastore] i-3-VM-somePath/ROOT-1.vmdk\"]}");
408+
verify(_svc._userVmMgr, times(1)).persistDeviceBusInfo(any(UserVmVO.class), eq("scsi"));
409+
}
410+
386411
@After
387412
public void tearDown() {
388413
CallContext.unregister();

0 commit comments

Comments
 (0)