LGTM, thanks
On Mon, Dec 7, 2015 at 6:37 AM, Oleg Ponomarev <[email protected]>
wrote:
>
> On 12/04/2015 07:34 PM, Hrvoje Ribicic wrote:
>
>> Furthermore, why assign it a value of None instead of self._GetNodeId by
>> default?
>>
>> This way you do not have to check for the None value later on, but just
>> invoke the function.
>>
>
> Unfortunately, I can't because self is not defined yet in the argument
> list.
>
> So, only the the following interdiff:
>
> --- a/test/py/cmdlib/testsupport/rpc_runner_mock.py
> +++ b/test/py/cmdlib/testsupport/rpc_runner_mock.py
> @@ -40,11 +40,10 @@ from cmdlib.testsupport.util import patchModule
>
>
> # We don't need arguments other than nodes in this mock.
> -def MockHooksExecutionFn(nodes, unused1, unused2, unused3):
> +def MockHooksExecutionFn(nodes, _hpath, _phase, _env):
> """Helper function that generate rpc results for call_hooks_runner mock
>
> """
> - del unused1, unused2, unused3
> results = RpcResultsBuilder()
> for node in nodes:
> results.AddSuccessfulNode(node, data=None, get_node_id=lambda nid:
> nid)
> @@ -119,7 +118,8 @@ class RpcResultsBuilder(object):
> else:
> return node.uuid
>
> - def CreateSuccessfulNodeResult(self, node, data=None, get_node_id=None):
> + def CreateSuccessfulNodeResult(self, node, data=None,
> get_node_id_fn=None):
> """@see L{RpcResultsBuilder}
>
> @param node: @see L{RpcResultsBuilder}.
> @@ -129,7 +129,7 @@ class RpcResultsBuilder(object):
> """
> if data is None:
> data = {}
> - node_id = get_node_id(node) if get_node_id else self._GetNodeId(node)
> + node_id = get_node_id_fn(node) if get_node_id_fn else
> self._GetNodeId(node)
> return rpc.RpcResult(data=(True, data), node=node_id)
>
> def CreateFailedNodeResult(self, node):
> @@ -158,7 +158,7 @@ class RpcResultsBuilder(object):
> """
> return rpc.RpcResult(data=(False, error_msg),
> node=self._GetNodeId(node))
>
> - def AddSuccessfulNode(self, node, data=None, get_node_id=None):
> + def AddSuccessfulNode(self, node, data=None, get_node_id_fn=None):
> """@see L{CreateSuccessfulNode}
>
> @rtype: L{RpcResultsBuilder}
> @@ -166,7 +166,7 @@ class RpcResultsBuilder(object):
>
> """
> self._results.append(self.CreateSuccessfulNodeResult(node, data,
> - get_node_id))
> + get_node_id_fn))
>
> return self
>
> def AddFailedNode(self, node):
>
>
>
Hrvoje Ribicic
Ganeti Engineering
Google Germany GmbH
Dienerstr. 12, 80331, München
Geschäftsführer: Matthew Scott Sucherman, Paul Terence Manicle
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Diese E-Mail ist vertraulich. Wenn Sie nicht der richtige Adressat sind,
leiten Sie diese bitte nicht weiter, informieren Sie den Absender und
löschen Sie die E-Mail und alle Anhänge. Vielen Dank.
This e-mail is confidential. If you are not the right addressee please do
not forward it, please inform the sender, and please erase this e-mail
including any attachments. Thanks.
