diff options
| -rw-r--r-- | nova/tests/test_libvirt.py | 9 | ||||
| -rw-r--r-- | nova/virt/libvirt/connection.py | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index 61524e0cb..438b7c4fb 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -555,8 +555,7 @@ class LibvirtConnTestCase(test.TestCase): self.flags(libvirt_type='lxc') conn = connection.LibvirtConnection(True) - uri = conn.get_uri() - self.assertEquals(uri, 'lxc:///') + self.assertEquals(conn.libvirt_uri, 'lxc:///') network_info = _fake_network_info(self.stubs, 1) xml = conn.to_xml(instance_ref, network_info) @@ -687,8 +686,7 @@ class LibvirtConnTestCase(test.TestCase): self.flags(libvirt_type=libvirt_type) conn = connection.LibvirtConnection(True) - uri = conn.get_uri() - self.assertEquals(uri, expected_uri) + self.assertEquals(conn.libvirt_uri, expected_uri) network_info = _fake_network_info(self.stubs, 1) xml = conn.to_xml(instance_ref, network_info, rescue) @@ -716,8 +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) - uri = conn.get_uri() - self.assertEquals(uri, testuri) + self.assertEquals(conn.libvirt_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 db5212623..9c9b98ff0 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -184,7 +184,6 @@ class LibvirtConnection(driver.ComputeDriver): def __init__(self, read_only): super(LibvirtConnection, self).__init__() - self.libvirt_uri = self.get_uri() self.libvirt_xml = open(FLAGS.libvirt_xml_template).read() self.cpuinfo_xml = open(FLAGS.cpuinfo_xml_template).read() @@ -241,7 +240,8 @@ class LibvirtConnection(driver.ComputeDriver): return False raise - def get_uri(self): + @property + def libvirt_uri(self): if FLAGS.libvirt_type == 'uml': uri = FLAGS.libvirt_uri or 'uml:///system' elif FLAGS.libvirt_type == 'xen': |