← Back to branch summary

~usc-isi/nova/hpc-trunk

« back to all changes in this revision

Viewing changes to nova/tests/test_compute.py

  • Committer: ISI Hudson Server
  • Date: 2011-09-10 07:03:21 UTC
  • mfrom: (662.621.265 nova)
  • Revision ID: isi_hudson_server-20110910070321-dm13zq4oy5fhnw1u
merged nova trunk 1548

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/test_compute.py
301
301
        self.compute.resume_instance(self.context, instance_id)
302
302
        self.compute.terminate_instance(self.context, instance_id)
303
303
 
304
 
    def test_reboot(self):
305
 
        """Ensure instance can be rebooted"""
306
 
        instance_id = self._create_instance()
307
 
        self.compute.run_instance(self.context, instance_id)
308
 
        self.compute.reboot_instance(self.context, instance_id)
 
304
    def test_soft_reboot(self):
 
305
        """Ensure instance can be soft rebooted"""
 
306
        instance_id = self._create_instance()
 
307
        reboot_type = "SOFT"
 
308
        self.compute.run_instance(self.context, instance_id)
 
309
        self.compute.reboot_instance(self.context, instance_id, reboot_type)
 
310
        self.compute.terminate_instance(self.context, instance_id)
 
311
 
 
312
    def test_hard_reboot(self):
 
313
        """Ensure instance can be hard rebooted"""
 
314
        instance_id = self._create_instance()
 
315
        reboot_type = "HARD"
 
316
        self.compute.run_instance(self.context, instance_id)
 
317
        self.compute.reboot_instance(self.context, instance_id, reboot_type)
309
318
        self.compute.terminate_instance(self.context, instance_id)
310
319
 
311
320
    def test_set_admin_password(self):