[PATCH master 1/3] Improve tests for attaching disks

['Lisa Velden' via ganeti-devel]

by associating disks and instances to a specific node.

Signed-off-by: Lisa Velden <vel...@google.com>
---
 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 27e3d2f..cf76ea2 100644
--- a/test/py/cmdlib/instance_unittest.py
+++ b/test/py/cmdlib/instance_unittest.py
@@ -2699,7 +2699,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,
@@ -2717,7 +2717,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,
@@ -2735,7 +2735,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,
                                  {
@@ -2759,7 +2759,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,
@@ -2819,7 +2819,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(
@@ -2828,6 +2828,7 @@ class TestLUInstanceSetParams(CmdlibTestCase):
     inst = self.cfg.AddNewInstance(name='instance',
                                    disk_template=constants.DT_FILE,
                                    disks=[file_disk, mock_disk],
+                                   primary_node=self.master
                                    )
 
     # Detach the disk and assert that it has been moved to the upper directory
@@ -2858,10 +2859,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)
 
     op = self.CopyOpCode(self.op,
                          instance_name=inst.name,
-- 
2.6.0.rc2.230.g3dd15c0