etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-7268: Ignore "already exists" error in createEgressFirewallRule 

Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
This commit is contained in:
John Dilley 2014-08-07 07:40:06 +00:00 committed by Santhosh Edukulla
parent 5f816e3e3f
commit 7ff7e9cf5a
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/marvin/marvin/lib/base.py
View File

@ -24,7 +24,7 @@ from marvin.cloudstackAPI import *
from marvin.codes import (FAILED, FAIL, PASS, RUNNING, STOPPED,
STARTING, DESTROYED, EXPUNGING,
STOPPING, BACKED_UP, BACKING_UP)
from marvin.cloudstackException import GetDetailExceptionInfo
from marvin.cloudstackException import GetDetailExceptionInfo, CloudstackAPIException
from marvin.lib.utils import validateList, is_server_ssh_ready, random_gen
# Import System modules
import time
@ -340,12 +340,17 @@ class VirtualMachine:
ipaddressid=public_ip.ipaddress.id
)
if allow_egress:
EgressFireWallRule.create(
apiclient=apiclient,
networkid=virtual_machine.nic[0].networkid,
protocol='All',
cidrlist='0.0.0.0/0'
)
try:
EgressFireWallRule.create(
apiclient=apiclient,
networkid=virtual_machine.nic[0].networkid,
protocol='All',
cidrlist='0.0.0.0/0'
)
except CloudstackAPIException, e:
# This could fail because we've already set up the same rule
if not "There is already a firewall rule specified".lower() in e.errorMsg.lower():
raise
virtual_machine.ssh_ip = nat_rule.ipaddress
virtual_machine.public_ip = nat_rule.ipaddress