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 <t...@apache.org> (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 <kanti....@gmail.com> Authored: Sat Aug 10 17:34:00 2013 +0530 Committer: Prasanna Santhanam <t...@apache.org> 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"],
