apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 10:32:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Security Group: Use awk to do matching and printing instead of using grep + awk.

Browse Source 
Makes it a bit shorter code wise
This commit is contained in:
Wido den Hollander 2013-07-12 11:09:41 +02:00
parent b3fd25d45e
commit 67bcce71f7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/vm/network/security_group.py
View File

@ -590,7 +590,7 @@ def network_rules_for_rebooted_vm(vmName):
return True return True
def get_rule_logs_for_vms(): def get_rule_logs_for_vms():
cmd = "virsh list|grep running |awk '{print $2}'" cmd = "virsh list|awk '/running/ {print $2}'"
vms = bash("-c", cmd).stdout.split("\n") vms = bash("-c", cmd).stdout.split("\n")
result = [] result = []
@ -621,7 +621,7 @@ def cleanup_rules():
if 1 in [ chain.startswith(c) for c in ['r-', 'i-', 's-', 'v-'] ]: if 1 in [ chain.startswith(c) for c in ['r-', 'i-', 's-', 'v-'] ]:
vm_name = chain vm_name = chain
cmd = "virsh list |grep " + vm_name + "|awk '{print $3}'" cmd = "virsh list |awk '/" + vm_name + "/ {print $3}'"
try: try:
result = execute(cmd).strip() result = execute(cmd).strip()
except: except:
@ -641,7 +641,7 @@ def cleanup_rules():
if 1 in [ chain.startswith(c) for c in ['r-', 'i-', 's-', 'v-'] ]: if 1 in [ chain.startswith(c) for c in ['r-', 'i-', 's-', 'v-'] ]:
vm_name = chain vm_name = chain
cmd = "virsh list |grep " + vm_name + "|awk '{print $3}'" cmd = "virsh list |awk '/" + vm_name + "/ {print $3}'"
try: try:
result = execute(cmd).strip() result = execute(cmd).strip()
except: except:
@ -869,7 +869,7 @@ def getBridges(vmName):
return list(set(bridges)) return list(set(bridges))
def getvmId(vmName): def getvmId(vmName):
cmd = "virsh list |grep " + vmName + " | awk '{print $1}'" cmd = "virsh list |awk '/" + vmName + "/ {print $1}'"
return bash("-c", cmd).stdout.strip() return bash("-c", cmd).stdout.strip()
def addFWFramework(brname): def addFWFramework(brname):