← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/virt/vmwareapi/driver.py

  • Committer: Package Import Robot
  • Author(s): Adam Gandelman, Adam Gandelman, Chuck Short
  • Date: 2012-08-27 15:37:18 UTC
  • mfrom: (1.1.60)
  • Revision ID: package-import@ubuntu.com-20120827153718-lj8er44eqqz1gsrj
Tags: 2012.2~rc1~20120827.15815-0ubuntu1
https://launchpad.net/bugs/820694
[ Adam Gandelman ]
* New upstream release.

[ Chuck Short ]
* debian/patches/0001-Update-tools-hacking-for-pep8-1.2-and-
  beyond.patch: Dropped we dont run pep8 tests anymore.
* debian/control: Drop pep8 build depends
* debian/*.upstart.in: Make sure we transition correctly from runlevel
  1 to 2. (LP: #820694)

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/virt/vmwareapi/driver.py
135
135
        """Create snapshot from a running VM instance."""
136
136
        self._vmops.snapshot(context, instance, name)
137
137
 
138
 
    def reboot(self, instance, network_info, reboot_type):
 
138
    def reboot(self, instance, network_info, reboot_type,
 
139
               block_device_info=None):
139
140
        """Reboot VM instance."""
140
141
        self._vmops.reboot(instance, network_info)
141
142
 
195
196
                'username': FLAGS.vmwareapi_host_username,
196
197
                'password': FLAGS.vmwareapi_host_password}
197
198
 
198
 
    def update_available_resource(self, ctxt, host):
 
199
    def get_available_resource(self):
199
200
        """This method is supported only by libvirt."""
200
201
        return
201
202