openstack/nova
Code Issues Proposed changes

Merge "Rename libvirt_uri to uri"

Browse Source
This commit is contained in:
Jenkins
2011-12-15 15:03:39 +00:00
committed by Gerrit Code Review
parent 6447e767c7 596d433ffa
commit c421328c56
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nova/tests/test_libvirt.py
View File

@@ -555,7 +555,7 @@ class LibvirtConnTestCase(test.TestCase):
self.flags(libvirt_type='lxc')
conn = connection.LibvirtConnection(True)
self.assertEquals(conn.libvirt_uri, 'lxc:///')
self.assertEquals(conn.uri, 'lxc:///')
network_info = _fake_network_info(self.stubs, 1)
xml = conn.to_xml(instance_ref, network_info)
@@ -686,7 +686,7 @@ class LibvirtConnTestCase(test.TestCase):
self.flags(libvirt_type=libvirt_type)
conn = connection.LibvirtConnection(True)
self.assertEquals(conn.libvirt_uri, expected_uri)
self.assertEquals(conn.uri, expected_uri)
network_info = _fake_network_info(self.stubs, 1)
xml = conn.to_xml(instance_ref, network_info, rescue)
@@ -714,7 +714,7 @@ class LibvirtConnTestCase(test.TestCase):
for (libvirt_type, (expected_uri, checks)) in type_uri_map.iteritems():
self.flags(libvirt_type=libvirt_type)
conn = connection.LibvirtConnection(True)
self.assertEquals(conn.libvirt_uri, testuri)
self.assertEquals(conn.uri, testuri)
db.instance_destroy(user_context, instance_ref['id'])
def test_update_available_resource_works_correctly(self):

6
nova/virt/libvirt/connection.py
View File

@@ -222,8 +222,8 @@ class LibvirtConnection(driver.ComputeDriver):
def _get_connection(self):
if not self._wrapped_conn or not self._test_connection():
LOG.debug(_('Connecting to libvirt: %s'), self.libvirt_uri)
self._wrapped_conn = self._connect(self.libvirt_uri,
LOG.debug(_('Connecting to libvirt: %s'), self.uri)
self._wrapped_conn = self._connect(self.uri,
self.read_only)
return self._wrapped_conn
_conn = property(_get_connection)
@@ -241,7 +241,7 @@ class LibvirtConnection(driver.ComputeDriver):
raise
@property
def libvirt_uri(self):
def uri(self):
if FLAGS.libvirt_type == 'uml':
uri = FLAGS.libvirt_uri or 'uml:///system'
elif FLAGS.libvirt_type == 'xen':