diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-09-21 05:57:49 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-09-21 05:57:49 -0700 |
| commit | 549018917b0d4f16bb87c919ca9be781fbd03a53 (patch) | |
| tree | 6e1cd6a28ddd47cd83be41de0df441e4fcde094b | |
| parent | 0a475cae8ee7dc9dafba95c06c2d335ddc1daddd (diff) | |
| download | nova-549018917b0d4f16bb87c919ca9be781fbd03a53.tar.gz | |
pep8
| -rwxr-xr-x | nova/network/linux_net.py | 2 | ||||
| -rwxr-xr-x | nova/tests/test_linux_net.py | 40 |
2 files changed, 28 insertions, 14 deletions
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py index 4c7f73ae48..2864d6aae1 100755 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -474,7 +474,7 @@ def initialize_gateway_device(dev, network_ref): # bridge for it to respond to reqests properly full_ip = '%s/%s' % (network_ref['dhcp_server'], network_ref['cidr'].rpartition('/')[2]) - new_ip_params = [[ full_ip, 'brd', network_ref['broadcast'] ]] + new_ip_params = [[full_ip, 'brd', network_ref['broadcast']]] old_ip_params = [] out, err = _execute('ip', 'addr', 'show', 'dev', dev, 'scope', 'global', run_as_root=True) diff --git a/nova/tests/test_linux_net.py b/nova/tests/test_linux_net.py index e8f2d7c633..940af7b5f2 100755 --- a/nova/tests/test_linux_net.py +++ b/nova/tests/test_linux_net.py @@ -349,6 +349,7 @@ class LinuxNetworkTestCase(test.TestCase): def _test_initialize_gateway(self, existing, expected):
self.flags(fake_network=False)
executes = []
+
def fake_execute(*args, **kwargs):
executes.append(args)
if args[0] == 'ip' and args[1] == 'addr' and args[2] == 'show':
@@ -368,12 +369,18 @@ class LinuxNetworkTestCase(test.TestCase): " inet 192.168.0.1/24 brd 192.168.0.255 scope global eth0\n"
" inet6 dead::beef:dead:beef:dead/64 scope link\n"
" valid_lft forever preferred_lft forever\n")
- expected = [('ip', 'addr', 'show', 'dev', 'eth0', 'scope', 'global'),
- ('ip', 'addr', 'del', '192.168.0.1/24', 'brd', '192.168.0.255', 'scope', 'global', 'dev', 'eth0'),
- ('ip', 'addr', 'add', '192.168.1.1/24', 'brd', '192.168.1.255', 'dev', 'eth0'),
- ('ip', 'addr', 'add', '192.168.0.1/24', 'brd', '192.168.0.255', 'scope', 'global', 'dev', 'eth0'),
- ('ip', '-f', 'inet6', 'addr', 'change', '2001:db8::/64', 'dev', 'eth0'),
- ('ip', 'link', 'set', 'dev', 'eth0', 'promisc', 'on')]
+ expected = [
+ ('ip', 'addr', 'show', 'dev', 'eth0', 'scope', 'global'),
+ ('ip', 'addr', 'del', '192.168.0.1/24',
+ 'brd', '192.168.0.255', 'scope', 'global', 'dev', 'eth0'),
+ ('ip', 'addr', 'add', '192.168.1.1/24',
+ 'brd', '192.168.1.255', 'dev', 'eth0'),
+ ('ip', 'addr', 'add', '192.168.0.1/24',
+ 'brd', '192.168.0.255', 'scope', 'global', 'dev', 'eth0'),
+ ('ip', '-f', 'inet6', 'addr', 'change',
+ '2001:db8::/64', 'dev', 'eth0'),
+ ('ip', 'link', 'set', 'dev', 'eth0', 'promisc', 'on'),
+ ]
self._test_initialize_gateway(existing, expected)
def test_initialize_gateway_no_move_right_ip(self):
@@ -384,9 +391,12 @@ class LinuxNetworkTestCase(test.TestCase): " inet 192.168.0.1/24 brd 192.168.0.255 scope global eth0\n"
" inet6 dead::beef:dead:beef:dead/64 scope link\n"
" valid_lft forever preferred_lft forever\n")
- expected = [('ip', 'addr', 'show', 'dev', 'eth0', 'scope', 'global'),
- ('ip', '-f', 'inet6', 'addr', 'change', '2001:db8::/64', 'dev', 'eth0'),
- ('ip', 'link', 'set', 'dev', 'eth0', 'promisc', 'on')]
+ expected = [
+ ('ip', 'addr', 'show', 'dev', 'eth0', 'scope', 'global'),
+ ('ip', '-f', 'inet6', 'addr', 'change',
+ '2001:db8::/64', 'dev', 'eth0'),
+ ('ip', 'link', 'set', 'dev', 'eth0', 'promisc', 'on'),
+ ]
self._test_initialize_gateway(existing, expected)
def test_initialize_gateway_add_if_blank(self):
@@ -395,8 +405,12 @@ class LinuxNetworkTestCase(test.TestCase): " link/ether de:ad:be:ef:be:ef brd ff:ff:ff:ff:ff:ff\n"
" inet6 dead::beef:dead:beef:dead/64 scope link\n"
" valid_lft forever preferred_lft forever\n")
- expected = [('ip', 'addr', 'show', 'dev', 'eth0', 'scope', 'global'),
- ('ip', 'addr', 'add', '192.168.1.1/24', 'brd', '192.168.1.255', 'dev', 'eth0'),
- ('ip', '-f', 'inet6', 'addr', 'change', '2001:db8::/64', 'dev', 'eth0'),
- ('ip', 'link', 'set', 'dev', 'eth0', 'promisc', 'on')]
+ expected = [
+ ('ip', 'addr', 'show', 'dev', 'eth0', 'scope', 'global'),
+ ('ip', 'addr', 'add', '192.168.1.1/24',
+ 'brd', '192.168.1.255', 'dev', 'eth0'),
+ ('ip', '-f', 'inet6', 'addr', 'change',
+ '2001:db8::/64', 'dev', 'eth0'),
+ ('ip', 'link', 'set', 'dev', 'eth0', 'promisc', 'on'),
+ ]
self._test_initialize_gateway(existing, expected)
|