← Back to branch summary

~cerberus/nova/xs_migrations

« back to all changes in this revision

Viewing changes to nova/compute/manager.py

  • Committer: Cerberus
  • Date: 2011-02-28 17:39:23 UTC
  • mfrom: (569.1.180 nova)
  • Revision ID: matt.dietz@rackspace.com-20110228173923-1e3upi2ddoc2j4xl
Merge from trunk and merge conflict resolution

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/compute/manager.py
633
633
                                                   context=context)
634
634
        self.driver.reset_network(instance_ref)
635
635
 
 
636
    @checks_instance_lock
 
637
    def inject_network_info(self, context, instance_id):
 
638
        """
 
639
        Inject network info for the instance.
 
640
 
 
641
        """
 
642
        context = context.elevated()
 
643
        instance_ref = self.db.instance_get(context, instance_id)
 
644
        LOG.debug(_('instance %s: inject network info'), instance_id,
 
645
                                                         context=context)
 
646
        self.driver.inject_network_info(instance_ref)
 
647
 
636
648
    @exception.wrap_exception
637
649
    def get_console_output(self, context, instance_id):
638
650
        """Send the console output for an instance."""