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 2013/10/01 07:59:16 UTC
git commit: updated refs/heads/4.2-forward to 219c64e
Updated Branches:
refs/heads/4.2-forward b35e76132 -> 219c64eef
CLOUDSTACK: 4640 - Fixed indentation issues in function createInstance
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/219c64ee
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/219c64ee
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/219c64ee
Branch: refs/heads/4.2-forward
Commit: 219c64eef38ca1b44724abd299c79a9eb508bb73
Parents: b35e761
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Tue Sep 10 03:00:10 2013 -0400
Committer: sailajam <sa...@citrix.com>
Committed: Tue Oct 1 11:24:33 2013 +0530
----------------------------------------------------------------------
.../component/cpu_limits/test_cpu_limits.py | 36 ++++++++++----------
.../component/cpu_limits/test_project_limits.py | 28 +++++++--------
2 files changed, 32 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/219c64ee/test/integration/component/cpu_limits/test_cpu_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/cpu_limits/test_cpu_limits.py b/test/integration/component/cpu_limits/test_cpu_limits.py
index 8acf8b7..d721a45 100644
--- a/test/integration/component/cpu_limits/test_cpu_limits.py
+++ b/test/integration/component/cpu_limits/test_cpu_limits.py
@@ -154,10 +154,10 @@ class TestCPULimits(cloudstackTestCase):
if api_client is None:
api_client = self.apiclient
- self.debug("Deploying an instance in account: %s" %
+ self.debug("Deploying an instance in account: %s" %
self.account.name)
- try:
- vm = VirtualMachine.create(
+ try:
+ vm = VirtualMachine.create(
api_client,
self.services["virtual_machine"],
templateid=self.template.id,
@@ -165,15 +165,15 @@ class TestCPULimits(cloudstackTestCase):
domainid=self.account.domainid,
networkids=networks,
serviceofferingid=service_off.id)
- vms = VirtualMachine.list(api_client, id=vm.id, listall=True)
- self.assertIsInstance(vms,
+ vms = VirtualMachine.list(api_client, id=vm.id, listall=True)
+ self.assertIsInstance(vms,
list,
"List VMs should return a valid response")
- self.assertEqual(vms[0].state, "Running",
+ self.assertEqual(vms[0].state, "Running",
"Vm state should be running after deployment")
- return vm
- except Exception as e:
- self.fail("Failed to deploy an instance: %s" % e)
+ return vm
+ except Exception as e:
+ self.fail("Failed to deploy an instance: %s" % e)
@attr(tags=["advanced", "advancedns","simulator"])
def test_01_multiplecore_start_stop_instance(self):
@@ -401,10 +401,10 @@ class TestDomainCPULimitsConfiguration(cloudstackTestCase):
if api_client is None:
api_client = self.apiclient
- self.debug("Deploying an instance in account: %s" %
+ self.debug("Deploying an instance in account: %s" %
self.account.name)
- try:
- vm = VirtualMachine.create(
+ try:
+ vm = VirtualMachine.create(
api_client,
self.services["virtual_machine"],
templateid=self.template.id,
@@ -412,15 +412,15 @@ class TestDomainCPULimitsConfiguration(cloudstackTestCase):
domainid=self.account.domainid,
networkids=networks,
serviceofferingid=service_off.id)
- vms = VirtualMachine.list(api_client, id=vm.id, listall=True)
- self.assertIsInstance(vms,
+ vms = VirtualMachine.list(api_client, id=vm.id, listall=True)
+ self.assertIsInstance(vms,
list,
"List VMs should return a valid response")
- self.assertEqual(vms[0].state, "Running",
+ self.assertEqual(vms[0].state, "Running",
"Vm state should be running after deployment")
- return vm
- except Exception as e:
- self.fail("Failed to deploy an instance: %s" % e)
+ return vm
+ except Exception as e:
+ self.fail("Failed to deploy an instance: %s" % e)
def setupAccounts(self):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/219c64ee/test/integration/component/cpu_limits/test_project_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/cpu_limits/test_project_limits.py b/test/integration/component/cpu_limits/test_project_limits.py
index 3c432db..63d1a98 100644
--- a/test/integration/component/cpu_limits/test_project_limits.py
+++ b/test/integration/component/cpu_limits/test_project_limits.py
@@ -162,23 +162,23 @@ class TestProjectsCPULimits(cloudstackTestCase):
if api_client is None:
api_client = self.api_client
- try:
- self.vm = VirtualMachine.create(
- api_client,
- self.services["virtual_machine"],
- templateid=self.template.id,
- projectid=project.id,
- networkids=networks,
- serviceofferingid=service_off.id)
- vms = VirtualMachine.list(api_client, id=self.vm.id, listall=True)
- self.assertIsInstance(vms,
+ try:
+ self.vm = VirtualMachine.create(
+ api_client,
+ self.services["virtual_machine"],
+ templateid=self.template.id,
+ projectid=project.id,
+ networkids=networks,
+ serviceofferingid=service_off.id)
+ vms = VirtualMachine.list(api_client, id=self.vm.id, listall=True)
+ self.assertIsInstance(vms,
list,
"List VMs should return a valid response")
- self.assertEqual(vms[0].state, "Running",
+ self.assertEqual(vms[0].state, "Running",
"Vm state should be running after deployment")
- return self.vm
- except Exception as e:
- self.fail("Failed to deploy an instance: %s" % e)
+ return self.vm
+ except Exception as e:
+ self.fail("Failed to deploy an instance: %s" % e)
def setupProjectAccounts(self):