Change in vdsm[master]: virt: stats: get rid of _getStatsInternal

fromani at redhat.com fromani at redhat.com
Tue Apr 8 13:29:38 UTC 2014


Francesco Romani has uploaded a new change for review.

Change subject: virt: stats: get rid of _getStatsInternal
......................................................................

virt: stats: get rid of _getStatsInternal

it was used on just one place anyway.

Change-Id: Ie39d575081e92d9f8a52e1c5ee01638365582c3e
Signed-off-by: Francesco Romani <fromani at redhat.com>
---
M vdsm/virt/vm.py
1 file changed, 4 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/56/26556/1

diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index e385d7f..bbd47dd 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -2397,14 +2397,6 @@
         return self.conf
 
     def getStats(self):
-        stats = self._getStatsInternal()
-        stats['hash'] = self._devXmlHash
-        if self._watchdogEvent:
-            stats["watchdogEvent"] = self._watchdogEvent
-        return stats
-
-    def _getStatsInternal(self):
-        # used by API.Vm.getStats
         stats = {}
         if self.lastStatus == vmstatus.DOWN:
             self._addExitedVmStats(stats)
@@ -2420,6 +2412,10 @@
 
             self._addBalloonInfoStats(stats)
             self._addMigrationVmStats(stats)
+
+        stats['hash'] = self._devXmlHash
+        if self._watchdogEvent:
+            stats["watchdogEvent"] = self._watchdogEvent
         return stats
 
     def _addExitedVmStats(self, stats):


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie39d575081e92d9f8a52e1c5ee01638365582c3e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani at redhat.com>


More information about the vdsm-patches mailing list