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 78C2E10BDA for ; Sat, 10 Aug 2013 13:48:22 +0000 (UTC) Received: (qmail 98346 invoked by uid 500); 10 Aug 2013 13:48:22 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 98168 invoked by uid 500); 10 Aug 2013 13:48:20 -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 98161 invoked by uid 99); 10 Aug 2013 13:48:20 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Aug 2013 13:48:20 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BBB028BB965; Sat, 10 Aug 2013 13:48:19 +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 Message-Id: <9282dd9d9f7b47bab9d8a299dfcc0174@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 4bdaffb Date: Sat, 10 Aug 2013 13:48:19 +0000 (UTC) Updated Branches: refs/heads/master 5404bf606 -> 4bdaffb66 CLOUDSTACK-4230: Fix the script to not to add egress rule if zone network type is not advanced Signed-off-by: Prasanna Santhanam (cherry picked from commit 8872af90d3d1014bf3fdfeb5f78652d5184f42cc) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4bdaffb6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4bdaffb6 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4bdaffb6 Branch: refs/heads/master Commit: 4bdaffb66ad46a023e7cac67e01b69e56c411d01 Parents: 5404bf6 Author: SrikanteswaraRao Talluri Authored: Sat Aug 10 17:34:00 2013 +0530 Committer: Prasanna Santhanam Committed: Sat Aug 10 19:17:54 2013 +0530 ---------------------------------------------------------------------- test/integration/component/test_vm_passwdenabled.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4bdaffb6/test/integration/component/test_vm_passwdenabled.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_vm_passwdenabled.py b/test/integration/component/test_vm_passwdenabled.py index 586f311..3400405 100644 --- a/test/integration/component/test_vm_passwdenabled.py +++ b/test/integration/component/test_vm_passwdenabled.py @@ -134,8 +134,9 @@ class TestVMPasswordEnabled(cloudstackTestCase): networkid = cls.virtual_machine.nic[0].networkid - # create egress rule to allow wget of my butt-set-guest-password script - EgressFireWallRule.create(cls.api_client, + # create egress rule to allow wget of my cloud-set-guest-password script + if zone.networktype.lower == 'advanced': + EgressFireWallRule.create(cls.api_client, networkid=networkid, protocol=cls.services["egress"]["protocol"], startport=cls.services["egress"]["startport"],