On 17 May 2013 08:45, Thomas Thrainer <[email protected]> wrote: > > > > On Thu, May 16, 2013 at 5:14 PM, Bernardo Dal Seno <[email protected]> > wrote: >> >> On 16 May 2013 10:23, Thomas Thrainer <[email protected]> wrote: >> > All LUGroup* classes are moved to group.py. Common functions are >> > extracted to common.py. >> >> This patch also changes the order of functions in cluster.py. If kept >> this way, the comment should reflect that. >> > It no longer does due to rebasing. I can resend the whole patch if you like, > or you just trust me that it no longer touches cluster.py :).
No need for resending, thank you (and btw you've sent the interdiff that does the change already). >> > >> > Signed-off-by: Thomas Thrainer <[email protected]> >> > --- >> > Makefile.am | 1 + >> > lib/cmdlib/__init__.py | 1055 >> > +------------------------------------ >> > lib/cmdlib/cluster.py | 172 +++--- >> > lib/cmdlib/common.py | 150 ++++++ >> > lib/cmdlib/group.py | 942 >> > +++++++++++++++++++++++++++++++++ >> > test/py/ganeti.cmdlib_unittest.py | 19 +- >> > 6 files changed, 1195 insertions(+), 1144 deletions(-) >> > create mode 100644 lib/cmdlib/group.py >> >> >> > diff --git a/lib/cmdlib/common.py b/lib/cmdlib/common.py >> > index a922ad9..60f748f 100644 >> > --- a/lib/cmdlib/common.py >> > +++ b/lib/cmdlib/common.py >> > @@ -24,6 +24,7 @@ import copy >> > import os >> > >> > from ganeti import constants >> > +from ganeti import compat >> > from ganeti import errors >> > from ganeti import locking >> > from ganeti import utils >> > @@ -32,6 +33,7 @@ from ganeti import objects >> > from ganeti import pathutils >> > from ganeti import rpc >> > from ganeti import ssconf >> > +from ganeti import opcodes >> >> Please keep them sorted. >> > > Interdiff: > > diff --git a/lib/cmdlib/common.py b/lib/cmdlib/common.py > index 98d480a..5d630c6 100644 > --- a/lib/cmdlib/common.py > +++ b/lib/cmdlib/common.py > @@ -20,11 +20,12 @@ > > > """Common functions used by multiple logical units.""" > + > import copy > import os > > -from ganeti import constants > from ganeti import compat > +from ganeti import constants > from ganeti import errors > from ganeti import hypervisor > from ganeti import locking It seems you forgot to move also opcodes? Bernardo
