x/python-ganttclient
Code Issues Proposed changes

PEP8 again

Browse Source
This commit is contained in:
Soren Hansen
2011-02-22 14:40:00 +01:00
parent 96c43b0d24
commit 1eb5721fe6
1 changed files with 51 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
nova/tests/test_network.py
View File

@@ -36,61 +36,62 @@ LOG = logging.getLogger('nova.tests.network')
class IptablesManagerTestCase(test.TestCase): class IptablesManagerTestCase(test.TestCase):
sample_filter = """# Generated by iptables-save on Fri Feb 18 15:17:05 2011 sample_filter = ['#Generated by iptables-save on Fri Feb 18 15:17:05 2011',
*filter '*filter',
:INPUT ACCEPT [2223527:305688874] ':INPUT ACCEPT [2223527:305688874]',
:FORWARD ACCEPT [0:0] ':FORWARD ACCEPT [0:0]',
:OUTPUT ACCEPT [2172501:140856656] ':OUTPUT ACCEPT [2172501:140856656]',
:nova-compute-FORWARD - [0:0] ':nova-compute-FORWARD - [0:0]',
:nova-compute-INPUT - [0:0] ':nova-compute-INPUT - [0:0]',
:nova-compute-local - [0:0] ':nova-compute-local - [0:0]',
:nova-compute-OUTPUT - [0:0] ':nova-compute-OUTPUT - [0:0]',
:nova-filter-top - [0:0] ':nova-filter-top - [0:0]',
-A FORWARD -j nova-filter-top '-A FORWARD -j nova-filter-top ',
-A OUTPUT -j nova-filter-top '-A OUTPUT -j nova-filter-top ',
-A nova-filter-top -j nova-compute-local '-A nova-filter-top -j nova-compute-local ',
-A INPUT -j nova-compute-INPUT '-A INPUT -j nova-compute-INPUT ',
-A OUTPUT -j nova-compute-OUTPUT '-A OUTPUT -j nova-compute-OUTPUT ',
-A FORWARD -j nova-compute-FORWARD '-A FORWARD -j nova-compute-FORWARD ',
-A INPUT -i virbr0 -p udp -m udp --dport 53 -j ACCEPT '-A INPUT -i virbr0 -p udp -m udp --dport 53 -j ACCEPT ',
-A INPUT -i virbr0 -p tcp -m tcp --dport 53 -j ACCEPT '-A INPUT -i virbr0 -p tcp -m tcp --dport 53 -j ACCEPT ',
-A INPUT -i virbr0 -p udp -m udp --dport 67 -j ACCEPT '-A INPUT -i virbr0 -p udp -m udp --dport 67 -j ACCEPT ',
-A INPUT -i virbr0 -p tcp -m tcp --dport 67 -j ACCEPT '-A INPUT -i virbr0 -p tcp -m tcp --dport 67 -j ACCEPT ',
-A FORWARD -s 192.168.122.0/24 -i virbr0 -j ACCEPT '-A FORWARD -s 192.168.122.0/24 -i virbr0 -j ACCEPT ',
-A FORWARD -i virbr0 -o virbr0 -j ACCEPT '-A FORWARD -i virbr0 -o virbr0 -j ACCEPT ',
-A FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable '-A FORWARD -o virbr0 -j REJECT --reject-with '
-A FORWARD -i virbr0 -j REJECT --reject-with icmp-port-unreachable 'icmp-port-unreachable ',
COMMIT '-A FORWARD -i virbr0 -j REJECT --reject-with '
# Completed on Fri Feb 18 15:17:05 2011""" 'icmp-port-unreachable ',
'COMMIT',
'# Completed on Fri Feb 18 15:17:05 2011']
sample_nat = """# Generated by iptables-save on Fri Feb 18 15:17:05 2011 sample_nat = ['# Generated by iptables-save on Fri Feb 18 15:17:05 2011',
*nat '*nat',
:PREROUTING ACCEPT [3936:762355] ':PREROUTING ACCEPT [3936:762355]',
:INPUT ACCEPT [2447:225266] ':INPUT ACCEPT [2447:225266]',
:OUTPUT ACCEPT [63491:4191863] ':OUTPUT ACCEPT [63491:4191863]',
:POSTROUTING ACCEPT [63112:4108641] ':POSTROUTING ACCEPT [63112:4108641]',
:nova-compute-OUTPUT - [0:0] ':nova-compute-OUTPUT - [0:0]',
:nova-compute-floating-ip-snat - [0:0] ':nova-compute-floating-ip-snat - [0:0]',
:nova-compute-SNATTING - [0:0] ':nova-compute-SNATTING - [0:0]',
:nova-compute-PREROUTING - [0:0] ':nova-compute-PREROUTING - [0:0]',
:nova-compute-POSTROUTING - [0:0] ':nova-compute-POSTROUTING - [0:0]',
:nova-postrouting-bottom - [0:0] ':nova-postrouting-bottom - [0:0]',
-A PREROUTING -j nova-compute-PREROUTING '-A PREROUTING -j nova-compute-PREROUTING ',
-A OUTPUT -j nova-compute-OUTPUT '-A OUTPUT -j nova-compute-OUTPUT ',
-A POSTROUTING -j nova-compute-POSTROUTING '-A POSTROUTING -j nova-compute-POSTROUTING ',
-A POSTROUTING -j nova-postrouting-bottom '-A POSTROUTING -j nova-postrouting-bottom ',
-A nova-postrouting-bottom -j nova-compute-SNATTING '-A nova-postrouting-bottom -j nova-compute-SNATTING ',
-A nova-compute-SNATTING -j nova-compute-floating-ip-snat '-A nova-compute-SNATTING -j nova-compute-floating-ip-snat ',
COMMIT 'COMMIT',
# Completed on Fri Feb 18 15:17:05 2011 '# Completed on Fri Feb 18 15:17:05 2011']
"""
def setUp(self): def setUp(self):
super(IptablesManagerTestCase, self).setUp() super(IptablesManagerTestCase, self).setUp()
self.manager = linux_net.IptablesManager() self.manager = linux_net.IptablesManager()
def test_filter_rules_are_wrapped(self): def test_filter_rules_are_wrapped(self):
current_lines = self.sample_filter.split('\n') current_lines = self.sample_filter
table = self.manager.ipv4['filter'] table = self.manager.ipv4['filter']
table.add_rule('FORWARD', '-s 1.2.3.4/5 -j DROP') table.add_rule('FORWARD', '-s 1.2.3.4/5 -j DROP')
@@ -104,7 +105,7 @@ COMMIT
'-s 1.2.3.4/5 -j DROP' not in new_lines) '-s 1.2.3.4/5 -j DROP' not in new_lines)
def test_nat_rules(self): def test_nat_rules(self):
current_lines = self.sample_nat.split('\n') current_lines = self.sample_nat
new_lines = self.manager._modify_rules(current_lines, new_lines = self.manager._modify_rules(current_lines,
self.manager.ipv4['nat']) self.manager.ipv4['nat'])
@@ -139,7 +140,7 @@ COMMIT
"Built-in chain %s not wrapped" % (chain,)) "Built-in chain %s not wrapped" % (chain,))
def test_filter_rules(self): def test_filter_rules(self):
current_lines = self.sample_filter.split('\n') current_lines = self.sample_filter
new_lines = self.manager._modify_rules(current_lines, new_lines = self.manager._modify_rules(current_lines,
self.manager.ipv4['filter']) self.manager.ipv4['filter'])