Revision 6ee8fdd3 test/py/ganeti.objects_unittest.py
b/test/py/ganeti.objects_unittest.py | ||
---|---|---|
93 | 93 |
self.failUnlessEqual(cl.GetHVDefaults(constants.HT_FAKE), |
94 | 94 |
cl.hvparams[constants.HT_FAKE]) |
95 | 95 |
self.failUnlessEqual(cl.GetHVDefaults(None), {}) |
96 |
self.failUnlessEqual(cl.GetHVDefaults(constants.HT_XEN_PVM, |
|
97 |
os_name="lenny-image"), |
|
98 |
cl.os_hvp["lenny-image"][constants.HT_XEN_PVM]) |
|
96 |
defaults = cl.GetHVDefaults(constants.HT_XEN_PVM, |
|
97 |
os_name="lenny-image") |
|
98 |
for param, value in cl.os_hvp["lenny-image"][constants.HT_XEN_PVM].items(): |
|
99 |
self.assertEqual(value, defaults[param]) |
|
99 | 100 |
|
100 | 101 |
def testFillHvFullMerge(self): |
101 | 102 |
inst_hvparams = { |
... | ... | |
132 | 133 |
os="ubuntu-hardy", |
133 | 134 |
hypervisor=constants.HT_XEN_PVM, |
134 | 135 |
hvparams=inst_hvparams) |
135 |
self.assertEqual(inst_hvparams, self.fake_cl.FillHV(fake_inst)) |
|
136 |
filled_conf = self.fake_cl.FillHV(fake_inst) |
|
137 |
for param, value in constants.HVC_DEFAULTS[constants.HT_XEN_PVM].items(): |
|
138 |
if param == "blah": |
|
139 |
value = "blubb" |
|
140 |
self.assertEqual(value, filled_conf[param]) |
|
136 | 141 |
|
137 |
def testFillHvEmptyParams(self):
|
|
142 |
def testFillHvDefaultParams(self):
|
|
138 | 143 |
fake_inst = objects.Instance(name="foobar", |
139 | 144 |
os="ubuntu-hardy", |
140 | 145 |
hypervisor=constants.HT_XEN_PVM, |
141 | 146 |
hvparams={}) |
142 |
self.assertEqual({}, self.fake_cl.FillHV(fake_inst)) |
|
147 |
self.assertEqual(constants.HVC_DEFAULTS[constants.HT_XEN_PVM], |
|
148 |
self.fake_cl.FillHV(fake_inst)) |
|
143 | 149 |
|
144 | 150 |
def testFillHvPartialParams(self): |
145 | 151 |
os = "lenny-image" |
... | ... | |
147 | 153 |
os=os, |
148 | 154 |
hypervisor=constants.HT_XEN_PVM, |
149 | 155 |
hvparams={}) |
150 |
self.assertEqual(self.fake_cl.os_hvp[os][constants.HT_XEN_PVM], |
|
151 |
self.fake_cl.FillHV(fake_inst)) |
|
156 |
filled_conf = self.fake_cl.FillHV(fake_inst) |
|
157 |
for param, value in self.fake_cl.os_hvp[os][constants.HT_XEN_PVM].items(): |
|
158 |
self.assertEqual(value, filled_conf[param]) |
|
152 | 159 |
|
153 | 160 |
def testFillNdParamsCluster(self): |
154 | 161 |
fake_node = objects.Node(name="test", |
Also available in: Unified diff