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 9E4FB11061 for ; Thu, 4 Sep 2014 11:38:53 +0000 (UTC) Received: (qmail 62041 invoked by uid 500); 4 Sep 2014 11:38:53 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 62014 invoked by uid 500); 4 Sep 2014 11:38:53 -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 62000 invoked by uid 99); 4 Sep 2014 11:38:53 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Sep 2014 11:38:53 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1A11EA07665; Thu, 4 Sep 2014 11:38:53 +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: <0d64e0439f544e27b7e48c48d1199a1b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to aa64d8b Date: Thu, 4 Sep 2014 11:38:53 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master a958730b3 -> aa64d8b3e CLOUDSTACK-7389: fix for the script bugs CLOUDSTACK-7389, CLOUDSTACK-7390 and few other fixes. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/aa64d8b3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/aa64d8b3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/aa64d8b3 Branch: refs/heads/master Commit: aa64d8b3e7222c9b849f28efcae4168a01da679b Parents: a958730 Author: SrikanteswaraRao Talluri Authored: Thu Sep 4 16:53:25 2014 +0530 Committer: SrikanteswaraRao Talluri Committed: Thu Sep 4 17:07:34 2014 +0530 ---------------------------------------------------------------------- test/integration/component/maint/test_bugs.py | 11 ++--------- tools/marvin/marvin/config/test_data.py | 9 ++++++++- 2 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aa64d8b3/test/integration/component/maint/test_bugs.py ---------------------------------------------------------------------- diff --git a/test/integration/component/maint/test_bugs.py b/test/integration/component/maint/test_bugs.py index 07e3655..a543aa7 100644 --- a/test/integration/component/maint/test_bugs.py +++ b/test/integration/component/maint/test_bugs.py @@ -37,14 +37,6 @@ class Test42xBugsMgmtSvr(cloudstackTestCase): cls.testClient = super(Test42xBugsMgmtSvr, cls).getClsTestClient() cls.apiClient = cls.api_client = cls.testClient.getApiClient() cls.services = cls.testClient.getParsedTestDataConfig() - cls.services["win2012template"] = { - "displaytext": "win2012", - "name": "win2012", - "passwordenabled": False, - "url": "http://nfs1.lab.vmops.com/templates/vmware/new-test-win.ova", - "format": "OVA", - "ostype": "Windows 8 (64-bit)", - } cls.hypervisor = cls.testClient.getHypervisorInfo() # Get Domain, Zone, Template cls.domain = get_domain(cls.api_client) @@ -333,6 +325,7 @@ class Test42xBugsMgmtSvr(cloudstackTestCase): self.domain_userapiclient = self.testClient.getUserApiClient(self.domain_user.username, self.newdomain.name) # Step2: Register a template as Domain admin. + self.services["templateregister"]["ostype"] = self.services["ostype"] self.domain_template = Template.register( self.apiClient, self.services["templateregister"], @@ -549,7 +542,7 @@ class Test42xBugsMgmtSvr(cloudstackTestCase): self.services["virtual_machine"]["template"] = self.win2012_template.id vm1 = VirtualMachine.create( self.apiClient, - self.services["virtual_machine2"], + self.services["virtual_machine"], accountid=self.account.name, domainid=self.account.domainid, serviceofferingid=self.service_offering.id, http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aa64d8b3/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 b658b01..100f8d2 100644 --- a/tools/marvin/marvin/config/test_data.py +++ b/tools/marvin/marvin/config/test_data.py @@ -773,13 +773,20 @@ test_data = { "templatefilter": "self" }, "templatefilter": 'self', - "templates": { "displaytext": 'Template', "name": 'Template', "ostype": "CentOS 5.3 (64-bit)", "templatefilter": 'self', }, + "win2012template": { + "displaytext": "win2012", + "name": "win2012", + "passwordenabled": False, + "url": "http://nfs1.lab.vmops.com/templates/vmware/new-test-win.ova", + "format": "OVA", + "ostype": "Windows 8 (64-bit)", + }, "templateregister": { "displaytext": "xs", "name": "xs",