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 55B73F4BF for ; Wed, 8 May 2013 09:00:15 +0000 (UTC) Received: (qmail 39655 invoked by uid 500); 8 May 2013 09:00:14 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 39210 invoked by uid 500); 8 May 2013 09:00:14 -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 38971 invoked by uid 99); 8 May 2013 09:00:13 -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, 08 May 2013 09:00:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 68A918897D5; Wed, 8 May 2013 09:00:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tsp@apache.org To: commits@cloudstack.apache.org Date: Wed, 08 May 2013 09:00:13 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/5] git commit: updated refs/heads/master to b8358e1 Updated Branches: refs/heads/master 548a8d8c1 -> b8358e109 CLOUDSTACK-2359: fix missing network type in the test scripts test_volumes.py and test_templates.py Signed-off-by: Prasanna Santhanam Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/93db64fc Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/93db64fc Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/93db64fc Branch: refs/heads/master Commit: 93db64fc2531d72713c6b26d9e749f9aa6fd6640 Parents: 548a8d8 Author: Talluri Authored: Wed May 8 00:57:26 2013 +0530 Committer: Prasanna Santhanam Committed: Wed May 8 14:26:40 2013 +0530 ---------------------------------------------------------------------- test/integration/smoke/test_guest_vlan_range.py | 2 +- test/integration/smoke/test_templates.py | 1 + test/integration/smoke/test_volumes.py | 1 + 3 files changed, 3 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93db64fc/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 13cf335..bd53343 100644 --- a/test/integration/smoke/test_guest_vlan_range.py +++ b/test/integration/smoke/test_guest_vlan_range.py @@ -44,7 +44,7 @@ class Services: "password": "password", }, "name": "testphysicalnetwork", - "vlan": "118-120", + "vlan": "2118-2120", } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93db64fc/test/integration/smoke/test_templates.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_templates.py b/test/integration/smoke/test_templates.py index fa4bc40..b2ad4ca 100644 --- a/test/integration/smoke/test_templates.py +++ b/test/integration/smoke/test_templates.py @@ -292,6 +292,7 @@ class TestTemplates(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype #populate second zone id for iso copy cmd = listZones.listZonesCmd() zones = cls.api_client.listZones(cmd) http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93db64fc/test/integration/smoke/test_volumes.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py index ecac8c9..4bf8203 100644 --- a/test/integration/smoke/test_volumes.py +++ b/test/integration/smoke/test_volumes.py @@ -287,6 +287,7 @@ class TestVolumes(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.disk_offering = DiskOffering.create( cls.api_client, cls.services["disk_offering"]