You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2015/09/23 11:31:52 UTC
[1/3] git commit: updated refs/heads/master to 2f7852b
Repository: cloudstack
Updated Branches:
refs/heads/master 1a474374b -> 2f7852bc5
CLOUDSTACK-8893: Fixing script as per the latest functionality
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fbc2e2e9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fbc2e2e9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fbc2e2e9
Branch: refs/heads/master
Commit: fbc2e2e983938e6a16b7e44eb19db9e659b7a570
Parents: 1a47437
Author: sanjeev <sa...@apache.org>
Authored: Tue Sep 22 14:47:37 2015 +0530
Committer: sanjeev <sa...@apache.org>
Committed: Wed Sep 23 11:52:08 2015 +0530
----------------------------------------------------------------------
test/integration/smoke/test_vm_snapshots.py | 32 ++++++++++++++++++------
1 file changed, 25 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fbc2e2e9/test/integration/smoke/test_vm_snapshots.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_vm_snapshots.py b/test/integration/smoke/test_vm_snapshots.py
index 93f1c3e..79e8173 100644
--- a/test/integration/smoke/test_vm_snapshots.py
+++ b/test/integration/smoke/test_vm_snapshots.py
@@ -19,7 +19,7 @@
from marvin.codes import FAILED, KVM, PASS
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import cloudstackTestCase
-from marvin.lib.utils import random_gen, cleanup_resources, validateList
+from marvin.lib.utils import random_gen, cleanup_resources, validateList, is_snapshot_on_nfs
from marvin.lib.base import (Account,
ServiceOffering,
VirtualMachine,
@@ -28,7 +28,8 @@ from marvin.lib.base import (Account,
Snapshot)
from marvin.lib.common import (get_zone,
get_domain,
- get_template)
+ get_template,
+ list_snapshots)
import time
@@ -337,6 +338,7 @@ class TestSnapshots(cloudstackTestCase):
def setUp(self):
self.apiclient = self.testClient.getApiClient()
+ self.dbclient = self.testClient.getDbConnection()
self.cleanup = []
if self.unsupportedHypervisor:
@@ -390,9 +392,25 @@ class TestSnapshots(cloudstackTestCase):
self.assertEqual(validateList(volumes)[0], PASS,
"Failed to get root volume of the VM")
- volume = volumes[0]
-
- with self.assertRaises(Exception):
- Snapshot.create(self.apiclient,
- volume_id=volume.id)
+ snapshot = Snapshot.create(
+ self.apiclient,
+ volumes[0].id,
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
+ self.debug("Snapshot created: ID - %s" % snapshot.id)
+ snapshots = list_snapshots(
+ self.apiclient,
+ id=snapshot.id
+ )
+ self.assertEqual(
+ validateList(snapshots)[0],
+ PASS,
+ "Invalid snapshot list"
+ )
+ self.assertEqual(
+ snapshots[0].id,
+ snapshot.id,
+ "Check resource id in list resources call"
+ )
return
[2/3] git commit: updated refs/heads/master to 2f7852b
Posted by sa...@apache.org.
Modified test description
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7147627a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7147627a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7147627a
Branch: refs/heads/master
Commit: 7147627aa2756c21d28560c1d126c2cdc5cfe771
Parents: fbc2e2e
Author: sanjeev <sa...@apache.org>
Authored: Wed Sep 23 11:50:38 2015 +0530
Committer: sanjeev <sa...@apache.org>
Committed: Wed Sep 23 11:52:10 2015 +0530
----------------------------------------------------------------------
test/integration/smoke/test_vm_snapshots.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7147627a/test/integration/smoke/test_vm_snapshots.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_vm_snapshots.py b/test/integration/smoke/test_vm_snapshots.py
index 79e8173..3831848 100644
--- a/test/integration/smoke/test_vm_snapshots.py
+++ b/test/integration/smoke/test_vm_snapshots.py
@@ -362,12 +362,12 @@ class TestSnapshots(cloudstackTestCase):
@attr(tags=["advanced", "basic", "smoke"], required_hardware="true")
def test_01_test_vm_volume_snapshot(self):
"""
- @Desc: Test that Volume snapshot for root volume not allowed
+ @Desc: Test that Volume snapshot for root volume is allowed
when VM snapshot is present for the VM
@Steps:
1: Deploy a VM and create a VM snapshot for VM
2: Try to create snapshot for the root volume of the VM,
- It should fail
+ It should not fail
"""
# Creating Virtual Machine
[3/3] git commit: updated refs/heads/master to 2f7852b
Posted by sa...@apache.org.
Merge pull request #871 from sanju1010/vmsnap
CLOUDSTACK-8893: Fixing script as per the latest functionalityPlease check https://issues.apache.org/jira/browse/CLOUDSTACK-8893 for more details.
* pr/871:
Modified test description
CLOUDSTACK-8893: Fixing script as per the latest functionality
Signed-off-by: sanjeev <sa...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2f7852bc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2f7852bc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2f7852bc
Branch: refs/heads/master
Commit: 2f7852bc590a8baf3fea842c239294060fbeb5cf
Parents: 1a47437 7147627
Author: sanjeev <sa...@apache.org>
Authored: Wed Sep 23 15:01:17 2015 +0530
Committer: sanjeev <sa...@apache.org>
Committed: Wed Sep 23 15:01:20 2015 +0530
----------------------------------------------------------------------
test/integration/smoke/test_vm_snapshots.py | 36 ++++++++++++++++++------
1 file changed, 27 insertions(+), 9 deletions(-)
----------------------------------------------------------------------