diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-16 04:55:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-16 04:55:53 +0000 |
| commit | e7d0d5f048038e4f8ef6fb99d9045c4bbc5466eb (patch) | |
| tree | 1c493223b766414eb5bb85225473b7d5894a9e78 | |
| parent | 7285faae48343c2411d583f89be5e70f54cdff64 (diff) | |
| parent | 1b455923446de6fcfee7166059db72b80ff51dfe (diff) | |
| download | nova-e7d0d5f048038e4f8ef6fb99d9045c4bbc5466eb.tar.gz nova-e7d0d5f048038e4f8ef6fb99d9045c4bbc5466eb.tar.xz nova-e7d0d5f048038e4f8ef6fb99d9045c4bbc5466eb.zip | |
Merge "Fix use_single_default_gateway"
| -rw-r--r-- | nova/network/linux_net.py | 1 | ||||
| -rw-r--r-- | nova/tests/network/test_linux_net.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py index 193b49202..6b06a8f89 100644 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -756,6 +756,7 @@ def get_dhcp_opts(context, network_ref): default_gw_vif[instance_uuid] = vifs[0]['id'] for datum in data: + instance_uuid = datum['instance_uuid'] if instance_uuid in default_gw_vif: # we don't want default gateway for this fixed ip if default_gw_vif[instance_uuid] != datum['vif_id']: diff --git a/nova/tests/network/test_linux_net.py b/nova/tests/network/test_linux_net.py index aaf29601a..c4b99e3e5 100644 --- a/nova/tests/network/test_linux_net.py +++ b/nova/tests/network/test_linux_net.py @@ -307,7 +307,7 @@ class LinuxNetworkTestCase(test.TestCase): self.assertEquals(actual_hosts, expected) def test_get_dhcp_opts_for_nw00(self): - expected_opts = 'NW-0,3\nNW-3,3\nNW-4,3' + expected_opts = 'NW-3,3\nNW-4,3' actual_opts = self.driver.get_dhcp_opts(self.context, networks[0]) self.assertEquals(actual_opts, expected_opts) |