Commit 8b8f54dd authored by Guido Trotter's avatar Guido Trotter
Browse files

Merge branch 'devel-2.5'



* devel-2.5:
  Revert "rapi.client.ModifyNode should PUT rather than POST"
    - also fix the actual call, which was merged as PUT in master by
      mistake.
Signed-off-by: default avatarGuido Trotter <ultrotter@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parents 46a10518 e366273a
......@@ -1510,7 +1510,7 @@ class GanetiRapiClient(object): # pylint: disable=R0904
@return: job id
"""
return self._SendRequest(HTTP_PUT,
return self._SendRequest(HTTP_POST,
("/%s/nodes/%s/modify" %
(GANETI_RAPI_VERSION, node)), None, kwargs)
......
......@@ -527,9 +527,9 @@ class R_2_nodes_name_modify(baserlib.OpcodeResource):
"""/2/nodes/[node_name]/modify resource.
"""
PUT_OPCODE = opcodes.OpNodeSetParams
POST_OPCODE = opcodes.OpNodeSetParams
def GetPutOpInput(self):
def GetPostOpInput(self):
"""Changes parameters of a node.
"""
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment