On 12/03/2014 06:12 PM, Klaus Aehlig wrote:
On Wed, Dec 03, 2014 at 04:18:29PM +0100, Niklas Hambuechen wrote:
On 12/02/2014 06:28 PM, 'Klaus Aehlig' via ganeti-devel wrote:
On Tue, Dec 02, 2014 at 03:32:32PM +0100, Klaus Aehlig wrote:
Extend LUInstanceCreate to also be able to commit an already
reserved instance.
Signed-off-by: Klaus Aehlig <[email protected]>
---
lib/cmdlib/instance_create.py | 106 +++++++++++++++++++++++++++++++++---------
1 file changed, 84 insertions(+), 22 deletions(-)
As induced by changes on patch 3 and 4.
commit f61359ea07b3b99d33b9b54ab8e43896a35fb7cc
Author: Klaus Aehlig <[email protected]>
Date: Tue Dec 2 18:27:33 2014 +0100
Interdiff [PATCH master 06/10] Support committing instances
diff --git a/lib/cmdlib/instance_create.py b/lib/cmdlib/instance_create.py
index f6a8693..b5e37ce 100644
--- a/lib/cmdlib/instance_create.py
+++ b/lib/cmdlib/instance_create.py
@@ -1522,11 +1522,11 @@ class LUInstanceCreate(LogicalUnit):
raise
feedback_fn("adding instance %s to cluster config" %
self.op.instance_name)
- self.cfg.AddInstance(iobj, self.proc.GetECId(), replaces=self.op.commit)
+ self.cfg.AddInstance(iobj, self.proc.GetECId(), replace=self.op.commit)
feedback_fn("adding disks to cluster config")
for disk in disks:
- self.cfg.AddInstanceDisk(iobj.uuid, disk, replaces=self.op.commit)
+ self.cfg.AddInstanceDisk(iobj.uuid, disk, replace=self.op.commit)
if self.op.forthcoming:
feedback_fn("Instance is forthcoming; not creating the actual instance")
LGTM
I missed one occurence, and like to add the following interdiff.
commit 7607810a5c6b2b7d0b2c75eeb3dba530b2fcd2a6
Author: Klaus Aehlig <[email protected]>
Date: Wed Dec 3 18:11:49 2014 +0100
Interdiff [PATCH master 06/10] Support committing instances
diff --git a/test/py/testutils/config_mock.py b/test/py/testutils/config_mock.py
index 761f0ad..fed7362 100644
--- a/test/py/testutils/config_mock.py
+++ b/test/py/testutils/config_mock.py
@@ -814,7 +814,7 @@ class ConfigMock(config.ConfigWriter):
if net_uuid:
return self._UnlockedReserveIp(net_uuid, address, ec_id, check)
- def AddInstance(self, instance, ec_id, replaces=False):
+ def AddInstance(self, instance, ec_id, replace=False):
"""Add an instance to the config.
"""
LGTM
--
Niklas Hambüchen
Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
