commit 8ae1112c83575cf178a1cd6e0277c39cd128dc74
Merge: 4644ee4 1238fc4
Author: Petr Pudlak <[email protected]>
Date: Fri Jun 13 09:34:07 2014 +0200
Merge branch 'stable-2.10' into stable-2.11
* stable-2.10
Remove 'physical_id' from testing data
Support disk hotplug with userspace access
Conflicts:
lib/cmdlib/instance.py
test/py/cmdlib/instance_unittest.py
Resolution:
Incorporate changes for disk hotplugging from stable-2.10.
diff --cc test/py/cmdlib/instance_unittest.py
index 1e74b3f,245f023..f6a6326
--- a/test/py/cmdlib/instance_unittest.py
+++ b/test/py/cmdlib/instance_unittest.py
@@@ -1494,7 -1485,11 +1494,8 @@@ class TestLUInstanceMove(CmdlibTestCase
self.rpc.call_blockdev_assemble.return_value = \
self.RpcResultsBuilder() \
.CreateSuccessfulNodeResult(self.node, ("/dev/mocked_path",
-
"/var/run/ganeti/instance-disks/mocked_d"))
+ "/var/run/ganeti/instance-disks/mocked_d",
+ None))
- self.rpc.call_blockdev_export.return_value = \
- self.RpcResultsBuilder() \
- .CreateSuccessfulNodeResult(self.master, "")
self.rpc.call_blockdev_remove.return_value = \
self.RpcResultsBuilder() \
.CreateSuccessfulNodeResult(self.master, "")
@@@ -1632,10 -1602,10 +1633,10 @@@ class TestLUInstanceRename(CmdlibTestCa
def testFileInstance(self):
self.rpc.call_blockdev_assemble.return_value = \
self.RpcResultsBuilder() \
- .CreateSuccessfulNodeResult(self.master, (None, None))
+ .CreateSuccessfulNodeResult(self.master, (None, None, None))
self.rpc.call_blockdev_shutdown.return_value = \
self.RpcResultsBuilder() \
- .CreateSuccessfulNodeResult(self.master, None)
+ .CreateSuccessfulNodeResult(self.master, (None, None))
inst = self.cfg.AddNewInstance(disk_template=constants.DT_FILE)
op = self.CopyOpCode(self.op,
