On Fri, Aug 23, 2013 at 10:35 PM, Jose A. Lopes <[email protected]>wrote:
> From: "Jose A. Lopes" <[email protected]> > > Function '_CheckOutputFields' was receiving three field sets, two of > which were simply being merged together. This was complicated and > unnecessary. This patch simplifies '_CheckOutputFields' to take > simply two field sets. > > Signed-off-by: Jose A. Lopes <[email protected]> > --- > lib/cmdlib/node.py | 27 +++++++++------------------ > 1 file changed, 9 insertions(+), 18 deletions(-) > > diff --git a/lib/cmdlib/node.py b/lib/cmdlib/node.py > index 178235e..5b17f7e 100644 > --- a/lib/cmdlib/node.py > +++ b/lib/cmdlib/node.py > @@ -1290,20 +1290,14 @@ class LUNodeQuery(NoHooksLU): > return self.nq.OldStyleQuery(self) > > > -def _CheckOutputFields(static, dynamic, selected): > +def _CheckOutputFields(fields, selected): > """Checks whether all selected fields are valid. > > - @type static: L{utils.FieldSet} > - @param static: static fields set > - @type dynamic: L{utils.FieldSet} > - @param dynamic: dynamic fields set > + @type fields: L{utils.FieldSet} > + @param fields: fields set > Please document the 'selected' parameter here as well. > > """ > - f = utils.FieldSet() > - f.Extend(static) > - f.Extend(dynamic) > - > - delta = f.NonMatching(selected) > + delta = fields.NonMatching(selected) > if delta: > raise errors.OpPrereqError("Unknown output fields selected: %s" > % ",".join(delta), errors.ECODE_INVAL) > @@ -1314,13 +1308,11 @@ class LUNodeQueryvols(NoHooksLU): > > """ > REQ_BGL = False > - _FIELDS_DYNAMIC = utils.FieldSet("phys", "vg", "name", "size", > "instance") > - _FIELDS_STATIC = utils.FieldSet("node") > > def CheckArguments(self): > - _CheckOutputFields(static=self._FIELDS_STATIC, > - dynamic=self._FIELDS_DYNAMIC, > - selected=self.op.output_fields) > + _CheckOutputFields(utils.FieldSet("node", "phys", "vg", "name", > "size", > + "instance"), > + self.op.output_fields) > Could we use constants here as well? > > def ExpandNames(self): > self.share_locks = ShareAll() > @@ -1395,9 +1387,8 @@ class LUNodeQueryStorage(NoHooksLU): > REQ_BGL = False > > def CheckArguments(self): > - _CheckOutputFields(static=utils.FieldSet(), > - > dynamic=utils.FieldSet(*constants.VALID_STORAGE_FIELDS), > - selected=self.op.output_fields) > + _CheckOutputFields(utils.FieldSet(*constants.VALID_STORAGE_FIELDS), > + self.op.output_fields) > > def ExpandNames(self): > self.share_locks = ShareAll() > -- > 1.8.3 > > Rest LGMT, thanks. -- Thomas Thrainer | Software Engineer | [email protected] | Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
