LGTM with the small nit. (but it's OK to just ignore it).
On 11/26/2015 01:36 PM, 'Lisa Velden' via ganeti-devel wrote:
by associating disks and instances to a specific node.
Signed-off-by: Lisa Velden <[email protected]>
---
test/py/cmdlib/instance_unittest.py | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/test/py/cmdlib/instance_unittest.py
b/test/py/cmdlib/instance_unittest.py
index e837f0f..e91f4c4 100644
--- a/test/py/cmdlib/instance_unittest.py
+++ b/test/py/cmdlib/instance_unittest.py
@@ -2706,7 +2706,7 @@ class TestLUInstanceSetParams(CmdlibTestCase):
self.ExecOpCodeExpectOpPrereqError(op, msg)
def testAttachDiskRunningInstance(self):
- self.cfg.AddOrphanDisk(name="mock_disk_1134")
+ self.cfg.AddOrphanDisk(name="mock_disk_1134",
primary_node=self.master.uuid)
self.rpc.call_blockdev_assemble.return_value = \
self.RpcResultsBuilder() \
.CreateSuccessfulNodeResult(self.master,
@@ -2724,7 +2724,7 @@ class TestLUInstanceSetParams(CmdlibTestCase):
self.assertFalse(self.rpc.call_blockdev_shutdown.called)
def testAttachDiskRunningInstanceNoWaitForSync(self):
- self.cfg.AddOrphanDisk(name="mock_disk_1134")
+ self.cfg.AddOrphanDisk(name="mock_disk_1134",
primary_node=self.master.uuid)
self.rpc.call_blockdev_assemble.return_value = \
self.RpcResultsBuilder() \
.CreateSuccessfulNodeResult(self.master,
@@ -2742,7 +2742,7 @@ class TestLUInstanceSetParams(CmdlibTestCase):
self.assertFalse(self.rpc.call_blockdev_shutdown.called)
def testAttachDiskDownInstance(self):
- self.cfg.AddOrphanDisk(name="mock_disk_1134")
+ self.cfg.AddOrphanDisk(name="mock_disk_1134",
primary_node=self.master.uuid)
op = self.CopyOpCode(self.op,
disks=[[constants.DDM_ATTACH, -1,
{
@@ -2766,7 +2766,7 @@ class TestLUInstanceSetParams(CmdlibTestCase):
" and --no-wait-for-sync given.")
def testHotAttachDisk(self):
- self.cfg.AddOrphanDisk(name="mock_disk_1134")
+ self.cfg.AddOrphanDisk(name="mock_disk_1134",
primary_node=self.master.uuid)
self.rpc.call_blockdev_assemble.return_value = \
self.RpcResultsBuilder() \
.CreateSuccessfulNodeResult(self.master,
@@ -2826,7 +2826,7 @@ class TestLUInstanceSetParams(CmdlibTestCase):
# well as the expected path where it will be moved.
mock_disk = self.cfg.CreateDisk(
name='mock_disk_1134', dev_type=constants.DT_FILE,
- logical_id=('loop', '/tmp/instance/disk'))
+ logical_id=('loop', '/tmp/instance/disk'), primary_node=self.master.uuid)
# Create a file-based instance
file_disk = self.cfg.CreateDisk(
@@ -2835,6 +2835,7 @@ class TestLUInstanceSetParams(CmdlibTestCase):
inst = self.cfg.AddNewInstance(name='instance',
disk_template=constants.DT_FILE,
disks=[file_disk, mock_disk],
+ primary_node=self.master
)
You don't have to pass self.master. It's the default in AddNewInstance.
# Detach the disk and assert that it has been moved to the upper directory
@@ -2865,10 +2866,13 @@ class TestLUInstanceSetParams(CmdlibTestCase):
Also, check if the operations succeed both with name and uuid.
"""
- disk1 = self.cfg.CreateDisk(uuid="mock_uuid_1134")
- disk2 = self.cfg.CreateDisk(name="mock_name_1134")
+ disk1 = self.cfg.CreateDisk(uuid="mock_uuid_1134",
+ primary_node=self.master.uuid)
+ disk2 = self.cfg.CreateDisk(name="mock_name_1134",
+ primary_node=self.master.uuid)
- inst = self.cfg.AddNewInstance(disks=[disk1, disk2])
+ inst = self.cfg.AddNewInstance(disks=[disk1, disk2],
+ primary_node=self.master)
And the same here.
op = self.CopyOpCode(self.op,
instance_name=inst.name,
