Updated Branches: refs/heads/4.2 48c8e64ae -> 359967d9f
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> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/359967d9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/359967d9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/359967d9 Branch: refs/heads/4.2 Commit: 359967d9f0dad7b25431bb6eaee22a9a6fc0d8b3 Parents: 48c8e64 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:18:07 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/359967d9/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"],
