← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/virt/connection.py

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-12-13 10:17:01 UTC
  • mto: This revision was merged to the branch mainline in revision 8.
  • Revision ID: james.westby@ubuntu.com-20101213101701-txhhqbzsxw4avnxv
Tags: upstream-2011.1~bzr456
Import upstream version 2011.1~bzr456

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/virt/connection.py
25
25
from nova import flags
26
26
from nova.virt import fake
27
27
from nova.virt import libvirt_conn
28
 
from nova.virt import xenapi
 
28
from nova.virt import xenapi_conn
29
29
 
30
30
 
31
31
FLAGS = flags.FLAGS
61
61
    elif t == 'libvirt':
62
62
        conn = libvirt_conn.get_connection(read_only)
63
63
    elif t == 'xenapi':
64
 
        conn = xenapi.get_connection(read_only)
 
64
        conn = xenapi_conn.get_connection(read_only)
65
65
    else:
66
66
        raise Exception('Unknown connection type "%s"' % t)
67
67