Skip to content

Commit 3b9a1b5

Browse files
sureshanapartisureshanaparti
committed
ScaleIO/PowerFlex smoke tests improvements, and some fixes
1 parent 92e7593 commit 3b9a1b5

13 files changed

Lines changed: 261 additions & 41 deletions

File tree

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3087,7 +3087,7 @@ public int compare(final DiskTO arg0, final DiskTO arg1) {
30873087
}
30883088

30893089
if (vmSpec.getOs().toLowerCase().contains("window")) {
3090-
isWindowsTemplate =true;
3090+
isWindowsTemplate = true;
30913091
}
30923092
for (final DiskTO volume : disks) {
30933093
KVMPhysicalDisk physicalDisk = null;
@@ -3206,6 +3206,9 @@ public int compare(final DiskTO arg0, final DiskTO arg1) {
32063206
disk.defNetworkBasedDisk(physicalDisk.getPath().replace("rbd:", ""), pool.getSourceHost(), pool.getSourcePort(), pool.getAuthUserName(),
32073207
pool.getUuid(), devId, diskBusType, DiskProtocol.RBD, DiskDef.DiskFmtType.RAW);
32083208
} else if (pool.getType() == StoragePoolType.PowerFlex) {
3209+
if (isWindowsTemplate && isUefiEnabled) {
3210+
diskBusTypeData = DiskDef.DiskBus.SATA;
3211+
}
32093212
disk.defBlockBasedDisk(physicalDisk.getPath(), devId, diskBusTypeData);
32103213
if (physicalDisk.getFormat().equals(PhysicalDiskFormat.QCOW2)) {
32113214
disk.setDiskFormatType(DiskDef.DiskFmtType.QCOW2);
@@ -3236,7 +3239,6 @@ public int compare(final DiskTO arg0, final DiskTO arg1) {
32363239
disk.defFileBasedDisk(physicalDisk.getPath(), devId, diskBusType, DiskDef.DiskFmtType.QCOW2);
32373240
}
32383241
}
3239-
32403242
}
32413243
pool.customizeLibvirtDiskDef(disk);
32423244
}
@@ -4513,6 +4515,14 @@ protected String getDiskPathFromDiskDef(DiskDef disk) {
45134515
return token[1];
45144516
}
45154517
} else if (token.length > 3) {
4518+
// for powerflex/scaleio, path = /dev/disk/by-id/emc-vol-2202eefc4692120f-540fd8fa00000003
4519+
if (token.length > 4 && StringUtils.isNotBlank(token[4]) && token[4].startsWith("emc-vol-")) {
4520+
final String[] emcVolToken = token[4].split("-");
4521+
if (emcVolToken.length == 4) {
4522+
return emcVolToken[3];
4523+
}
4524+
}
4525+
45164526
// for example, path = /mnt/pool_uuid/disk_path/
45174527
return token[3];
45184528
}

‎plugins/metrics/src/main/java/org/apache/cloudstack/metrics/MetricsServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ public ListResponse<VmMetricsStatsResponse> searchForSystemVmMetricsStats(ListSy
234234
@Override
235235
public ListResponse<VolumeMetricsStatsResponse> searchForVolumeMetricsStats(ListVolumesUsageHistoryCmd cmd) {
236236
Pair<List<VolumeVO>, Integer> volumeList = searchForVolumesInternal(cmd);
237-
Map<Long,List<VolumeStatsVO>> volumeStatsList = searchForVolumeMetricsStatsInternal(cmd, volumeList.first());
237+
Map<Long, List<VolumeStatsVO>> volumeStatsList = searchForVolumeMetricsStatsInternal(cmd, volumeList.first());
238238
return createVolumeMetricsStatsResponse(volumeList, volumeStatsList);
239239
}
240240

‎server/src/main/java/com/cloud/server/StatsCollector.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1459,7 +1459,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
14591459
for (VmDiskStats vmDiskStat : vmDiskStats) {
14601460
VmDiskStatsEntry vmDiskStatEntry = (VmDiskStatsEntry)vmDiskStat;
14611461
SearchCriteria<VolumeVO> sc_volume = _volsDao.createSearchCriteria();
1462-
sc_volume.addAnd("path", SearchCriteria.Op.EQ, vmDiskStatEntry.getPath());
1462+
sc_volume.addAnd("path", SearchCriteria.Op.LIKE, vmDiskStatEntry.getPath() + "%");
14631463
List<VolumeVO> volumes = _volsDao.search(sc_volume, null);
14641464

14651465
if (CollectionUtils.isEmpty(volumes))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5860,7 +5860,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
58605860

58615861
for (VmDiskStatsEntry vmDiskStat : vmDiskStats) {
58625862
SearchCriteria<VolumeVO> sc_volume = _volsDao.createSearchCriteria();
5863-
sc_volume.addAnd("path", SearchCriteria.Op.EQ, vmDiskStat.getPath());
5863+
sc_volume.addAnd("path", SearchCriteria.Op.LIKE, vmDiskStat.getPath() + "%");
58645864
List<VolumeVO> volumes = _volsDao.search(sc_volume, null);
58655865
if ((volumes == null) || (volumes.size() == 0)) {
58665866
break;

‎test/integration/smoke/test_deploy_vm_root_resize.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
RESOURCE_PRIMARY_STORAGE
3333
from nose.plugins.attrib import attr
3434
from marvin.sshClient import SshClient
35+
import math
3536
import time
3637
import re
3738
from marvin.cloudstackAPI import updateTemplate,registerTemplate
@@ -276,6 +277,14 @@ def test_00_deploy_vm_root_resize(self):
276277
self.assertNotEqual(res[2], INVALID_INPUT, "Invalid list VM "
277278
"response")
278279
rootvolume = list_volume_response[0]
280+
list_volume_pool_response = list_storage_pools(
281+
self.apiclient,
282+
id=rootvolume.storageid
283+
)
284+
rootvolume_pool = list_volume_pool_response[0]
285+
if rootvolume_pool.type.lower() == "powerflex":
286+
newrootsize = (int(math.ceil(newrootsize / 8) * 8))
287+
279288
success = False
280289
if rootvolume is not None and rootvolume.size == (newrootsize << 30):
281290
success = True

‎test/integration/smoke/test_restore_vm.py‎

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,13 @@
1616
# under the License.
1717
""" P1 tests for Scaling up Vm
1818
"""
19+
20+
import math
21+
1922
# Import Local Modules
2023
from marvin.cloudstackTestCase import cloudstackTestCase
2124
from marvin.lib.base import (VirtualMachine, Volume, DiskOffering, ServiceOffering, Template)
22-
from marvin.lib.common import (get_zone, get_domain)
25+
from marvin.lib.common import (get_zone, get_domain, list_storage_pools)
2326
from nose.plugins.attrib import attr
2427

2528
_multiprocess_shared_ = True
@@ -78,8 +81,13 @@ def test_01_restore_vm(self):
7881
self._cleanup.append(virtual_machine)
7982

8083
old_root_vol = Volume.list(self.apiclient, virtualmachineid=virtual_machine.id)[0]
84+
old_root_vol_pool_res = list_storage_pools(self.apiclient, id=old_root_vol.storageid)
85+
old_root_vol_pool = old_root_vol_pool_res[0]
86+
expected_old_root_vol_size = self.template_t1.size
87+
if old_root_vol_pool.type.lower() == "powerflex":
88+
expected_old_root_vol_size = (int(math.ceil((expected_old_root_vol_size / (1024 ** 3)) / 8) * 8)) * (1024 ** 3)
8189
self.assertEqual(old_root_vol.state, 'Ready', "Volume should be in Ready state")
82-
self.assertEqual(old_root_vol.size, self.template_t1.size, "Size of volume and template should match")
90+
self.assertEqual(old_root_vol.size, expected_old_root_vol_size, "Size of volume and template should match")
8391

8492
virtual_machine.restore(self.apiclient, self.template_t2.id, expunge=True)
8593

@@ -88,8 +96,13 @@ def test_01_restore_vm(self):
8896
self.assertEqual(restored_vm.templateid, self.template_t2.id, "VM's template after restore is incorrect")
8997

9098
root_vol = Volume.list(self.apiclient, virtualmachineid=restored_vm.id)[0]
99+
root_vol_pool_res = list_storage_pools(self.apiclient, id=root_vol.storageid)
100+
root_vol_pool = root_vol_pool_res[0]
101+
expected_root_vol_size = self.template_t2.size
102+
if root_vol_pool.type.lower() == "powerflex":
103+
expected_root_vol_size = (int(math.ceil((expected_root_vol_size / (1024 ** 3)) / 8) * 8)) * (1024 ** 3)
91104
self.assertEqual(root_vol.state, 'Ready', "Volume should be in Ready state")
92-
self.assertEqual(root_vol.size, self.template_t2.size, "Size of volume and template should match")
105+
self.assertEqual(root_vol.size, expected_root_vol_size, "Size of volume and template should match")
93106

94107
old_root_vol = Volume.list(self.apiclient, id=old_root_vol.id)
95108
self.assertEqual(old_root_vol, None, "Old volume should be deleted")
@@ -105,8 +118,13 @@ def test_02_restore_vm_with_disk_offering(self):
105118
self._cleanup.append(virtual_machine)
106119

107120
old_root_vol = Volume.list(self.apiclient, virtualmachineid=virtual_machine.id)[0]
121+
old_root_vol_pool_res = list_storage_pools(self.apiclient, id=old_root_vol.storageid)
122+
old_root_vol_pool = old_root_vol_pool_res[0]
123+
expected_old_root_vol_size = self.template_t1.size
124+
if old_root_vol_pool.type.lower() == "powerflex":
125+
expected_old_root_vol_size = (int(math.ceil((expected_old_root_vol_size / (1024 ** 3)) / 8) * 8)) * (1024 ** 3)
108126
self.assertEqual(old_root_vol.state, 'Ready', "Volume should be in Ready state")
109-
self.assertEqual(old_root_vol.size, self.template_t1.size, "Size of volume and template should match")
127+
self.assertEqual(old_root_vol.size, expected_old_root_vol_size, "Size of volume and template should match")
110128

111129
virtual_machine.restore(self.apiclient, self.template_t2.id, self.disk_offering.id, expunge=True)
112130

@@ -115,9 +133,14 @@ def test_02_restore_vm_with_disk_offering(self):
115133
self.assertEqual(restored_vm.templateid, self.template_t2.id, "VM's template after restore is incorrect")
116134

117135
root_vol = Volume.list(self.apiclient, virtualmachineid=restored_vm.id)[0]
136+
root_vol_pool_res = list_storage_pools(self.apiclient, id=root_vol.storageid)
137+
root_vol_pool = root_vol_pool_res[0]
138+
expected_root_vol_size = self.disk_offering.disksize
139+
if root_vol_pool.type.lower() == "powerflex":
140+
expected_root_vol_size = (int(math.ceil(expected_root_vol_size / 8) * 8))
118141
self.assertEqual(root_vol.diskofferingid, self.disk_offering.id, "Disk offering id should match")
119142
self.assertEqual(root_vol.state, 'Ready', "Volume should be in Ready state")
120-
self.assertEqual(root_vol.size, self.disk_offering.disksize * 1024 * 1024 * 1024,
143+
self.assertEqual(root_vol.size, expected_root_vol_size * 1024 * 1024 * 1024,
121144
"Size of volume and disk offering should match")
122145

123146
old_root_vol = Volume.list(self.apiclient, id=old_root_vol.id)
@@ -134,8 +157,13 @@ def test_03_restore_vm_with_disk_offering_custom_size(self):
134157
self._cleanup.append(virtual_machine)
135158

136159
old_root_vol = Volume.list(self.apiclient, virtualmachineid=virtual_machine.id)[0]
160+
old_root_vol_pool_res = list_storage_pools(self.apiclient, id=old_root_vol.storageid)
161+
old_root_vol_pool = old_root_vol_pool_res[0]
162+
expected_old_root_vol_size = self.template_t1.size
163+
if old_root_vol_pool.type.lower() == "powerflex":
164+
expected_old_root_vol_size = (int(math.ceil((expected_old_root_vol_size / (1024 ** 3)) / 8) * 8)) * (1024 ** 3)
137165
self.assertEqual(old_root_vol.state, 'Ready', "Volume should be in Ready state")
138-
self.assertEqual(old_root_vol.size, self.template_t1.size, "Size of volume and template should match")
166+
self.assertEqual(old_root_vol.size, expected_old_root_vol_size, "Size of volume and template should match")
139167

140168
virtual_machine.restore(self.apiclient, self.template_t2.id, self.disk_offering.id, rootdisksize=16)
141169

‎test/integration/smoke/test_snapshots.py‎

Lines changed: 43 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@
1818
from marvin.codes import FAILED
1919
from nose.plugins.attrib import attr
2020
from marvin.cloudstackTestCase import cloudstackTestCase
21+
from marvin.cloudstackException import CloudstackAPIException
2122
from marvin.lib.utils import (cleanup_resources,
2223
is_snapshot_on_nfs,
24+
is_snapshot_on_powerflex,
2325
validateList)
2426
from marvin.lib.base import (VirtualMachine,
2527
Account,
@@ -146,10 +148,16 @@ def test_01_snapshot_root_disk(self):
146148
type='ROOT',
147149
listall=True
148150
)
151+
volume = volumes[0]
152+
volume_pool_response = list_storage_pools(
153+
self.apiclient,
154+
id=volume.storageid
155+
)
156+
volume_pool = volume_pool_response[0]
149157

150158
snapshot = Snapshot.create(
151159
self.apiclient,
152-
volumes[0].id,
160+
volume.id,
153161
account=self.account.name,
154162
domainid=self.account.domainid
155163
)
@@ -209,6 +217,11 @@ def test_01_snapshot_root_disk(self):
209217
"Check if backup_snap_id is not null"
210218
)
211219

220+
if volume_pool.type.lower() == "powerflex":
221+
self.assertTrue(is_snapshot_on_powerflex(
222+
self.apiclient, self.dbclient, self.config, self.zone.id, snapshot.id))
223+
return
224+
212225
self.assertTrue(is_snapshot_on_nfs(
213226
self.apiclient, self.dbclient, self.config, self.zone.id, snapshot.id))
214227
return
@@ -246,6 +259,11 @@ def test_02_list_snapshots_with_removed_data_store(self):
246259
PASS,
247260
"Invalid response returned for list volumes")
248261
vol_uuid = vol_res[0].id
262+
volume_pool_response = list_storage_pools(self.apiclient,
263+
id=vol_res[0].storageid)
264+
volume_pool = volume_pool_response[0]
265+
if volume_pool.type.lower() != 'networkfilesystem':
266+
self.skipTest("This test is not supported for volume created on storage pool type %s" % volume_pool.type)
249267
clusters = list_clusters(
250268
self.apiclient,
251269
zoneid=self.zone.id
@@ -437,15 +455,16 @@ def setUpClass(cls):
437455
)
438456
cls._cleanup.append(cls.virtual_machine)
439457

440-
volumes =Volume.list(
458+
volumes = Volume.list(
441459
cls.userapiclient,
442460
virtualmachineid=cls.virtual_machine.id,
443461
type='ROOT',
444462
listall=True
445463
)
464+
cls.volume = volumes[0]
446465
cls.snapshot = Snapshot.create(
447466
cls.userapiclient,
448-
volumes[0].id,
467+
cls.volume.id,
449468
account=cls.account.name,
450469
domainid=cls.account.domainid
451470
)
@@ -475,13 +494,28 @@ def test_01_snapshot_to_volume(self):
475494
"""Test creating volume from snapshot
476495
"""
477496
self.services['volume_from_snapshot']['zoneid'] = self.zone.id
478-
self.volume_from_snap = Volume.create_from_snapshot(
479-
self.userapiclient,
480-
snapshot_id=self.snapshot.id,
481-
services=self.services["volume_from_snapshot"],
482-
account=self.account.name,
483-
domainid=self.account.domainid
497+
snapshot_volume_pool_response = list_storage_pools(
498+
self.apiclient,
499+
id=self.volume.storageid
484500
)
501+
snapshot_volume_pool = snapshot_volume_pool_response[0]
502+
try:
503+
self.volume_from_snap = Volume.create_from_snapshot(
504+
self.userapiclient,
505+
snapshot_id=self.snapshot.id,
506+
services=self.services["volume_from_snapshot"],
507+
account=self.account.name,
508+
domainid=self.account.domainid
509+
)
510+
except CloudstackAPIException as cs:
511+
self.debug(cs.errorMsg)
512+
if snapshot_volume_pool.type.lower() == "powerflex":
513+
self.assertTrue(
514+
cs.errorMsg.find("Create volume from snapshot is not supported for PowerFlex volume snapshots") > 0,
515+
msg="Other than unsupported error while creating volume from snapshot for volume on PowerFlex pool")
516+
return
517+
self.fail("Failed to create volume from snapshot: %s" % cs)
518+
485519
self.cleanup.append(self.volume_from_snap)
486520

487521
self.assertEqual(

‎test/integration/smoke/test_usage.py‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
from marvin.lib.common import (get_zone,
4141
get_domain,
4242
get_suitable_test_template,
43+
list_storage_pools,
4344
find_storage_pool_type)
4445

4546

@@ -611,17 +612,17 @@ def test_01_volume_usage(self):
611612
except Exception as e:
612613
self.fail("Failed to stop instance: %s" % e)
613614

614-
volume_response = Volume.list(
615+
data_volume_response = Volume.list(
615616
self.apiclient,
616617
virtualmachineid=self.virtual_machine.id,
617618
type='DATADISK',
618619
listall=True)
619620
self.assertEqual(
620-
isinstance(volume_response, list),
621+
isinstance(data_volume_response, list),
621622
True,
622623
"Check for valid list volumes response"
623624
)
624-
data_volume = volume_response[0]
625+
data_volume = data_volume_response[0]
625626

626627
# Detach data Disk
627628
self.debug("Detaching volume ID: %s VM with ID: %s" % (
@@ -769,7 +770,25 @@ def test_01_volume_usage(self):
769770
"Running",
770771
"VM state should be running after deployment"
771772
)
772-
self.virtual_machine.attach_volume(self.apiclient,volume_uploaded)
773+
root_volume_response = Volume.list(
774+
self.apiclient,
775+
virtualmachineid=self.virtual_machine.id,
776+
type='ROOT',
777+
listall=True)
778+
root_volume = root_volume_response[0]
779+
rool_volume_pool_response = list_storage_pools(
780+
self.apiclient,
781+
id=root_volume.storageid
782+
)
783+
rool_volume_pool = rool_volume_pool_response[0]
784+
try:
785+
self.virtual_machine.attach_volume(self.apiclient,volume_uploaded)
786+
except Exception as e:
787+
self.debug("Exception %s: " % e)
788+
if rool_volume_pool.type.lower() == "powerflex" and "this operation is unsupported on storage pool type PowerFlex" in str(e):
789+
return
790+
self.fail(e)
791+
773792
self.debug("select type from usage_event where offering_id = 6 and volume_id = '%s';"
774793
% volume_id)
775794

0 commit comments

Comments
 (0)