Skip to content

Commit 126a039

Browse files
rohityadavcloudrohityadavcloud
committed
Merge branch '4.7' into 4.8
2 parents d11194a + 987e800 commit 126a039

File tree

19 files changed

+227
-51
lines changed

19 files changed

+227
-51
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";

‎debian/control‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Description: A common package which contains files which are shared by several C
1515

1616
Package: cloudstack-management
1717
Architecture: all
18-
Depends: ${misc:Depends}, ${python:Depends}, cloudstack-common (= ${source:Version}), tomcat6, sudo, jsvc, python-mysqldb, libmysql-java, augeas-tools, mysql-client, adduser
18+
Depends: ${misc:Depends}, ${python:Depends}, cloudstack-common (= ${source:Version}), tomcat6, sudo, jsvc, python-mysqldb, libmysql-java, augeas-tools, mysql-client, adduser, bzip2
1919
Conflicts: cloud-server, cloud-client, cloud-client-ui
2020
Description: CloudStack server library
2121
The CloudStack management server

‎engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2909,12 +2909,12 @@ public void checkIfCanUpgrade(final VirtualMachine vmInstance, final ServiceOffe
29092909
newServiceOffering.getCpu() + " cpu(s) at " + newServiceOffering.getSpeed() + " Mhz, and " + newServiceOffering.getRamSize() + " MB of memory");
29102910
}
29112911

2912-
// Check that the service offering being upgraded to has storage tags subset of the current service offering storage tags, since volume is not migrated.
2912+
// Check that the service offering being upgraded to has all the tags of the current service offering.
29132913
final List<String> currentTags = StringUtils.csvTagsToList(currentServiceOffering.getTags());
29142914
final List<String> newTags = StringUtils.csvTagsToList(newServiceOffering.getTags());
2915-
if (!currentTags.containsAll(newTags)) {
2916-
throw new InvalidParameterValueException("Unable to upgrade virtual machine; the new service offering " + " should have tags as subset of " +
2917-
"current service offering tags. Current service offering tags: " + currentTags + "; " + "new service " + "offering tags: " + newTags);
2915+
if (!newTags.containsAll(currentTags)) {
2916+
throw new InvalidParameterValueException("Unable to upgrade virtual machine; the current service offering " + " should have tags as subset of " +
2917+
"the new service offering tags. Current service offering tags: " + currentTags + "; " + "new service " + "offering tags: " + newTags);
29182918
}
29192919
}
29202920

‎engine/orchestration/test/com/cloud/vm/VirtualMachineManagerImplTest.java‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@
2929
import java.util.Iterator;
3030
import java.util.List;
3131
import java.util.Map;
32+
import java.util.ArrayList;
3233

34+
import com.cloud.service.dao.ServiceOfferingDao;
3335
import junit.framework.Assert;
3436

3537
import org.junit.Before;
@@ -135,6 +137,8 @@ public class VirtualMachineManagerImplTest {
135137
@Mock
136138
VMInstanceDao _vmInstanceDao;
137139
@Mock
140+
ServiceOfferingDao _offeringDao;
141+
@Mock
138142
VMTemplateDao _templateDao;
139143
@Mock
140144
VolumeDao _volsDao;
@@ -149,6 +153,8 @@ public class VirtualMachineManagerImplTest {
149153
@Mock
150154
VMInstanceVO _vmInstance;
151155
@Mock
156+
ServiceOfferingVO _serviceOfferingMock;
157+
@Mock
152158
HostVO _host;
153159
@Mock
154160
VMTemplateVO _templateMock;
@@ -227,6 +233,8 @@ public void setup() {
227233
_vmMgr._uservmDetailsDao = _vmDetailsDao;
228234
_vmMgr._entityMgr = _entityMgr;
229235
_vmMgr._configDepot = _configDepot;
236+
_vmMgr._offeringDao = _offeringDao;
237+
_vmMgr.hostAllocators = new ArrayList<>();
230238

231239
when(_vmMock.getId()).thenReturn(314l);
232240
when(_vmInstance.getId()).thenReturn(1L);
@@ -505,4 +513,24 @@ public void testSendStopWithNullAnswer() throws Exception {
505513

506514
Assert.assertFalse(actual);
507515
}
516+
517+
@Test
518+
public void testCheckIfCanUpgrade() throws Exception {
519+
when(_vmInstance.getState()).thenReturn(State.Stopped);
520+
when(_serviceOfferingMock.isDynamic()).thenReturn(true);
521+
when(_vmInstance.getServiceOfferingId()).thenReturn(1l);
522+
when(_serviceOfferingMock.getId()).thenReturn(2l);
523+
524+
ServiceOfferingVO mockCurrentServiceOffering = mock(ServiceOfferingVO.class);
525+
526+
when(_offeringDao.findByIdIncludingRemoved(anyLong(), anyLong())).thenReturn(mockCurrentServiceOffering);
527+
when(mockCurrentServiceOffering.getUseLocalStorage()).thenReturn(true);
528+
when(_serviceOfferingMock.getUseLocalStorage()).thenReturn(true);
529+
when(mockCurrentServiceOffering.getSystemUse()).thenReturn(true);
530+
when(_serviceOfferingMock.getSystemUse()).thenReturn(true);
531+
when(mockCurrentServiceOffering.getTags()).thenReturn("x,y");
532+
when(_serviceOfferingMock.getTags()).thenReturn("z,x,y");
533+
534+
_vmMgr.checkIfCanUpgrade(_vmInstance, _serviceOfferingMock);
535+
}
508536
}

‎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/api/query/QueryManagerImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2620,11 +2620,11 @@ private List<ServiceOfferingJoinVO> filterOfferingsOnCurrentTags(List<ServiceOff
26202620
if(currentVmOffering == null) return offerings;
26212621
List<String> currentTagsList = StringUtils.csvTagsToList(currentVmOffering.getTags());
26222622

2623-
// New offerings should be a subset of existing storage tags. Discard offerings who are not.
2623+
// New service offering should have all the tags of the current service offering.
26242624
List<ServiceOfferingJoinVO> filteredOfferings = new ArrayList<>();
26252625
for (ServiceOfferingJoinVO offering : offerings){
2626-
List<String> tags = StringUtils.csvTagsToList(offering.getTags());
2627-
if(currentTagsList.containsAll(tags)){
2626+
List<String> newTagsList = StringUtils.csvTagsToList(offering.getTags());
2627+
if(newTagsList.containsAll(currentTagsList)){
26282628
filteredOfferings.add(offering);
26292629
}
26302630
}

‎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);

0 commit comments

Comments
 (0)