mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Added a test to verify that listSnapshots response returns zone id
Made changes based on Comments This closes #632
This commit is contained in:
parent
bccd344796
commit
f45548bf0b
@ -31,6 +31,7 @@ from marvin.lib.common import (get_domain,
|
||||
list_snapshots)
|
||||
from marvin.lib.decoratorGenerators import skipTestIf
|
||||
|
||||
|
||||
class TestSnapshotRootDisk(cloudstackTestCase):
|
||||
|
||||
@classmethod
|
||||
@ -57,7 +58,8 @@ class TestSnapshotRootDisk(cloudstackTestCase):
|
||||
cls.services["ostype"]
|
||||
)
|
||||
if template == FAILED:
|
||||
assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
|
||||
assert False, "get_template() failed to return template with description %s" % cls.services[
|
||||
"ostype"]
|
||||
|
||||
cls.services["domainid"] = cls.domain.id
|
||||
cls.services["server_without_disk"]["zoneid"] = cls.zone.id
|
||||
@ -83,6 +85,7 @@ class TestSnapshotRootDisk(cloudstackTestCase):
|
||||
templateid=template.id,
|
||||
accountid=cls.account.name,
|
||||
domainid=cls.account.domainid,
|
||||
zoneid=cls.zone.id,
|
||||
serviceofferingid=cls.service_offering.id,
|
||||
mode=cls.services["mode"]
|
||||
)
|
||||
@ -123,6 +126,7 @@ class TestSnapshotRootDisk(cloudstackTestCase):
|
||||
# the reqd volume under
|
||||
# /secondary/snapshots//$account_id/$volumeid/$snapshot_uuid
|
||||
# 3. verify backup_snap_id was non null in the `snapshots` table
|
||||
# 4. Verify that zoneid is returned in listSnapshots API response
|
||||
|
||||
volumes = list_volumes(
|
||||
self.apiclient,
|
||||
@ -159,12 +163,21 @@ class TestSnapshotRootDisk(cloudstackTestCase):
|
||||
snapshot.id,
|
||||
"Check resource id in list resources call"
|
||||
)
|
||||
|
||||
self.assertIsNotNone(snapshots[0].zoneid,
|
||||
"Zone id is not none in listSnapshots")
|
||||
self.assertEqual(
|
||||
snapshots[0].zoneid,
|
||||
self.zone.id,
|
||||
"Check zone id in the list snapshots"
|
||||
)
|
||||
|
||||
self.debug(
|
||||
"select backup_snap_id, account_id, volume_id from snapshots where uuid = '%s';" \
|
||||
"select backup_snap_id, account_id, volume_id from snapshots where uuid = '%s';"
|
||||
% str(snapshot.id)
|
||||
)
|
||||
qresultset = self.dbclient.execute(
|
||||
"select backup_snap_id, account_id, volume_id from snapshots where uuid = '%s';" \
|
||||
"select backup_snap_id, account_id, volume_id from snapshots where uuid = '%s';"
|
||||
% str(snapshot.id)
|
||||
)
|
||||
self.assertNotEqual(
|
||||
@ -183,5 +196,6 @@ class TestSnapshotRootDisk(cloudstackTestCase):
|
||||
"Check if backup_snap_id is not null"
|
||||
)
|
||||
|
||||
self.assertTrue(is_snapshot_on_nfs(self.apiclient, self.dbclient, self.config, self.zone.id, snapshot.id))
|
||||
self.assertTrue(is_snapshot_on_nfs(
|
||||
self.apiclient, self.dbclient, self.config, self.zone.id, snapshot.id))
|
||||
return
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user