← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nova/quantal-proposed

« back to all changes in this revision

Viewing changes to nova/tests/test_vmwareapi.py

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2011-10-21 14:37:26 UTC
  • mto: This revision was merged to the branch mainline in revision 47.
  • Revision ID: james.westby@ubuntu.com-20111021143726-dk1m1a0vwov3kyls
Tags: upstream-2012.1~e1~20111020.11229
Import upstream version 2012.1~e1~20111020.11229

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/test_vmwareapi.py
170
170
        self._create_vm()
171
171
        info = self.conn.get_info(1)
172
172
        self._check_vm_info(info, power_state.RUNNING)
173
 
        self.conn.reboot(self.instance, self.network_info)
 
173
        reboot_type = "SOFT"
 
174
        self.conn.reboot(self.instance, self.network_info, reboot_type)
174
175
        info = self.conn.get_info(1)
175
176
        self._check_vm_info(info, power_state.RUNNING)
176
177