← Back to branch summary

~ubuntu-cloud-archive/ubuntu/precise/nova/trunk

« back to all changes in this revision

Viewing changes to nova/console/vmrc_manager.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman
  • Date: 2012-06-22 12:39:57 UTC
  • mfrom: (1.1.57)
  • Revision ID: package-import@ubuntu.com-20120622123957-hbzwg84nt9rqwg8r
Tags: 2012.2~f2~20120621.14517-0ubuntu1
[ Chuck Short ]
* New upstream version.

[ Adam Gandelman ]
* debian/rules: Temporarily disable test suite while blocking
  tests are investigated. 
* debian/patches/kombu_tests_timeout.patch: Dropped.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/console/vmrc_manager.py
17
17
 
18
18
"""VMRC Console Manager."""
19
19
 
 
20
from nova.compute import rpcapi as compute_rpcapi
20
21
from nova import exception
21
22
from nova import flags
22
23
from nova import log as logging
23
24
from nova import manager
24
25
from nova.openstack.common import cfg
25
26
from nova.openstack.common import importutils
26
 
from nova import rpc
27
27
from nova.virt import vmwareapi_conn
28
28
 
29
29
 
47
47
 
48
48
    def __init__(self, console_driver=None, *args, **kwargs):
49
49
        self.driver = importutils.import_object(FLAGS.console_driver)
 
50
        self.compute_rpcapi = compute_rpcapi.ComputeAPI()
50
51
        super(ConsoleVMRCManager, self).__init__(*args, **kwargs)
51
52
 
52
53
    def init_host(self):
98
99
        try:
99
100
            console = self.db.console_get_by_pool_instance(context,
100
101
                                                      pool['id'],
101
 
                                                      instance_id)
 
102
                                                      instance['uuid'])
102
103
            if self.driver.is_otp():
103
104
                console = self._generate_console(context,
104
105
                                                 pool,
137
138
                                                         self.host,
138
139
                                                         console_type)
139
140
        except exception.NotFound:
140
 
            pool_info = rpc.call(context,
141
 
                                 self.db.queue_get_for(context,
142
 
                                                       FLAGS.compute_topic,
143
 
                                                       instance_host),
144
 
                                 {'method': 'get_console_pool_info',
145
 
                                  'args': {'console_type': console_type}})
 
141
            pool_info = self.compute_rpcapi.get_console_pool_info(context,
 
142
                    console_type, instance_host)
146
143
            pool_info['password'] = self.driver.fix_pool_password(
147
144
                                                    pool_info['password'])
148
145
            pool_info['host'] = self.host