Merge "Ensure info cache updates don't overwhelm cells"

This commit is contained in:
Jenkins
2014-04-21 22:52:03 +00:00
committed by Gerrit Code Review

View File

@@ -454,7 +454,6 @@ class API(base_api.NetworkAPI):
"""Return the port for the client given the port id."""
return neutronv2.get_client(context).show_port(port_id)
@base_api.refresh_cache
def get_instance_nw_info(self, context, instance, networks=None,
port_ids=None, use_slave=False):
"""Return network information for specified instance
@@ -465,6 +464,8 @@ class API(base_api.NetworkAPI):
# the master. For now we just ignore this arg.
result = self._get_instance_nw_info(context, instance, networks,
port_ids)
base_api.update_instance_cache_with_nw_info(self, context, instance,
result, update_cells=False)
return result
def _get_instance_nw_info(self, context, instance, networks=None,