You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/08/23 09:09:59 UTC
[1/3] git commit: updated refs/heads/master to 08627aa
Updated Branches:
refs/heads/master 9100fe2ef -> 08627aa75
CLOUDSTACK-4447: Fix router tests by listing Routers for that account of type 'Isolated'.
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit db673b2b9b40ca958ae930af3ec3d6e9085272ca)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c5165643
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c5165643
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c5165643
Branch: refs/heads/master
Commit: c5165643f489c3e75f0ed9cb671125a53117d673
Parents: 0454723
Author: SrikanteswaraRao Talluri <ka...@gmail.com>
Authored: Thu Aug 22 15:59:14 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Fri Aug 23 12:39:48 2013 +0530
----------------------------------------------------------------------
test/integration/component/test_routers.py | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5165643/test/integration/component/test_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_routers.py b/test/integration/component/test_routers.py
index 888302f..a724a3f 100644
--- a/test/integration/component/test_routers.py
+++ b/test/integration/component/test_routers.py
@@ -218,6 +218,7 @@ class TestRouterServices(cloudstackTestCase):
self.apiclient,
account=self.account.name,
domainid=self.account.domainid,
+ type = 'Isolated'
)
self.assertEqual(
isinstance(networks, list),
@@ -274,6 +275,7 @@ class TestRouterServices(cloudstackTestCase):
self.apiclient,
account=self.account.name,
domainid=self.account.domainid,
+ type = 'Isolated'
)
self.assertEqual(
isinstance(networks, list),
@@ -364,6 +366,7 @@ class TestRouterServices(cloudstackTestCase):
self.apiclient,
account=self.account.name,
domainid=self.account.domainid,
+ type = 'Isolated'
)
self.assertEqual(
isinstance(networks, list),
[2/3] git commit: updated refs/heads/master to 08627aa
Posted by ts...@apache.org.
CLOUDSTACK-4425:Fix to attach uploaded volume to a stopped VM test
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit 8762a0d0c6dde46e16b73f6880aa84ec2f359f55)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0454723f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0454723f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0454723f
Branch: refs/heads/master
Commit: 0454723f9837d3a2eb2978abe556f18de3d89ef9
Parents: 9100fe2
Author: SrikanteswaraRao Talluri <ka...@gmail.com>
Authored: Thu Aug 22 11:46:58 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Fri Aug 23 12:39:48 2013 +0530
----------------------------------------------------------------------
test/integration/component/test_stopped_vm.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0454723f/test/integration/component/test_stopped_vm.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_stopped_vm.py b/test/integration/component/test_stopped_vm.py
index c845f60..41eeb46 100644
--- a/test/integration/component/test_stopped_vm.py
+++ b/test/integration/component/test_stopped_vm.py
@@ -1697,9 +1697,7 @@ class TestUploadAttachVolume(cloudstackTestCase):
'Stopped',
"Check VM state is Running or not"
)
- with self.assertRaises(Exception):
- virtual_machine.attach_volume(self.apiclient, volume)
- self.debug("Failed to attach the volume as expected")
+ virtual_machine.attach_volume(self.apiclient, volume)
return
[3/3] git commit: updated refs/heads/master to 08627aa
Posted by ts...@apache.org.
CLOUDSTACK-4448: Fix test_03_RouterStartOnVmDeploy to stop all the pre-existing VMs before starting the test
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit 4a8119c8077ca15dfa42c11a425f3c5273f39f13)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/08627aa7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/08627aa7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/08627aa7
Branch: refs/heads/master
Commit: 08627aa75381cc5bb708b144ea1d62afd81e4c64
Parents: c516564
Author: SrikanteswaraRao Talluri <ka...@gmail.com>
Authored: Thu Aug 22 16:09:22 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Fri Aug 23 12:39:49 2013 +0530
----------------------------------------------------------------------
test/integration/component/test_routers.py | 29 +++++++++++++++++++++++++
1 file changed, 29 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/08627aa7/test/integration/component/test_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_routers.py b/test/integration/component/test_routers.py
index a724a3f..396c54e 100644
--- a/test/integration/component/test_routers.py
+++ b/test/integration/component/test_routers.py
@@ -492,6 +492,35 @@ class TestRouterServices(cloudstackTestCase):
# 4. listRouters should report router to have come back to "Running" state
# 5. All other VMs in the account should remain in "Stopped" state
+
+ #stop all pre-existing virtual machines if they are in 'Running' state
+ virtual_machines = list_virtual_machines(
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid,
+ )
+
+ self.assertEqual(
+ isinstance(virtual_machines, list),
+ True,
+ "Check for list virtual machines response return valid data"
+ )
+ self.assertNotEqual(
+ len(virtual_machines),
+ 0,
+ "Check list virtual machines response"
+ )
+ for virtual_machine in virtual_machines:
+ self.debug("VM ID: %s & VM state: %s" % (
+ virtual_machine.id,
+ virtual_machine.state
+ ))
+ if virtual_machine.state == 'Running':
+ # Stop virtual machine
+ cmd = stopVirtualMachine.stopVirtualMachineCmd()
+ cmd.id = virtual_machine.id
+ self.apiclient.stopVirtualMachine(cmd)
+
vm = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],