apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

pep8

Browse Source
This commit is contained in:
Ian Southam 2014-11-24 17:21:22 +01:00 committed by wilderrodrigues
parent 0496ba7a00
commit 08d2e10cb9
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
systemvm/patches/debian/config/opt/cloud/bin/configure.py
View File

@ -103,10 +103,10 @@ class CsAcl(CsDataBag):
rnge = '' rnge = ''
if "first_port" in self.rule.keys() and \ if "first_port" in self.rule.keys() and \
self.rule['first_port'] == self.rule['last_port']: self.rule['first_port'] == self.rule['last_port']:
rnge = self.rule['first_port'] rnge = self.rule['first_port']
if "first_port" in self.rule.keys() and \ if "first_port" in self.rule.keys() and \
self.rule['first_port'] != self.rule['last_port']: self.rule['first_port'] != self.rule['last_port']:
rnge = "%s:%s" % (rule['first_port'], rule['last_port']) rnge = "%s:%s" % (rule['first_port'], rule['last_port'])
if self.direction == 'ingress': if self.direction == 'ingress':
if rule['protocol'] == "icmp": if rule['protocol'] == "icmp":
self.fw.append(["mangle", "front", self.fw.append(["mangle", "front",
@ -136,7 +136,7 @@ class CsAcl(CsDataBag):
if rule['protocol'] != "all": if rule['protocol'] != "all":
fwr += "-p %s " % rule['protocol'] + \ fwr += "-p %s " % rule['protocol'] + \
" -m %s " % rule['protocol'] + \ " -m %s " % rule['protocol'] + \
" --dport %s" % rnge " --dport %s" % rnge
self.fw.append(["filter", "front", "%s -j %s" % (fwr, rule['action'])]) self.fw.append(["filter", "front", "%s -j %s" % (fwr, rule['action'])])
class AclDevice(): class AclDevice():
@ -172,7 +172,6 @@ class CsAcl(CsDataBag):
else: else:
self.init_vr(self, direction, acl, rule, config) self.init_vr(self, direction, acl, rule, config)
def init_vpc(self, direction, acl, rule, config): def init_vpc(self, direction, acl, rule, config):
self.table = "" self.table = ""
self.device = acl.device self.device = acl.device

9
systemvm/patches/debian/config/opt/cloud/bin/cs_firewallrules.py
View File

@ -18,14 +18,15 @@
from pprint import pprint from pprint import pprint
import copy import copy
def merge(dbag, data): def merge(dbag, data):
dbagc = copy.deepcopy(dbag) dbagc = copy.deepcopy(dbag)
if "rules" not in data: if "rules" not in data:
return dbagc return dbagc
for rule in data['rules']: for rule in data['rules']:
id = str(rule['id']) id = str(rule['id'])
if rule['revoked']: if rule['revoked']:
del(dbagc[id]) del(dbagc[id])
if id not in dbagc.keys(): if id not in dbagc.keys():
dbagc[id] = rule dbagc[id] = rule
return dbagc return dbagc