apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

scripts: Fix security_group.py handling of args and unknown commands

Browse Source 
Checks the args length, doesn't throw IndexError when no args
passed. Also logs to security_group.log when executed with no args or unknown
command.

Review: https://reviews.apache.org/r/9588
Reviewed-by: Rohit Yadav <bhaisaab@apache.org>

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
This commit is contained in:
Radoslaw Smigielski 2013-02-25 14:55:44 +00:00 committed by Rohit Yadav
parent 43183893bd
commit 0383803188
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,13 +38,13 @@ def can_bridge_firewall(privnic):
execute("which iptables") execute("which iptables")
except: except:
print "no iptables on your host machine" print "no iptables on your host machine"
exit(1) sys.exit(1)
try: try:
execute("which ebtables") execute("which ebtables")
except: except:
print "no ebtables on your host machine" print "no ebtables on your host machine"
exit(2) sys.exit(2)
if not os.path.exists('/var/run/cloud'): if not os.path.exists('/var/run/cloud'):
@ -813,6 +813,9 @@ if __name__ == '__main__':
parser.add_option("--hostIp", dest="hostIp") parser.add_option("--hostIp", dest="hostIp")
parser.add_option("--hostMacAddr", dest="hostMacAddr") parser.add_option("--hostMacAddr", dest="hostMacAddr")
(option, args) = parser.parse_args() (option, args) = parser.parse_args()
if len(args) == 0:
logging.debug("No command to execute")
sys.exit(1)
cmd = args[0] cmd = args[0]
if cmd == "can_bridge_firewall": if cmd == "can_bridge_firewall":
can_bridge_firewall(args[1]) can_bridge_firewall(args[1])
@ -830,3 +833,6 @@ if __name__ == '__main__':
cleanup_rules() cleanup_rules()
elif cmd == "post_default_network_rules": elif cmd == "post_default_network_rules":
post_default_network_rules(option.vmName, option.vmID, option.vmIP, option.vmMAC, option.vif, option.brname, option.dhcpSvr, option.hostIp, option.hostMacAddr) post_default_network_rules(option.vmName, option.vmID, option.vmIP, option.vmMAC, option.vif, option.brname, option.dhcpSvr, option.hostIp, option.hostMacAddr)
else:
logging.debug("Unknown command: " + cmd)
sys.exit(1)