diff --git a/lib/backend.py b/lib/backend.py index b13a72d6cea872df9084e4448ff35dcc02da7c63..530d5d3194c14cb247354168a3dd25fb3e30b129 100644 --- a/lib/backend.py +++ b/lib/backend.py @@ -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 """ diff --git a/lib/confd/querylib.py b/lib/confd/querylib.py index ab78772b18edbc1c697ce3561c8760cfd7ad8221..17621dd0cca75e93aab722c8227491fba53ef6f9 100644 --- a/lib/confd/querylib.py +++ b/lib/confd/querylib.py @@ -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: diff --git a/lib/http/auth.py b/lib/http/auth.py index aa1fe7b5e770689a0d5e409be6e04ceb00054676..15fa986a0513f9a91bd8f049afb7a424cbcd33b1 100644 --- a/lib/http/auth.py +++ b/lib/http/auth.py @@ -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}