From 4bdaffb66ad46a023e7cac67e01b69e56c411d01 Mon Sep 17 00:00:00 2001 From: SrikanteswaraRao Talluri Date: Sat, 10 Aug 2013 17:34:00 +0530 Subject: [PATCH] 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) --- test/integration/component/test_vm_passwdenabled.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/integration/component/test_vm_passwdenabled.py b/test/integration/component/test_vm_passwdenabled.py index 586f311a077..3400405e994 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"],