diff options
| author | Dan Smith <danms@us.ibm.com> | 2013-02-12 16:00:55 -0500 |
|---|---|---|
| committer | Dan Smith <danms@us.ibm.com> | 2013-02-12 19:46:48 -0500 |
| commit | a2e4c2c0a4758e1ecf26ca0e6e37e18c65ad2d61 (patch) | |
| tree | e6e900528bd633f46ee9e822d6fe31f020cbbc05 /nova/tests | |
| parent | 959e65f320093a6b17945f52ad160da5aa042ff6 (diff) | |
Fix passing conductor to get_instance_nw_info()
The recent metadata patch missed this one spot, which wasn't caught
because the network stubs weren't updated for the signature change.
Fixes bug 1123435
Change-Id: Iebeb98bba62189476af2c0b85615ea407a8b2ecd
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/fake_network.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/tests/fake_network.py b/nova/tests/fake_network.py index 883466cd6..5de72b58d 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, |