interdiff that also adds the varriables for the third patch:
diff --git a/test/py/cmdlib/instance_unittest.py
b/test/py/cmdlib/instance_unittest.py
index e91f4c4..7da8293 100644
--- a/test/py/cmdlib/instance_unittest.py
+++ b/test/py/cmdlib/instance_unittest.py
@@ -2102,6 +2102,9 @@ class TestLUInstanceSetParams(CmdlibTestCase):
self.mocked_running_inst_state = "running"
self.mocked_running_inst_time = 10938474
+ self.mocked_disk_uuid = "mock_uuid_1134"
+ self.mocked_disk_name = "mock_disk_1134"
+
bootid = "mock_bootid"
storage_info = [
{
@@ -2540,7 +2543,7 @@ class TestLUInstanceSetParams(CmdlibTestCase):
op = self.CopyOpCode(self.op,
disks=[[constants.DDM_ADD, -1,
{
- "uuid": "mock_uuid_1134"
+ "uuid": self.mocked_disk_uuid
}]])
self.ExecOpCodeExpectException(
op, errors.TypeEnforcementError, "Unknown parameter 'uuid'")
@@ -2684,11 +2687,11 @@ class TestLUInstanceSetParams(CmdlibTestCase):
def testAttachDiskWrongTemplate(self):
msg = "Instance has '%s' template while disk has '%s' template" % \
(constants.DT_PLAIN, constants.DT_BLOCK)
- self.cfg.AddOrphanDisk(name="mock_disk_1134",
dev_type=constants.DT_BLOCK)
+ self.cfg.AddOrphanDisk(name=self.mocked_disk_name,
dev_type=constants.DT_BLOCK)
op = self.CopyOpCode(self.op,
disks=[[constants.DDM_ATTACH, -1,
{
- constants.IDISK_NAME: "mock_disk_1134"
+ constants.IDISK_NAME:
self.mocked_disk_name
}]],
)
self.ExecOpCodeExpectOpPrereqError(op, msg)
@@ -2696,17 +2699,17 @@ class TestLUInstanceSetParams(CmdlibTestCase):
def testAttachDiskWrongNodes(self):
msg = "Disk nodes are \['mock_node_1134'\]"
- self.cfg.AddOrphanDisk(name="mock_disk_1134",
primary_node="mock_node_1134")
+ self.cfg.AddOrphanDisk(name=self.mocked_disk_name,
primary_node="mock_node_1134")
op = self.CopyOpCode(self.op,
disks=[[constants.DDM_ATTACH, -1,
{
- constants.IDISK_NAME: "mock_disk_1134"
+ constants.IDISK_NAME:
self.mocked_disk_name
}]],
)
self.ExecOpCodeExpectOpPrereqError(op, msg)
def testAttachDiskRunningInstance(self):
- self.cfg.AddOrphanDisk(name="mock_disk_1134",
primary_node=self.master.uuid)
+ self.cfg.AddOrphanDisk(name=self.mocked_disk_name,
primary_node=self.master.uuid)
self.rpc.call_blockdev_assemble.return_value = \
self.RpcResultsBuilder() \
.CreateSuccessfulNodeResult(self.master,
@@ -2716,7 +2719,7 @@ class TestLUInstanceSetParams(CmdlibTestCase):
op = self.CopyOpCode(self.running_op,
disks=[[constants.DDM_ATTACH, -1,
{
- constants.IDISK_NAME: "mock_disk_1134"
+ constants.IDISK_NAME:
self.mocked_disk_name
}]],
)
self.ExecOpCode(op)
@@ -2724,7 +2727,7 @@ class TestLUInstanceSetParams(CmdlibTestCase):
self.assertFalse(self.rpc.call_blockdev_shutdown.called)
def testAttachDiskRunningInstanceNoWaitForSync(self):
- self.cfg.AddOrphanDisk(name="mock_disk_1134",
primary_node=self.master.uuid)
+ self.cfg.AddOrphanDisk(name=self.mocked_disk_name,
primary_node=self.master.uuid)
self.rpc.call_blockdev_assemble.return_value = \
self.RpcResultsBuilder() \
.CreateSuccessfulNodeResult(self.master,
@@ -2734,7 +2737,7 @@ class TestLUInstanceSetParams(CmdlibTestCase):
op = self.CopyOpCode(self.running_op,
disks=[[constants.DDM_ATTACH, -1,
{
- constants.IDISK_NAME: "mock_disk_1134"
+ constants.IDISK_NAME:
self.mocked_disk_name
}]],
wait_for_sync=False)
self.ExecOpCode(op)
@@ -2742,11 +2745,11 @@ class TestLUInstanceSetParams(CmdlibTestCase):
self.assertFalse(self.rpc.call_blockdev_shutdown.called)
def testAttachDiskDownInstance(self):
- self.cfg.AddOrphanDisk(name="mock_disk_1134",
primary_node=self.master.uuid)
+ self.cfg.AddOrphanDisk(name=self.mocked_disk_name,
primary_node=self.master.uuid)
op = self.CopyOpCode(self.op,
disks=[[constants.DDM_ATTACH, -1,
{
- constants.IDISK_NAME: "mock_disk_1134"
+ constants.IDISK_NAME:
self.mocked_disk_name
}]])
self.ExecOpCode(op)
@@ -2754,11 +2757,11 @@ class TestLUInstanceSetParams(CmdlibTestCase):
self.assertTrue(self.rpc.call_blockdev_shutdown.called)
def testAttachDiskDownInstanceNoWaitForSync(self):
- self.cfg.AddOrphanDisk(name="mock_disk_1134")
+ self.cfg.AddOrphanDisk(name=self.mocked_disk_name)
op = self.CopyOpCode(self.op,
disks=[[constants.DDM_ATTACH, -1,
{
- constants.IDISK_NAME: "mock_disk_1134"
+ constants.IDISK_NAME:
self.mocked_disk_name
}]],
wait_for_sync=False)
self.ExecOpCodeExpectOpPrereqError(
@@ -2766,7 +2769,7 @@ class TestLUInstanceSetParams(CmdlibTestCase):
" and --no-wait-for-sync given.")
def testHotAttachDisk(self):
- self.cfg.AddOrphanDisk(name="mock_disk_1134",
primary_node=self.master.uuid)
+ self.cfg.AddOrphanDisk(name=self.mocked_disk_name,
primary_node=self.master.uuid)
self.rpc.call_blockdev_assemble.return_value = \
self.RpcResultsBuilder() \
.CreateSuccessfulNodeResult(self.master,
@@ -2776,7 +2779,7 @@ class TestLUInstanceSetParams(CmdlibTestCase):
op = self.CopyOpCode(self.op,
disks=[[constants.DDM_ATTACH, -1,
{
- constants.IDISK_NAME: "mock_disk_1134"
+ constants.IDISK_NAME:
self.mocked_disk_name
}]],
hotplug=True)
self.rpc.call_hotplug_supported.return_value = \
@@ -2835,8 +2838,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
op = self.CopyOpCode(self.op,
@@ -2854,7 +2856,7 @@ class TestLUInstanceSetParams(CmdlibTestCase):
instance_name=inst.name <http://inst.name>,
disks=[[constants.DDM_ATTACH, -1,
{
- constants.IDISK_NAME: "mock_disk_1134"
+ constants.IDISK_NAME:
self.mocked_disk_name
}]],
)
self.ExecOpCode(op)
@@ -2866,17 +2868,16 @@ class TestLUInstanceSetParams(CmdlibTestCase):
Also, check if the operations succeed both with name and uuid.
"""
- disk1 = self.cfg.CreateDisk(uuid="mock_uuid_1134",
+ disk1 = self.cfg.CreateDisk(uuid=self.mocked_disk_uuid,
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],
- primary_node=self.master)
+ inst = self.cfg.AddNewInstance(disks=[disk1, disk2])
op = self.CopyOpCode(self.op,
instance_name=inst.name <http://inst.name>,
- disks=[[constants.DDM_DETACH, "mock_uuid_1134",
+ disks=[[constants.DDM_DETACH,
self.mocked_disk_uuid,
{}]])
self.ExecOpCode(op)
self.assertEqual([disk2], self.cfg.GetInstanceDisks(inst.uuid))
@@ -2885,7 +2886,7 @@ class TestLUInstanceSetParams(CmdlibTestCase):
instance_name=inst.name <http://inst.name>,
disks=[[constants.DDM_ATTACH, 0,
{
- 'uuid': "mock_uuid_1134"
+ 'uuid': self.mocked_disk_uuid
}]])
self.ExecOpCode(op)
self.assertEqual([disk1, disk2],
self.cfg.GetInstanceDisks(inst.uuid))
On Thu, Nov 26, 2015 at 4:09 PM Oleg Ponomarev <[email protected]
<mailto:[email protected]>> wrote:
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]
<mailto:[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
<http://inst.name>,
--
Lisa Velden
Software Engineer
[email protected] <mailto:[email protected]>
Google Germany GmbH
Dienerstraße 12
80331 München
Geschäftsführer: Matthew Scott Sucherman, Paul Terence Manicle
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
