You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ja...@apache.org on 2014/05/21 13:07:00 UTC
git commit: updated refs/heads/4.4-forward to e5de1cb
Repository: cloudstack
Updated Branches:
refs/heads/4.4-forward 22f503aa2 -> e5de1cb7c
CLOUDSTACK-6736: Added version informatoin, fixed data corruption, regression issues.
Signed-off-by: Jayapal <ja...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e5de1cb7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e5de1cb7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e5de1cb7
Branch: refs/heads/4.4-forward
Commit: e5de1cb7c2ad98307edf4983ffe7b23be5f12d3b
Parents: 22f503a
Author: santhosh <sa...@gmail.com>
Authored: Wed May 21 19:59:44 2014 +1000
Committer: Jayapal <ja...@apache.org>
Committed: Wed May 21 16:36:37 2014 +0530
----------------------------------------------------------------------
test/integration/smoke/test_deploy_vm.py | 3 +-
test/integration/smoke/test_guest_vlan_range.py | 8 +--
test/integration/smoke/test_hosts.py | 2 +-
test/integration/smoke/test_vm_life_cycle.py | 52 +++++++-------------
tools/marvin/marvin/cloudstackTestClient.py | 4 +-
tools/marvin/setup.py | 8 +--
6 files changed, 30 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e5de1cb7/test/integration/smoke/test_deploy_vm.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_deploy_vm.py b/test/integration/smoke/test_deploy_vm.py
index db26980..a8e406d 100644
--- a/test/integration/smoke/test_deploy_vm.py
+++ b/test/integration/smoke/test_deploy_vm.py
@@ -85,7 +85,8 @@ class TestDeployVM(cloudstackTestCase):
serviceofferingid=self.service_offering.id,
templateid=self.template.id
)
-
+ if not self.virtual_machine:
+ self.fail("Deploying a Virtual Machine Failed")
list_vms = VirtualMachine.list(self.apiclient, id=self.virtual_machine.id)
self.debug(
"Verify listVirtualMachines response for virtual machine: %s"\
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e5de1cb7/test/integration/smoke/test_guest_vlan_range.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_guest_vlan_range.py b/test/integration/smoke/test_guest_vlan_range.py
index bfef4a8..f5bcdf4 100644
--- a/test/integration/smoke/test_guest_vlan_range.py
+++ b/test/integration/smoke/test_guest_vlan_range.py
@@ -31,7 +31,7 @@ class TestDedicateGuestVlanRange(cloudstackTestCase):
@classmethod
def setUpClass(cls):
testClient = super(TestDedicateGuestVlanRange, cls).getClsTestClient()
- cls.apiclient = testClient.getApiClient()
+ cls.apiclient = testClient.getApiClient()
cls.services = testClient.getParsedTestDataConfig()
# Get Zone, Domain
@@ -78,7 +78,7 @@ class TestDedicateGuestVlanRange(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
- @attr(tags=["simulator", "advanced", "guestvlanrange", "dedicate", "release", "selfservice"])
+ @attr(tags=["simulator", "advanced", "guestvlanrange", "dedicate", "release", "selfservice"],BugId="CLOUDSTACK-6738")
def test_dedicateGuestVlanRange(self):
"""Test guest vlan range dedication
"""
@@ -97,11 +97,7 @@ class TestDedicateGuestVlanRange(cloudstackTestCase):
"""
self.debug("Adding guest vlan range")
-
- print "existing vlna = %s" %self.physical_network.vlan
- print "free vlan = %s" %self.free_vlan
new_vlan = self.physical_network.vlan + "," + self.free_vlan["partial_range"][0]
- print "new vlan = %s" % new_vlan
#new_vlan = self.free_vlan["partial_range"][0]
addGuestVlanRangeResponse = self.physical_network.update(self.apiclient,
id=self.physical_network.id, vlan=new_vlan)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e5de1cb7/test/integration/smoke/test_hosts.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_hosts.py b/test/integration/smoke/test_hosts.py
index 7798c8e..952f160 100644
--- a/test/integration/smoke/test_hosts.py
+++ b/test/integration/smoke/test_hosts.py
@@ -53,7 +53,7 @@ class TestHosts(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
- @attr(tags=["selfservice"])
+ #@attr(tags=["selfservice"])
def test_01_clusters(self):
"""Test Add clusters & hosts - simulator
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e5de1cb7/test/integration/smoke/test_vm_life_cycle.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py
index 85033c5..1e56571 100644
--- a/test/integration/smoke/test_vm_life_cycle.py
+++ b/test/integration/smoke/test_vm_life_cycle.py
@@ -531,34 +531,24 @@ class TestVMLifeCycle(cloudstackTestCase):
self.vm_to_migrate.migrate(self.apiclient, migrate_host.id)
- list_vm_response = VirtualMachine.list(
- self.apiclient,
- id=self.vm_to_migrate.id
- )
- self.assertNotEqual(
- list_vm_response,
- None,
- "Check virtual machine is listed"
- )
-
- vm_response = list_vm_response[0]
-
- self.assertEqual(
- vm_response.id,
- self.vm_to_migrate.id,
- "Check virtual machine ID of migrated VM"
- )
-
- self.assertEqual(
- vm_response.hostid,
- migrate_host.id,
- "Check destination hostID of migrated VM"
- )
+ retries_cnt = 3
+ while retries_cnt >=0:
+ list_vm_response = VirtualMachine.list(self.apiclient,
+ id=self.vm_to_migrate.id)
+ self.assertNotEqual(
+ list_vm_response,
+ None,
+ "Check virtual machine is listed"
+ )
+ vm_response = list_vm_response[0]
+ self.assertEqual(vm_response.id,self.vm_to_migrate.id,"Check virtual machine ID of migrated VM")
+ self.assertEqual(vm_response.hostid,migrate_host.id,"Check destination hostID of migrated VM")
+ retries_cnt = retries_cnt - 1
return
@attr(configuration = "expunge.interval")
@attr(configuration = "expunge.delay")
- @attr(tags = ["devcloud", "advanced", "advancedns", "smoke", "basic", "sg", "selfservice"],BugId="CLOUDSTACK-6708")
+ @attr(tags = ["devcloud", "advanced", "advancedns", "smoke", "basic", "sg", "selfservice"],BugId="CLOUDSTACK-6738")
def test_09_expunge_vm(self):
"""Test destroy(expunge) Virtual Machine
"""
@@ -592,19 +582,15 @@ class TestVMLifeCycle(cloudstackTestCase):
self.apiclient,
id=self.small_virtual_machine.id
)
- if list_vm_response:
- time.sleep(expunge_cycle)
- wait_time = wait_time - expunge_cycle
- else:
+ if not list_vm_response:
break
+ self.debug("Waiting for VM to expunge")
+ time.sleep(expunge_cycle)
+ wait_time = wait_time - expunge_cycle
self.debug("listVirtualMachines response: %s" % list_vm_response)
- self.assertEqual(
- list_vm_response,
- None,
- "Check Expunged virtual machine is in listVirtualMachines response"
- )
+ self.assertEqual(list_vm_response,None,"Check Expunged virtual machine is in listVirtualMachines response")
return
@attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg", "provisioning"])
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e5de1cb7/tools/marvin/marvin/cloudstackTestClient.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/cloudstackTestClient.py b/tools/marvin/marvin/cloudstackTestClient.py
index 86b0a4b..807ca5d 100644
--- a/tools/marvin/marvin/cloudstackTestClient.py
+++ b/tools/marvin/marvin/cloudstackTestClient.py
@@ -25,6 +25,7 @@ from marvin.configGenerator import ConfigManager
from marvin.cloudstackException import GetDetailExceptionInfo
from marvin.lib.utils import (random_gen, validateList)
from marvin.cloudstackAPI.cloudstackAPIClient import CloudStackAPIClient
+import copy
class CSTestClient(object):
@@ -83,8 +84,7 @@ class CSTestClient(object):
Tests are to Run
@Output : Returns the Parsed Test Data Dictionary
'''
- out = self.__parsedTestDataConfig
- return out
+ return copy.deepcopy(self.__parsedTestDataConfig)
def getZoneForTests(self):
'''
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e5de1cb7/tools/marvin/setup.py
----------------------------------------------------------------------
diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py
index 4c775ad..b7a927e 100644
--- a/tools/marvin/setup.py
+++ b/tools/marvin/setup.py
@@ -52,10 +52,10 @@ setup(name="Marvin",
"marvin.sandbox.basic"],
license="LICENSE.txt",
install_requires=[
- "mysql-connector-python",
- "requests",
- "paramiko",
- "nose",
+ "mysql-connector-python >= 1.1.6",
+ "requests >= 2.2.1",
+ "paramiko >= 1.13.0",
+ "nose >= 1.3.3",
"ddt >= 0.4.0"
],
py_modules=['marvin.marvinPlugin'],