diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-14 04:15:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-14 04:15:05 +0000 |
| commit | 99c0a48482611ed085c6206f5510ba16bccd142d (patch) | |
| tree | 563ed089c885e89e9d3161b9a8f8b243416c87cd | |
| parent | f69489b9937cfb8c2cddab6325dc9b04f79766f4 (diff) | |
| parent | a2e4c2c0a4758e1ecf26ca0e6e37e18c65ad2d61 (diff) | |
| download | nova-99c0a48482611ed085c6206f5510ba16bccd142d.tar.gz nova-99c0a48482611ed085c6206f5510ba16bccd142d.tar.xz nova-99c0a48482611ed085c6206f5510ba16bccd142d.zip | |
Merge "Fix passing conductor to get_instance_nw_info()"
| -rw-r--r-- | nova/api/metadata/base.py | 3 | ||||
| -rw-r--r-- | nova/tests/fake_network.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nova/api/metadata/base.py b/nova/api/metadata/base.py index 275af2b32..fca580b29 100644 --- a/nova/api/metadata/base.py +++ b/nova/api/metadata/base.py @@ -139,7 +139,8 @@ class InstanceMetadata(): # get network info, and the rendered network template ctxt = context.get_admin_context() - network_info = network.API().get_instance_nw_info(ctxt, instance) + network_info = network.API().get_instance_nw_info(ctxt, instance, + conductor_api=capi) self.network_config = None cfg = netutils.get_injected_network_template(network_info) diff --git a/nova/tests/fake_network.py b/nova/tests/fake_network.py index d7f43829a..12d263584 100644 --- a/nova/tests/fake_network.py +++ b/nova/tests/fake_network.py @@ -372,7 +372,7 @@ def stub_out_nw_api_get_instance_nw_info(stubs, func=None, floating_ips_per_fixed_ip=0, spectacular=False): - def get_instance_nw_info(self, context, instance): + def get_instance_nw_info(self, context, instance, conductor_api=None): return fake_get_instance_nw_info(stubs, num_networks=num_networks, ips_per_vif=ips_per_vif, floating_ips_per_fixed_ip=floating_ips_per_fixed_ip, |