Revision c42be2c0 test/py/ganeti.hypervisor.hv_kvm_unittest.py
b/test/py/ganeti.hypervisor.hv_kvm_unittest.py | ||
---|---|---|
200 | 200 |
|
201 | 201 |
|
202 | 202 |
class TestConsole(unittest.TestCase): |
203 |
def _Test(self, instance, node, hvparams): |
|
204 |
cons = hv_kvm.KVMHypervisor.GetInstanceConsole(instance, node, hvparams, {}) |
|
203 |
def _Test(self, instance, node, group, hvparams): |
|
204 |
cons = hv_kvm.KVMHypervisor.GetInstanceConsole(instance, node, group, |
|
205 |
hvparams, {}) |
|
205 | 206 |
self.assertTrue(cons.Validate()) |
206 | 207 |
return cons |
207 | 208 |
|
208 | 209 |
def testSerial(self): |
209 | 210 |
instance = objects.Instance(name="kvm.example.com", |
210 | 211 |
primary_node="node6017-uuid") |
211 |
node = objects.Node(name="node6017", uuid="node6017-uuid") |
|
212 |
node = objects.Node(name="node6017", uuid="node6017-uuid", |
|
213 |
ndparams={}) |
|
214 |
group = objects.NodeGroup(name="group6134", ndparams={}) |
|
212 | 215 |
hvparams = { |
213 | 216 |
constants.HV_SERIAL_CONSOLE: True, |
214 | 217 |
constants.HV_VNC_BIND_ADDRESS: None, |
215 | 218 |
constants.HV_KVM_SPICE_BIND: None, |
216 | 219 |
} |
217 |
cons = self._Test(instance, node, hvparams) |
|
220 |
cons = self._Test(instance, node, group, hvparams)
|
|
218 | 221 |
self.assertEqual(cons.kind, constants.CONS_SSH) |
219 | 222 |
self.assertEqual(cons.host, node.name) |
220 | 223 |
self.assertEqual(cons.command[0], pathutils.KVM_CONSOLE_WRAPPER) |
... | ... | |
224 | 227 |
instance = objects.Instance(name="kvm.example.com", |
225 | 228 |
primary_node="node7235-uuid", |
226 | 229 |
network_port=constants.VNC_BASE_PORT + 10) |
227 |
node = objects.Node(name="node7235", uuid="node7235-uuid") |
|
230 |
node = objects.Node(name="node7235", uuid="node7235-uuid", |
|
231 |
ndparams={}) |
|
232 |
group = objects.NodeGroup(name="group3632", ndparams={}) |
|
228 | 233 |
hvparams = { |
229 | 234 |
constants.HV_SERIAL_CONSOLE: False, |
230 | 235 |
constants.HV_VNC_BIND_ADDRESS: "192.0.2.1", |
231 | 236 |
constants.HV_KVM_SPICE_BIND: None, |
232 | 237 |
} |
233 |
cons = self._Test(instance, node, hvparams) |
|
238 |
cons = self._Test(instance, node, group, hvparams)
|
|
234 | 239 |
self.assertEqual(cons.kind, constants.CONS_VNC) |
235 | 240 |
self.assertEqual(cons.host, "192.0.2.1") |
236 | 241 |
self.assertEqual(cons.port, constants.VNC_BASE_PORT + 10) |
... | ... | |
240 | 245 |
instance = objects.Instance(name="kvm.example.com", |
241 | 246 |
primary_node="node7235", |
242 | 247 |
network_port=11000) |
243 |
node = objects.Node(name="node7235", uuid="node7235-uuid") |
|
248 |
node = objects.Node(name="node7235", uuid="node7235-uuid", |
|
249 |
ndparams={}) |
|
250 |
group = objects.NodeGroup(name="group0132", ndparams={}) |
|
244 | 251 |
hvparams = { |
245 | 252 |
constants.HV_SERIAL_CONSOLE: False, |
246 | 253 |
constants.HV_VNC_BIND_ADDRESS: None, |
247 | 254 |
constants.HV_KVM_SPICE_BIND: "192.0.2.1", |
248 | 255 |
} |
249 |
cons = self._Test(instance, node, hvparams) |
|
256 |
cons = self._Test(instance, node, group, hvparams)
|
|
250 | 257 |
self.assertEqual(cons.kind, constants.CONS_SPICE) |
251 | 258 |
self.assertEqual(cons.host, "192.0.2.1") |
252 | 259 |
self.assertEqual(cons.port, 11000) |
... | ... | |
255 | 262 |
instance = objects.Instance(name="kvm.example.com", |
256 | 263 |
primary_node="node24325", |
257 | 264 |
network_port=0) |
258 |
node = objects.Node(name="node24325", uuid="node24325-uuid") |
|
265 |
node = objects.Node(name="node24325", uuid="node24325-uuid", |
|
266 |
ndparams={}) |
|
267 |
group = objects.NodeGroup(name="group9184", ndparams={}) |
|
259 | 268 |
hvparams = { |
260 | 269 |
constants.HV_SERIAL_CONSOLE: False, |
261 | 270 |
constants.HV_VNC_BIND_ADDRESS: None, |
262 | 271 |
constants.HV_KVM_SPICE_BIND: None, |
263 | 272 |
} |
264 |
cons = self._Test(instance, node, hvparams) |
|
273 |
cons = self._Test(instance, node, group, hvparams)
|
|
265 | 274 |
self.assertEqual(cons.kind, constants.CONS_MESSAGE) |
266 | 275 |
|
267 | 276 |
|
Also available in: Unified diff