On Tue, Mar 4, 2014 at 2:38 PM, Jose A. Lopes <[email protected]> wrote: > It seems '_CheckOSVariant' was moved from 'ganeti.cmdlib.instance' to > 'ganeti.cmdlib.instance_utils' but the source was never deleted. This > patch deletes the source copy if this function. > > Signed-off-by: Jose A. Lopes <[email protected]> > --- > lib/cmdlib/instance.py | 24 ------------------------ > test/py/cmdlib/instance_unittest.py | 11 ++++++----- > 2 files changed, 6 insertions(+), 29 deletions(-) > > diff --git a/lib/cmdlib/instance.py b/lib/cmdlib/instance.py > index ad14ef3..cb1f960 100644 > --- a/lib/cmdlib/instance.py > +++ b/lib/cmdlib/instance.py > @@ -294,30 +294,6 @@ def _ComputeIPolicyInstanceSpecViolation( > disk_sizes, spindle_use, disk_template) > > > -def _CheckOSVariant(os_obj, name): > - """Check whether an OS name conforms to the os variants specification. > - > - @type os_obj: L{objects.OS} > - @param os_obj: OS object to check > - @type name: string > - @param name: OS name passed by the user, to check for validity > - > - """ > - variant = objects.OS.GetVariant(name) > - if not os_obj.supported_variants: > - if variant: > - raise errors.OpPrereqError("OS '%s' doesn't support variants ('%s'" > - " passed)" % (os_obj.name, variant), > - errors.ECODE_INVAL) > - return > - if not variant: > - raise errors.OpPrereqError("OS name must include a variant", > - errors.ECODE_INVAL) > - > - if variant not in os_obj.supported_variants: > - raise errors.OpPrereqError("Unsupported OS variant", errors.ECODE_INVAL) > - > - > def _ComputeInstanceCommunicationNIC(instance_name): > """Compute the name of the instance NIC used by instance > communication. > diff --git a/test/py/cmdlib/instance_unittest.py > b/test/py/cmdlib/instance_unittest.py > index 619642e..527b6b1 100644 > --- a/test/py/cmdlib/instance_unittest.py > +++ b/test/py/cmdlib/instance_unittest.py > @@ -39,6 +39,7 @@ from ganeti import objects > from ganeti.rpc import node as rpc > from ganeti import utils > from ganeti.cmdlib import instance > +from ganeti.cmdlib import instance_utils > > from cmdlib.cmdlib_unittest import _StubComputeIPolicySpecViolation, _FakeLU > > @@ -743,26 +744,26 @@ param1=val1 > class TestCheckOSVariant(CmdlibTestCase): > def testNoVariantsSupported(self): > os = self.cfg.CreateOs(supported_variants=[]) > - self.assertRaises(errors.OpPrereqError, instance._CheckOSVariant, > + self.assertRaises(errors.OpPrereqError, instance_utils._CheckOSVariant, > os, "os+variant") > > def testNoVariantGiven(self): > os = self.cfg.CreateOs(supported_variants=["default"]) > - self.assertRaises(errors.OpPrereqError, instance._CheckOSVariant, > + self.assertRaises(errors.OpPrereqError, instance_utils._CheckOSVariant, > os, "os") > > def testWrongVariantGiven(self): > os = self.cfg.CreateOs(supported_variants=["default"]) > - self.assertRaises(errors.OpPrereqError, instance._CheckOSVariant, > + self.assertRaises(errors.OpPrereqError, instance_utils._CheckOSVariant, > os, "os+wrong_variant") > > def testOkWithVariant(self): > os = self.cfg.CreateOs(supported_variants=["default"]) > - instance._CheckOSVariant(os, "os+default") > + instance_utils._CheckOSVariant(os, "os+default") > > def testOkWithoutVariant(self): > os = self.cfg.CreateOs(supported_variants=[]) > - instance._CheckOSVariant(os, "os") > + instance_utils._CheckOSVariant(os, "os") > > > class TestCheckTargetNodeIPolicy(TestLUInstanceCreate): > -- > 1.9.0.279.gdc9e3eb >
LGTM, thanks. Michele -- 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
