From e38bc4eb65a40f410a87ced05e4faffda205e3e3 Mon Sep 17 00:00:00 2001
From: Bernardo Dal Seno <bdalseno@google.com>
Date: Tue, 19 Feb 2013 14:56:05 +0100
Subject: [PATCH] Unit tests for objects.FillIPolicy() + small fix
IPOLICY_DEFAULTS is now a legal policy (the disk-templates entry was a set
instead of a list, before).
Signed-off-by: Bernardo Dal Seno <bdalseno@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
lib/constants.py | 2 +-
test/py/ganeti.objects_unittest.py | 69 ++++++++++++++++++++++++++++++
2 files changed, 70 insertions(+), 1 deletion(-)
diff --git a/lib/constants.py b/lib/constants.py
index 884eb6b39..ddeb6a7c1 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -2115,7 +2115,7 @@ IPOLICY_DEFAULTS = {
ISPEC_NIC_COUNT: 1,
ISPEC_SPINDLE_USE: 1,
},
- IPOLICY_DTS: DISK_TEMPLATES,
+ IPOLICY_DTS: list(DISK_TEMPLATES),
IPOLICY_VCPU_RATIO: 4.0,
IPOLICY_SPINDLE_RATIO: 32.0,
}
diff --git a/test/py/ganeti.objects_unittest.py b/test/py/ganeti.objects_unittest.py
index 6f73e303d..704e7674e 100755
--- a/test/py/ganeti.objects_unittest.py
+++ b/test/py/ganeti.objects_unittest.py
@@ -376,5 +376,74 @@ class TestNode(unittest.TestCase):
self.assertTrue(constants.ND_SPINDLE_COUNT in node2.ndparams)
+class TestInstancePolicy(unittest.TestCase):
+ def setUp(self):
+ # Policies are big, and we want to see the difference in case of an error
+ self.maxDiff = None
+
+ def _AssertIPolicyIsFull(self, policy):
+ self.assertEqual(frozenset(policy.keys()), constants.IPOLICY_ALL_KEYS)
+ for key in constants.IPOLICY_ISPECS:
+ spec = policy[key]
+ self.assertEqual(frozenset(spec.keys()), constants.ISPECS_PARAMETERS)
+
+ def testDefaultIPolicy(self):
+ objects.InstancePolicy.CheckParameterSyntax(constants.IPOLICY_DEFAULTS,
+ True)
+ self._AssertIPolicyIsFull(constants.IPOLICY_DEFAULTS)
+
+ def testFillIPolicyEmpty(self):
+ policy = objects.FillIPolicy(constants.IPOLICY_DEFAULTS, {})
+ objects.InstancePolicy.CheckParameterSyntax(policy, True)
+ self.assertEqual(policy, constants.IPOLICY_DEFAULTS)
+
+ def _AssertISpecsMerged(self, default_spec, diff_spec, merged_spec):
+ for (param, value) in merged_spec.items():
+ if param in diff_spec:
+ self.assertEqual(value, diff_spec[param])
+ else:
+ self.assertEqual(value, default_spec[param])
+
+ def _AssertIPolicyMerged(self, default_pol, diff_pol, merged_pol):
+ for (key, value) in merged_pol.items():
+ if key in diff_pol:
+ if key in constants.IPOLICY_ISPECS:
+ self._AssertISpecsMerged(default_pol[key], diff_pol[key], value)
+ else:
+ self.assertEqual(value, diff_pol[key])
+ else:
+ self.assertEqual(value, default_pol[key])
+
+ def testFillIPolicy(self):
+ partial_policies = [
+ {constants.IPOLICY_VCPU_RATIO: 3.14},
+ {constants.IPOLICY_SPINDLE_RATIO: 2.72},
+ {constants.IPOLICY_DTS: []},
+ {constants.IPOLICY_DTS: [constants.DT_FILE]},
+ ]
+ for diff_pol in partial_policies:
+ policy = objects.FillIPolicy(constants.IPOLICY_DEFAULTS, diff_pol)
+ objects.InstancePolicy.CheckParameterSyntax(policy, True)
+ self._AssertIPolicyIsFull(policy)
+ self._AssertIPolicyMerged(constants.IPOLICY_DEFAULTS, diff_pol, policy)
+
+ def testFillIPolicySpecs(self):
+ partial_policies = [
+ {constants.ISPECS_MIN: {constants.ISPEC_MEM_SIZE: 32},
+ constants.ISPECS_MAX: {constants.ISPEC_CPU_COUNT: 1024}},
+ {constants.ISPECS_STD: {constants.ISPEC_DISK_SIZE: 2048},
+ constants.ISPECS_MAX: {
+ constants.ISPEC_DISK_COUNT: constants.MAX_DISKS - 1,
+ constants.ISPEC_NIC_COUNT: constants.MAX_NICS - 1,
+ }},
+ {constants.ISPECS_STD: {constants.ISPEC_SPINDLE_USE: 3}},
+ ]
+ for diff_pol in partial_policies:
+ policy = objects.FillIPolicy(constants.IPOLICY_DEFAULTS, diff_pol)
+ objects.InstancePolicy.CheckParameterSyntax(policy, True)
+ self._AssertIPolicyIsFull(policy)
+ self._AssertIPolicyMerged(constants.IPOLICY_DEFAULTS, diff_pol, policy)
+
+
if __name__ == "__main__":
testutils.GanetiTestProgram()
--
GitLab