openstack/nova
Code Issues Proposed changes

Merge "Use instance object instead of db record"

Browse Source
This commit is contained in:
Jenkins
2016-07-07 01:37:52 +00:00
committed by Gerrit Code Review
parent d767164a45 29ec93d99d
commit 97c57fb7b2
2 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
nova/console/manager.py
View File

@@ -24,6 +24,7 @@ import nova.conf
from nova import exception
from nova.i18n import _LI
from nova import manager
from nova import objects
from nova import utils
@@ -58,20 +59,20 @@ class ConsoleProxyManager(manager.Manager):
self.driver.init_host()
def add_console(self, context, instance_id):
instance = self.db.instance_get(context, instance_id)
host = instance['host']
name = instance['name']
instance = objects.Instance.get_by_id(context, instance_id)
host = instance.host
name = instance.name
pool = self._get_pool_for_instance_host(context, host)
try:
console = self.db.console_get_by_pool_instance(context,
pool['id'],
instance['uuid'])
instance.uuid)
except exception.NotFound:
LOG.debug('Adding console', instance=instance)
password = utils.generate_password(8)
port = self.driver.get_port(context)
console_data = {'instance_name': name,
'instance_uuid': instance['uuid'],
'instance_uuid': instance.uuid,
'password': password,
'pool_id': pool['id']}
if port: