Change in vdsm[master]: [1/x] BindingXMLRPC cleanup: Remove/inline getServerInfo

amuller at redhat.com amuller at redhat.com
Tue Dec 31 12:18:03 UTC 2013


Assaf Muller has uploaded a new change for review.

Change subject: [1/x] BindingXMLRPC cleanup: Remove/inline getServerInfo
......................................................................

[1/x] BindingXMLRPC cleanup: Remove/inline getServerInfo

Change-Id: I9f19630f995c2fe9fb3e3c11e4027f22f98722ba
Signed-off-by: Assaf Muller <amuller at redhat.com>
---
M vdsm/BindingXMLRPC.py
1 file changed, 4 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/35/22835/1

diff --git a/vdsm/BindingXMLRPC.py b/vdsm/BindingXMLRPC.py
index a340ae7..4c78bdf 100644
--- a/vdsm/BindingXMLRPC.py
+++ b/vdsm/BindingXMLRPC.py
@@ -81,15 +81,6 @@
         self._thread.join()
         return {'status': doneCode}
 
-    def getServerInfo(self):
-        """
-        Return the IP address and last client information
-        """
-        last = self.server.lastClient
-        return {'management_ip': self.serverIP,
-                'lastClient': last,
-                'lastClientIface': getRouteDeviceTo(destinationIP=last)}
-
     def _getKeyCertFilenames(self):
         """
         Get the locations of key and certificate files.
@@ -312,7 +303,10 @@
     def getCapabilities(self):
         api = API.Global()
         ret = api.getCapabilities()
-        ret['info'].update(self.getServerInfo())
+        last = self.server.lastClient
+        ret['info']['management_ip'] = self.serverIP
+        ret['info']['lastClient'] = last
+        ret['info']['lastClientIface'] = getRouteDeviceTo(destinationIP=last)
         return ret
 
     def getHardwareInfo(self):


-- 
To view, visit http://gerrit.ovirt.org/22835
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f19630f995c2fe9fb3e3c11e4027f22f98722ba
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Assaf Muller <amuller at redhat.com>


More information about the vdsm-patches mailing list