Make LibvirtDriver.uri() a staticmethod.

LibvirtDriver's uri() function seems to be the most logical place
where one can access the libvirt URL used by Nova. I would like
access to this outside the scope of the internal libvirt
driver (for libguestfs) so exposing it as a static
resource seems to make sense.

Partial fix for LP Bug #1131768.

Change-Id: I653296414716b4e799d68f6bfc868e6039d6ea4a

2 files changed, 9 insertions, 9 deletions

diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index b1135902d..466ea62ca 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -1678,7 +1678,7 @@ class LibvirtConnTestCase(test.TestCase):
         self.flags(libvirt_type='lxc')
         conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
 
-        self.assertEquals(conn.uri, 'lxc:///')
+        self.assertEquals(conn.uri(), 'lxc:///')
 
         network_info = _fake_network_info(self.stubs, 1)
         disk_info = blockinfo.get_disk_info(CONF.libvirt_type,
@@ -1966,7 +1966,7 @@ class LibvirtConnTestCase(test.TestCase):
             self.flags(libvirt_type=libvirt_type)
             conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
 
-            self.assertEquals(conn.uri, expected_uri)
+            self.assertEquals(conn.uri(), expected_uri)
 
             network_info = _fake_network_info(self.stubs, 1)
             disk_info = blockinfo.get_disk_info(CONF.libvirt_type,
@@ -2006,7 +2006,7 @@ class LibvirtConnTestCase(test.TestCase):
         for (libvirt_type, (expected_uri, checks)) in type_uri_map.iteritems():
             self.flags(libvirt_type=libvirt_type)
             conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
-            self.assertEquals(conn.uri, testuri)
+            self.assertEquals(conn.uri(), testuri)
         db.instance_destroy(user_context, instance_ref['uuid'])
 
     def test_ensure_filtering_rules_for_instance_timeout(self):
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index dfae88c23..c726fe847 100755
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -515,14 +515,14 @@ class LibvirtDriver(driver.ComputeDriver):
 
     def _get_connection(self):
         if not self._wrapped_conn or not self._test_connection():
-            LOG.debug(_('Connecting to libvirt: %s'), self.uri)
+            LOG.debug(_('Connecting to libvirt: %s'), self.uri())
             if not CONF.libvirt_nonblocking:
-                self._wrapped_conn = self._connect(self.uri,
+                self._wrapped_conn = self._connect(self.uri(),
                                                self.read_only)
             else:
                 self._wrapped_conn = tpool.proxy_call(
                     (libvirt.virDomain, libvirt.virConnect),
-                    self._connect, self.uri, self.read_only)
+                    self._connect, self.uri(), self.read_only)
 
             try:
                 LOG.debug("Registering for lifecycle events %s" % str(self))
@@ -533,7 +533,7 @@ class LibvirtDriver(driver.ComputeDriver):
                     self)
             except Exception, e:
                 LOG.warn(_("URI %s does not support events"),
-                         self.uri)
+                         self.uri())
 
         return self._wrapped_conn
 
@@ -551,8 +551,8 @@ class LibvirtDriver(driver.ComputeDriver):
                 return False
             raise
 
-    @property
-    def uri(self):
+    @staticmethod
+    def uri():
         if CONF.libvirt_type == 'uml':
             uri = CONF.libvirt_uri or 'uml:///system'
         elif CONF.libvirt_type == 'xen':