diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-26 20:44:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-26 20:44:46 +0000 |
| commit | 3f3a581779128b2cd60f4d89bdb26bcfdb4b56f8 (patch) | |
| tree | 0091e415b9e45df75e649f78430e355a7280b085 | |
| parent | f428527a061a669e07b1901e0ef2d9de86dcb5f7 (diff) | |
| parent | be5ff02f7484a3594f3adeac56ed7aa1ddb475d3 (diff) | |
| download | nova-3f3a581779128b2cd60f4d89bdb26bcfdb4b56f8.tar.gz nova-3f3a581779128b2cd60f4d89bdb26bcfdb4b56f8.tar.xz nova-3f3a581779128b2cd60f4d89bdb26bcfdb4b56f8.zip | |
Merge "Fixes argument order of quantumv2.api.get_instance_nw_info"
| -rw-r--r-- | nova/network/quantumv2/api.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/network/quantumv2/api.py b/nova/network/quantumv2/api.py index 7cbcfd448..fe4f6586a 100644 --- a/nova/network/quantumv2/api.py +++ b/nova/network/quantumv2/api.py @@ -353,8 +353,8 @@ class API(base.Base): def show_port(self, context, port_id): return quantumv2.get_client(context).show_port(port_id) - def get_instance_nw_info(self, context, instance, networks=None, - conductor_api=None): + def get_instance_nw_info(self, context, instance, conductor_api=None, + networks=None): result = self._get_instance_nw_info(context, instance, networks) update_instance_info_cache(self, context, instance, result, conductor_api) |