diff options
| author | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2012-08-07 23:19:04 +0000 |
|---|---|---|
| committer | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2012-08-07 23:19:04 +0000 |
| commit | 31f3383ae4953019267c67e4fbd2214b03bc8da8 (patch) | |
| tree | 5db16e26440ef8566954c6da6faf01c2d89af5a3 /nova | |
| parent | a418654b070c63c4bed5e3e5523fb947934626f9 (diff) | |
xenapi: wait for agent resetnetwork response
Unlike every other agent command, the resetnetwork command would not
wait for a response. All failures were silently ignored. Change this
to at least log a message if an error occurs.
Change-Id: I40e323607b2ce50869f3bf11e4582ff83cbed1c0
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/virt/xenapi/agent.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nova/virt/xenapi/agent.py b/nova/virt/xenapi/agent.py index 577e6fcf5..7204185c3 100644 --- a/nova/virt/xenapi/agent.py +++ b/nova/virt/xenapi/agent.py @@ -193,8 +193,13 @@ def inject_file(session, instance, vm_ref, path, contents): def resetnetwork(session, instance, vm_ref): - """Calls resetnetwork method in agent.""" - _call_agent(session, instance, vm_ref, 'resetnetwork') + resp = _call_agent(session, instance, vm_ref, 'resetnetwork') + if resp['returncode'] != '0': + LOG.error(_('Failed to reset network: %(resp)r'), locals(), + instance=instance) + return None + + return resp['message'] class SimpleDH(object): |