diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-12-15 15:03:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-12-15 15:03:39 +0000 |
| commit | c421328c5697698adfaacdf053efe715646d069a (patch) | |
| tree | f4a133c4a6633bda2df76829d9a2b1b4a0bc82c6 | |
| parent | 6447e767c7f4bdd95a81b7a3ca276551d89dd163 (diff) | |
| parent | 596d433ffa952d79d558c35f32020b5affc72ade (diff) | |
Merge "Rename libvirt_uri to uri"
| -rw-r--r-- | nova/tests/test_libvirt.py | 6 | ||||
| -rw-r--r-- | nova/virt/libvirt/connection.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index 438b7c4fb..5c180a9fe 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -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): diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py index 9c9b98ff0..5dee8f0c7 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -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': |