From 1ae2d720a3ca3bde2baacb0d06610e7466f95bfe Mon Sep 17 00:00:00 2001 From: Bill Rich Date: Fri, 7 Dec 2012 08:39:13 -0800 Subject: [PATCH] CLOUDSTACK-591: Changed bridge name parsing in security_group.py to support bridges named with dashes --- scripts/vm/network/security_group.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/vm/network/security_group.py b/scripts/vm/network/security_group.py index b0798907c8a..534f384f3d3 100755 --- a/scripts/vm/network/security_group.py +++ b/scripts/vm/network/security_group.py @@ -24,6 +24,7 @@ import sys import os import xml.dom.minidom from optparse import OptionParser, OptionGroup, OptParseError, BadOptionError, OptionError, OptionConflictError, OptionValueError +import re iptables = Command("iptables") bash = Command("/bin/bash") virsh = Command("virsh") @@ -425,7 +426,7 @@ def network_rules_for_rebooted_vm(vmName): brName = "cloudbr0" else: brName.pop() - brName = brName[0].split("-")[1] + brName = re.sub("^BF-", "", brName[0]) if 1 in [ vm_name.startswith(c) for c in ['r-', 's-', 'v-'] ]: