Interdiff: diff --git a/lib/cmdlib/query.py b/lib/cmdlib/query.py index ec5051d..16a6c29 100644 --- a/lib/cmdlib/query.py +++ b/lib/cmdlib/query.py @@ -21,18 +21,18 @@
"""Logical units for queries.""" -from ganeti import errors from ganeti import constants +from ganeti import errors from ganeti import query +from ganeti.cmdlib import _ExtStorageQuery +from ganeti.cmdlib import _OsQuery +from ganeti.cmdlib.backup import _ExportQuery from ganeti.cmdlib.base import NoHooksLU from ganeti.cmdlib.cluster import _ClusterQuery from ganeti.cmdlib.group import _GroupQuery -from ganeti.cmdlib.node import _NodeQuery from ganeti.cmdlib.instance import _InstanceQuery -from ganeti.cmdlib.backup import _ExportQuery from ganeti.cmdlib.network import _NetworkQuery -from ganeti.cmdlib import _OsQuery -from ganeti.cmdlib import _ExtStorageQuery +from ganeti.cmdlib.node import _NodeQuery #: Query type implementations On Thu, May 16, 2013 at 6:51 PM, Bernardo Dal Seno <[email protected]>wrote: > On 16 May 2013 10:23, Thomas Thrainer <[email protected]> wrote: > > All LUQuery* classes are extracted to query.py. > > > > Signed-off-by: Thomas Thrainer <[email protected]> > > --- > > Makefile.am | 1 + > > lib/cmdlib/__init__.py | 103 > +++++++------------------------------- > > lib/cmdlib/query.py | 102 > +++++++++++++++++++++++++++++++++++++ > > test/py/ganeti.cmdlib_unittest.py | 9 ++-- > > 4 files changed, 125 insertions(+), 90 deletions(-) > > create mode 100644 lib/cmdlib/query.py > > > > diff --git a/Makefile.am b/Makefile.am > > index b8346b7..da01b58 100644 > > --- a/Makefile.am > > +++ b/Makefile.am > > @@ -317,6 +317,7 @@ cmdlib_PYTHON = \ > > lib/cmdlib/instance.py \ > > lib/cmdlib/instance_utils.py \ > > lib/cmdlib/backup.py \ > > + lib/cmdlib/query.py \ > > Make sure that when rebasing the previous interdiff the order here is > correct. > > > > diff --git a/lib/cmdlib/query.py b/lib/cmdlib/query.py > > +from ganeti import errors > > +from ganeti import constants > > +from ganeti import query > > +from ganeti.cmdlib.base import NoHooksLU > > +from ganeti.cmdlib.cluster import _ClusterQuery > > +from ganeti.cmdlib.group import _GroupQuery > > +from ganeti.cmdlib.node import _NodeQuery > > +from ganeti.cmdlib.instance import _InstanceQuery > > +from ganeti.cmdlib.backup import _ExportQuery > > +from ganeti.cmdlib.network import _NetworkQuery > > +from ganeti.cmdlib import _OsQuery > > +from ganeti.cmdlib import _ExtStorageQuery > > It would be better if they were sorted. > > Rest LGTM, thanks. > > Bernardo > -- 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, Katherine Stephens
