diff options
| author | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2012-04-05 16:28:58 +0000 |
|---|---|---|
| committer | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2012-04-05 16:55:35 +0000 |
| commit | 5265a66e9d174d5b47645ff80cc823b0ceda534e (patch) | |
| tree | cd9a480884af8abcf115f56452048de09addceb4 | |
| parent | 5e09136303b06b241d4e28ef6bc3cc9cb01ea4ad (diff) | |
| download | nova-5265a66e9d174d5b47645ff80cc823b0ceda534e.tar.gz nova-5265a66e9d174d5b47645ff80cc823b0ceda534e.tar.xz nova-5265a66e9d174d5b47645ff80cc823b0ceda534e.zip | |
Remove unused path argument for _make_agent_call()
Change-Id: I6b516fa506be06446b496555d42510c25e656ce1
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index 7e4e32e4f..c1afac27e 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -932,7 +932,7 @@ class VMOps(object): # Send the encrypted password transaction_id = str(uuid.uuid4()) args = {'id': transaction_id} - resp = self._make_agent_call('version', instance, '', args) + resp = self._make_agent_call('version', instance, args) if resp['returncode'] != '0': LOG.error(_('Failed to query agent version: %(resp)r') % locals()) @@ -968,7 +968,7 @@ class VMOps(object): # Send the encrypted password transaction_id = str(uuid.uuid4()) args = {'id': transaction_id, 'url': url, 'md5sum': md5sum} - resp = self._make_agent_call('agentupdate', instance, '', args) + resp = self._make_agent_call('agentupdate', instance, args) if resp['returncode'] != '0': LOG.error(_('Failed to update agent: %(resp)r') % locals()) return None @@ -990,7 +990,7 @@ class VMOps(object): dh = SimpleDH() key_init_args = {'id': key_init_transaction_id, 'pub': str(dh.get_public())} - resp = self._make_agent_call('key_init', instance, '', key_init_args) + resp = self._make_agent_call('key_init', instance, key_init_args) # Successful return code from key_init is 'D0' if resp['returncode'] != 'D0': msg = _('Failed to exchange keys: %(resp)r') % locals() @@ -1006,7 +1006,7 @@ class VMOps(object): # Send the encrypted password password_transaction_id = str(uuid.uuid4()) password_args = {'id': password_transaction_id, 'enc_pass': enc_pass} - resp = self._make_agent_call('password', instance, '', password_args) + resp = self._make_agent_call('password', instance, password_args) # Successful return code from password is '0' if resp['returncode'] != '0': msg = _('Failed to update password: %(resp)r') % locals() @@ -1034,7 +1034,7 @@ class VMOps(object): 'b64_contents': b64_contents} # If the agent doesn't support file injection, a NotImplementedError # will be raised with the appropriate message. - resp = self._make_agent_call('inject_file', instance, '', args) + resp = self._make_agent_call('inject_file', instance, args) if resp['returncode'] != '0': LOG.error(_('Failed to inject file: %(resp)r') % locals()) return None @@ -1528,7 +1528,7 @@ class VMOps(object): vm_ref = VMHelper.lookup(self._session, instance.name) args = {'id': str(uuid.uuid4())} # TODO(tr3buchet): fix function call after refactor - #resp = self._make_agent_call('resetnetwork', instance, '', args) + #resp = self._make_agent_call('resetnetwork', instance, args) resp = self._make_plugin_call('agent', 'resetnetwork', instance, '', args, vm_ref) @@ -1555,10 +1555,10 @@ class VMOps(object): return self._make_plugin_call('xenstore.py', method=method, vm=vm, path=path, addl_args=addl_args) - def _make_agent_call(self, method, vm, path, addl_args=None): + def _make_agent_call(self, method, vm, addl_args=None): """Abstracts out the interaction with the agent xenapi plugin.""" ret = self._make_plugin_call('agent', method=method, vm=vm, - path=path, addl_args=addl_args) + path='', addl_args=addl_args) if isinstance(ret, dict): return ret try: |
