Commit 23057d29 authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

Epydoc fixes


Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent ea79fc15
......@@ -1048,8 +1048,8 @@ def InstanceReboot(instance, reboot_type, shutdown_timeout):
not accepted here, since that mode is handled differently, in
cmdlib, and translates into full stop and start of the
instance (instead of a call_instance_reboot RPC)
@type timeout: integer
@param timeout: maximum timeout for soft shutdown
@type shutdown_timeout: integer
@param shutdown_timeout: maximum timeout for soft shutdown
@rtype: None
"""
......
......@@ -143,19 +143,19 @@ class NodeRoleQuery(ConfdQuery):
class InstanceIpToNodePrimaryIpQuery(ConfdQuery):
"""A query for the location of one or more instance's ips.
@type query: string or dict
@param query: instance ip or dict containing:
constants.CONFD_REQQ_LINK: nic link (optional)
constants.CONFD_REQQ_IPLIST: list of ips
constants.CONFD_REQQ_IP: single ip
(one IP type request is mandatory)
@rtype: (integer, ...)
@return: ((status, answer) or (success, [(status, answer)...])
"""
def Exec(self, query):
"""InstanceIpToNodePrimaryIpQuery main execution.
@type query: string or dict
@param query: instance ip or dict containing:
constants.CONFD_REQQ_LINK: nic link (optional)
constants.CONFD_REQQ_IPLIST: list of ips
constants.CONFD_REQQ_IP: single ip
(one IP type request is mandatory)
@rtype: (integer, ...)
@return: ((status, answer) or (success, [(status, answer)...])
"""
if isinstance(query, dict):
if constants.CONFD_REQQ_IP in query:
......
......@@ -210,8 +210,8 @@ class HttpServerRequestAuthentication(object):
def VerifyBasicAuthPassword(self, req, username, password, expected):
"""Checks the password for basic authentication.
As long as they don't start with an opening brace ("{"), old passwords are
supported. A new scheme uses H(A1) from RFC2617, where H is MD5 and A1
As long as they don't start with an opening brace ("E{lb}"), old passwords
are supported. A new scheme uses H(A1) from RFC2617, where H is MD5 and A1
consists of the username, the authentication realm and the actual password.
@type req: L{http.server._HttpServerRequest}
......
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