← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/virt/xenapi_conn.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2011-12-09 14:24:07 UTC
  • mto: This revision was merged to the branch mainline in revision 55.
  • Revision ID: package-import@ubuntu.com-20111209142407-fviz6p5dnictpxsr
Tags: upstream-2012.1~e2~20111208.11721
Import upstream version 2012.1~e2~20111208.11721

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/virt/xenapi_conn.py
245
245
        """Unpause paused VM instance"""
246
246
        self._vmops.unpause(instance)
247
247
 
248
 
    def migrate_disk_and_power_off(self, context, instance, dest):
 
248
    def migrate_disk_and_power_off(self, context, instance, dest,
 
249
                                   instance_type):
249
250
        """Transfers the VHD of a running instance to another host, then shuts
250
251
        off the instance copies over the COW disk"""
251
 
        return self._vmops.migrate_disk_and_power_off(context, instance, dest)
 
252
        return self._vmops.migrate_disk_and_power_off(context, instance,
 
253
                                                      dest, instance_type)
252
254
 
253
255
    def suspend(self, instance):
254
256
        """suspend the specified instance"""
620
622
            return
621
623
        # Get the SR usage
622
624
        try:
623
 
            sr_ref = vm_utils.safe_find_sr(self._session)
 
625
            sr_ref = vm_utils.VMHelper.safe_find_sr(self._session)
624
626
        except exception.NotFound as e:
625
627
            # No SR configured
626
628
            LOG.error(_("Unable to get SR for this host: %s") % e)