From d3b5115694d6ac9f371f251e1f2e83b17c1cc027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Nussbaumer?= <rn@google.com>
Date: Mon, 14 May 2012 15:33:36 +0200
Subject: [PATCH] ganeti.query_unittest: Adding testcase for diskparams
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: RenΓ© Nussbaumer <rn@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
test/ganeti.query_unittest.py | 29 ++++++++++++++++++++++++++++-
1 file changed, 28 insertions(+), 1 deletion(-)
diff --git a/test/ganeti.query_unittest.py b/test/ganeti.query_unittest.py
index 27e68a078..87034436a 100755
--- a/test/ganeti.query_unittest.py
+++ b/test/ganeti.query_unittest.py
@@ -955,6 +955,12 @@ class TestInstanceQuery(unittest.TestCase):
class TestGroupQuery(unittest.TestCase):
def setUp(self):
+ self.custom_diskparams = {
+ constants.DT_DRBD8: {
+ constants.DRBD_DEFAULT_METAVG: "foobar",
+ },
+ }
+
self.groups = [
objects.NodeGroup(name="default",
uuid="c0e89160-18e7-11e0-a46e-001d0904baeb",
@@ -968,7 +974,7 @@ class TestGroupQuery(unittest.TestCase):
alloc_policy=constants.ALLOC_POLICY_LAST_RESORT,
ipolicy=objects.MakeEmptyIPolicy(),
ndparams={},
- diskparams={},
+ diskparams=self.custom_diskparams,
),
]
self.cluster = objects.Cluster(cluster_name="testcluster",
@@ -1048,6 +1054,27 @@ class TestGroupQuery(unittest.TestCase):
],
])
+ def testDiskparams(self):
+ q = self._Create(["name", "uuid", "diskparams", "custom_diskparams"])
+ gqd = query.GroupQueryData(self.cluster, self.groups, None, None, True)
+
+ self.assertEqual(q.RequestedData(),
+ set([query.GQ_CONFIG, query.GQ_DISKPARAMS]))
+
+ self.assertEqual(q.Query(gqd),
+ [[(constants.RS_NORMAL, "default"),
+ (constants.RS_NORMAL, "c0e89160-18e7-11e0-a46e-001d0904baeb"),
+ (constants.RS_NORMAL, constants.DISK_DT_DEFAULTS),
+ (constants.RS_NORMAL, {}),
+ ],
+ [(constants.RS_NORMAL, "restricted"),
+ (constants.RS_NORMAL, "d2a40a74-18e7-11e0-9143-001d0904baeb"),
+ (constants.RS_NORMAL, objects.FillDiskParams(constants.DISK_DT_DEFAULTS,
+ self.custom_diskparams)),
+ (constants.RS_NORMAL, self.custom_diskparams),
+ ],
+ ])
+
class TestOsQuery(unittest.TestCase):
def _Create(self, selected):
--
GitLab