← Back to branch summary

~0x44/nova/bug838466

« back to all changes in this revision

Viewing changes to nova/virt/fake.py

  • Committer: Brian Waldon
  • Date: 2011-07-26 17:13:41 UTC
  • mfrom: (1324 nova)
  • mto: This revision was merged to the branch mainline in revision 1326.
  • Revision ID: brian.waldon@rackspace.com-20110726171341-jrclqn08ew7ngshr
merging trunk; resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/virt/fake.py
167
167
        """
168
168
        pass
169
169
 
170
 
    def reboot(self, instance):
 
170
    def reboot(self, instance, network_info):
171
171
        """
172
172
        Reboot the specified instance.
173
173
 
240
240
        """
241
241
        pass
242
242
 
243
 
    def rescue(self, instance):
 
243
    def rescue(self, instance, callback, network_info):
244
244
        """
245
245
        Rescue the specified instance.
246
246
        """
247
247
        pass
248
248
 
249
 
    def unrescue(self, instance):
 
249
    def unrescue(self, instance, callback, network_info):
250
250
        """
251
251
        Unrescue the specified instance.
252
252
        """
293
293
        """
294
294
        pass
295
295
 
296
 
    def destroy(self, instance):
 
296
    def destroy(self, instance, network_info):
297
297
        key = instance.name
298
298
        if key in self.instances:
299
299
            del self.instances[key]
499
499
        """This method is supported only by libvirt."""
500
500
        return
501
501
 
502
 
    def unfilter_instance(self, instance_ref):
 
502
    def unfilter_instance(self, instance_ref, network_info=None):
503
503
        """This method is supported only by libvirt."""
504
504
        raise NotImplementedError('This method is supported only by libvirt.')
505
505