Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DBBE311716 for ; Wed, 11 Jun 2014 11:09:41 +0000 (UTC) Received: (qmail 14776 invoked by uid 500); 11 Jun 2014 11:09:39 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 14751 invoked by uid 500); 11 Jun 2014 11:09:39 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 14743 invoked by uid 99); 11 Jun 2014 11:09:39 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Jun 2014 11:09:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3ED4792720A; Wed, 11 Jun 2014 11:09:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: talluri@apache.org To: commits@cloudstack.apache.org Message-Id: <818b7a5b9bbb4dc4ba45f13921e3d4fe@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 31d8709 Date: Wed, 11 Jun 2014 11:09:39 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master cdfa26506 -> 31d870933 Fixed vm ha cases failing in master Signed-off-by: SrikanteswaraRao Talluri Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/31d87093 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/31d87093 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/31d87093 Branch: refs/heads/master Commit: 31d870933dcc39a5886ea0f6c93b9718c33ac9aa Parents: cdfa265 Author: Santhosh Edukulla Authored: Wed Jun 11 16:21:59 2014 +0530 Committer: SrikanteswaraRao Talluri Committed: Wed Jun 11 16:39:10 2014 +0530 ---------------------------------------------------------------------- test/integration/smoke/test_vm_ha.py | 45 ++++------------------------ tools/marvin/marvin/config/test_data.py | 10 +++---- 2 files changed, 11 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/31d87093/test/integration/smoke/test_vm_ha.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_vm_ha.py b/test/integration/smoke/test_vm_ha.py index f549243..4063946 100644 --- a/test/integration/smoke/test_vm_ha.py +++ b/test/integration/smoke/test_vm_ha.py @@ -35,51 +35,18 @@ from marvin.lib.common import get_zone, get_domain, get_template from nose.plugins.attrib import attr -class TestData(object): - """Test data object that is required to create resources - """ - def __init__(self): - self.testdata = { - #data to create an account - "account": { - "email": "test@test.com", - "firstname": "Test", - "lastname": "User", - "username": "test", - "password": "password", - }, - #data reqd for virtual machine creation - "virtual_machine" : { - "name" : "testvm", - "displayname" : "Test VM", - }, - #small service offering - "service_offering": { - "hasmall": { - "name": "HA Small Instance", - "displaytext": "HA Small Instance", - "cpunumber": 1, - "cpuspeed": 100, - "memory": 256, - "hosttags": "ha", - "offerha": True, - }, - }, - "ostype": 'CentOS 5.3 (64-bit)', - } - - class TestDeployVMHA(cloudstackTestCase): """Test VM HA """ def setUp(self): - self.testdata = TestData().testdata + self.testdata = self.testClient.getParsedTestDataConfig() self.apiclient = self.testClient.getApiClient() # Get Zone, Domain and Default Built-in template - self.domain = get_domain(self.apiclient, self.testdata) - self.zone = get_zone(self.apiclient, self.testdata) + self.domain = get_domain(self.apiclient) + self.zone = get_zone(self.apiclient, self.testClient.getZoneForTests()) + self.testdata["mode"] = self.zone.networktype self.template = get_template(self.apiclient, self.zone.id, self.testdata["ostype"]) @@ -95,7 +62,7 @@ class TestDeployVMHA(cloudstackTestCase): self.assertTrue(isinstance(self.hosts, list) and len(self.hosts) >= 2, msg = "Atleast 2 hosts required in cluster for VM HA test") #update host tags for host in self.hosts: - Host.update(self.apiclient, id=host.id, hosttags=self.testdata["service_offering"]["hasmall"]["hosttags"]) + Host.update(self.apiclient, id=host.id, hosttags=self.testdata["service_offerings"]["hasmall"]["hosttags"]) #create a user account self.account = Account.create( @@ -106,7 +73,7 @@ class TestDeployVMHA(cloudstackTestCase): #create a service offering self.service_offering = ServiceOffering.create( self.apiclient, - self.testdata["service_offering"]["hasmall"] + self.testdata["service_offerings"]["hasmall"] ) #deploy ha vm self.virtual_machine = VirtualMachine.create( http://git-wip-us.apache.org/repos/asf/cloudstack/blob/31d87093/tools/marvin/marvin/config/test_data.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py index 0a5762d..63661ed 100644 --- a/tools/marvin/marvin/config/test_data.py +++ b/tools/marvin/marvin/config/test_data.py @@ -326,14 +326,14 @@ test_data = { } }, "shared_network_offering_all_services": { - "name":"shaared network offering with services enabled", - "displaytext": "Shard network offering", + "name": "shared network offering with services enabled", + "displaytext": "Shared network offering", "guestiptype": "Shared", "supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,Vpn,Firewall,Lb,UserData,StaticNat", - "specifyVlan" : "False", - "specifyIpRanges" : "False", + "specifyVlan": "False", + "specifyIpRanges": "False", "traffictype": "GUEST", - "serviceProviderList" : { + "serviceProviderList": { "Dhcp": "VirtualRouter", "Dns": "VirtualRouter", "UserData": "VirtualRouter",