diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-15 06:55:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-15 06:55:58 +0000 |
| commit | 63ff1c98610249367bc3f6feef04c6f7bd0f3436 (patch) | |
| tree | 760613558c6dfb7460648a246467698780c1918e | |
| parent | 299222808b732083f476d4b33c7d04e9d15b1de9 (diff) | |
| parent | 769782be844e4c74fdc0aad0ff704b06c874c3ad (diff) | |
| download | nova-63ff1c98610249367bc3f6feef04c6f7bd0f3436.tar.gz nova-63ff1c98610249367bc3f6feef04c6f7bd0f3436.tar.xz nova-63ff1c98610249367bc3f6feef04c6f7bd0f3436.zip | |
Merge "Don't snat all traffic when force_snat_range set"
| -rw-r--r-- | nova/network/linux_net.py | 11 | ||||
| -rw-r--r-- | nova/tests/network/test_linux_net.py | 22 | ||||
| -rw-r--r-- | nova/tests/network/test_manager.py | 18 |
3 files changed, 39 insertions, 12 deletions
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py index 8eb128acf..15be3d3c4 100644 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -628,11 +628,12 @@ def metadata_accept(): def add_snat_rule(ip_range): if CONF.routing_source_ip: - rule = '-s %s -j SNAT --to-source %s' % (ip_range, - CONF.routing_source_ip) - if CONF.public_interface: - rule += ' -o %s' % CONF.public_interface - iptables_manager.ipv4['nat'].add_rule('snat', rule) + for dest_range in CONF.force_snat_range or ['0.0.0.0/0']: + rule = ('-s %s -d %s -j SNAT --to-source %s' + % (ip_range, dest_range, CONF.routing_source_ip)) + if CONF.public_interface: + rule += ' -o %s' % CONF.public_interface + iptables_manager.ipv4['nat'].add_rule('snat', rule) iptables_manager.apply() diff --git a/nova/tests/network/test_linux_net.py b/nova/tests/network/test_linux_net.py index b08d247ff..5c7f3828d 100644 --- a/nova/tests/network/test_linux_net.py +++ b/nova/tests/network/test_linux_net.py @@ -242,6 +242,28 @@ class LinuxNetworkTestCase(test.TestCase): self.stubs.Set(db, 'instance_get', get_instance) self.stubs.Set(db, 'network_get_associated_fixed_ips', get_associated) + def _test_add_snat_rule(self, expected): + def verify_add_rule(chain, rule): + self.assertEqual(chain, 'snat') + self.assertEqual(rule, expected) + + self.stubs.Set(linux_net.iptables_manager.ipv4['nat'], + 'add_rule', verify_add_rule) + linux_net.add_snat_rule('10.0.0.0/24') + + def test_add_snat_rule(self): + self.flags(routing_source_ip='10.10.10.1') + expected = ('-s 10.0.0.0/24 -d 0.0.0.0/0 ' + '-j SNAT --to-source 10.10.10.1 -o eth0') + self._test_add_snat_rule(expected) + + def test_add_snat_rule_snat_range(self): + self.flags(routing_source_ip='10.10.10.1', + force_snat_range=['10.10.10.0/24']) + expected = ('-s 10.0.0.0/24 -d 10.10.10.0/24 ' + '-j SNAT --to-source 10.10.10.1 -o eth0') + self._test_add_snat_rule(expected) + def test_update_dhcp_for_nw00(self): self.flags(use_single_default_gateway=True) diff --git a/nova/tests/network/test_manager.py b/nova/tests/network/test_manager.py index 82b79794f..a924d8406 100644 --- a/nova/tests/network/test_manager.py +++ b/nova/tests/network/test_manager.py @@ -1714,7 +1714,8 @@ class CommonNetworkTestCase(test.TestCase): table_name='nat') # The expected rules that should be configured based on the fixed_range - expected_lines = ['[0:0] -A %s-snat -s %s -j SNAT --to-source %s -o %s' + expected_lines = ['[0:0] -A %s-snat -s %s -d 0.0.0.0/0 ' + '-j SNAT --to-source %s -o %s' % (binary_name, CONF.fixed_range, CONF.routing_source_ip, CONF.public_interface), @@ -1762,7 +1763,8 @@ class CommonNetworkTestCase(test.TestCase): table_name='nat') # The expected rules that should be configured based on the fixed_range - expected_lines = ['[0:0] -A %s-snat -s %s -j SNAT --to-source %s -o %s' + expected_lines = ['[0:0] -A %s-snat -s %s -d 0.0.0.0/0 ' + '-j SNAT --to-source %s -o %s' % (binary_name, networks[0]['cidr'], CONF.routing_source_ip, CONF.public_interface), @@ -1776,7 +1778,8 @@ class CommonNetworkTestCase(test.TestCase): '--ctstate DNAT -j ACCEPT' % (binary_name, networks[0]['cidr'], networks[0]['cidr']), - '[0:0] -A %s-snat -s %s -j SNAT --to-source %s -o %s' + '[0:0] -A %s-snat -s %s -d 0.0.0.0/0 ' + '-j SNAT --to-source %s -o %s' % (binary_name, networks[1]['cidr'], CONF.routing_source_ip, CONF.public_interface), @@ -1830,10 +1833,11 @@ class CommonNetworkTestCase(test.TestCase): table_name='nat') # Add the new expected rules to the old ones - expected_lines += ['[0:0] -A %s-snat -s %s -j SNAT --to-source %s -o ' - '%s' % (binary_name, new_network['cidr'], - CONF.routing_source_ip, - CONF.public_interface), + expected_lines += ['[0:0] -A %s-snat -s %s -d 0.0.0.0/0 ' + '-j SNAT --to-source %s -o %s' + % (binary_name, new_network['cidr'], + CONF.routing_source_ip, + CONF.public_interface), '[0:0] -A %s-POSTROUTING -s %s -d %s/32 -j ACCEPT' % (binary_name, new_network['cidr'], CONF.metadata_host), |