Revision 1c3231aa test/py/ganeti.hypervisor.hv_kvm_unittest.py

b/test/py/ganeti.hypervisor.hv_kvm_unittest.py
185 185

  
186 186

  
187 187
class TestConsole(unittest.TestCase):
188
  def _Test(self, instance, hvparams):
189
    cons = hv_kvm.KVMHypervisor.GetInstanceConsole(instance, hvparams, {})
188
  def _Test(self, instance, node, hvparams):
189
    cons = hv_kvm.KVMHypervisor.GetInstanceConsole(instance, node, hvparams, {})
190 190
    self.assertTrue(cons.Validate())
191 191
    return cons
192 192

  
193 193
  def testSerial(self):
194 194
    instance = objects.Instance(name="kvm.example.com",
195
                                primary_node="node6017")
195
                                primary_node="node6017-uuid")
196
    node = objects.Node(name="node6017", uuid="node6017-uuid")
196 197
    hvparams = {
197 198
      constants.HV_SERIAL_CONSOLE: True,
198 199
      constants.HV_VNC_BIND_ADDRESS: None,
199 200
      constants.HV_KVM_SPICE_BIND: None,
200 201
      }
201
    cons = self._Test(instance, hvparams)
202
    cons = self._Test(instance, node, hvparams)
202 203
    self.assertEqual(cons.kind, constants.CONS_SSH)
203
    self.assertEqual(cons.host, instance.primary_node)
204
    self.assertEqual(cons.host, node.name)
204 205
    self.assertEqual(cons.command[0], pathutils.KVM_CONSOLE_WRAPPER)
205 206
    self.assertEqual(cons.command[1], constants.SOCAT_PATH)
206 207

  
207 208
  def testVnc(self):
208 209
    instance = objects.Instance(name="kvm.example.com",
209
                                primary_node="node7235",
210
                                primary_node="node7235-uuid",
210 211
                                network_port=constants.VNC_BASE_PORT + 10)
212
    node = objects.Node(name="node7235", uuid="node7235-uuid")
211 213
    hvparams = {
212 214
      constants.HV_SERIAL_CONSOLE: False,
213 215
      constants.HV_VNC_BIND_ADDRESS: "192.0.2.1",
214 216
      constants.HV_KVM_SPICE_BIND: None,
215 217
      }
216
    cons = self._Test(instance, hvparams)
218
    cons = self._Test(instance, node, hvparams)
217 219
    self.assertEqual(cons.kind, constants.CONS_VNC)
218 220
    self.assertEqual(cons.host, "192.0.2.1")
219 221
    self.assertEqual(cons.port, constants.VNC_BASE_PORT + 10)
......
223 225
    instance = objects.Instance(name="kvm.example.com",
224 226
                                primary_node="node7235",
225 227
                                network_port=11000)
228
    node = objects.Node(name="node7235", uuid="node7235-uuid")
226 229
    hvparams = {
227 230
      constants.HV_SERIAL_CONSOLE: False,
228 231
      constants.HV_VNC_BIND_ADDRESS: None,
229 232
      constants.HV_KVM_SPICE_BIND: "192.0.2.1",
230 233
      }
231
    cons = self._Test(instance, hvparams)
234
    cons = self._Test(instance, node, hvparams)
232 235
    self.assertEqual(cons.kind, constants.CONS_SPICE)
233 236
    self.assertEqual(cons.host, "192.0.2.1")
234 237
    self.assertEqual(cons.port, 11000)
......
237 240
    instance = objects.Instance(name="kvm.example.com",
238 241
                                primary_node="node24325",
239 242
                                network_port=0)
243
    node = objects.Node(name="node24325", uuid="node24325-uuid")
240 244
    hvparams = {
241 245
      constants.HV_SERIAL_CONSOLE: False,
242 246
      constants.HV_VNC_BIND_ADDRESS: None,
243 247
      constants.HV_KVM_SPICE_BIND: None,
244 248
      }
245
    cons = self._Test(instance, hvparams)
249
    cons = self._Test(instance, node, hvparams)
246 250
    self.assertEqual(cons.kind, constants.CONS_MESSAGE)
247 251

  
248 252

  

Also available in: Unified diff