Change in vdsm[master]: Get rid of legacy status 'Running'

vfeenstr at redhat.com vfeenstr at redhat.com
Wed Nov 27 09:24:54 UTC 2013


Vinzenz Feenstra has uploaded a new change for review.

Change subject: Get rid of legacy status 'Running'
......................................................................

Get rid of legacy status 'Running'

The status 'Running' means 'Up' for any case, now we get rid of it
completely as this is not helpful having two states for Up.

Change-Id: Ie3c6e66365fe02158e5a7bb8db56c724b612b366
Signed-off-by: Vinzenz Feenstra <vfeenstr at redhat.com>
---
M tests/functional/momTests.py
M tests/functional/storageTests.py
M tests/functional/virtTests.py
M vdsm/guestIF.py
4 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/66/21766/1

diff --git a/tests/functional/momTests.py b/tests/functional/momTests.py
index b5be83e..7ae0c2b 100644
--- a/tests/functional/momTests.py
+++ b/tests/functional/momTests.py
@@ -80,7 +80,7 @@
 
     def _statsOK(self, stats):
         try:
-            return stats['status'] == 'Running' and stats['balloonInfo'] \
+            return stats['status'] == 'Up' and stats['balloonInfo'] \
                 and stats['memoryStats']
         except KeyError:
             return False
diff --git a/tests/functional/storageTests.py b/tests/functional/storageTests.py
index e9b2c4f..df3a043 100644
--- a/tests/functional/storageTests.py
+++ b/tests/functional/storageTests.py
@@ -62,7 +62,7 @@
 
 @expandPermutations
 class StorageTest(TestCaseBase):
-    UPSTATES = frozenset(('Up', 'Powering up', 'Running'))
+    UPSTATES = frozenset(('Up', 'Powering up'))
 
     def runTest(self):
         pass
diff --git a/tests/functional/virtTests.py b/tests/functional/virtTests.py
index cdb695a..d49c439 100644
--- a/tests/functional/virtTests.py
+++ b/tests/functional/virtTests.py
@@ -135,7 +135,7 @@
 
 @expandPermutations
 class VirtTest(TestCaseBase):
-    UPSTATES = frozenset(('Up', 'Powering up', 'Running'))
+    UPSTATES = frozenset(('Up', 'Powering up'))
 
     def setUp(self):
         self.vdsm = VdsProxy()
diff --git a/vdsm/guestIF.py b/vdsm/guestIF.py
index 6f09ef1..06ca71b 100644
--- a/vdsm/guestIF.py
+++ b/vdsm/guestIF.py
@@ -169,9 +169,9 @@
     def _handleMessage(self, message, args):
         self.log.log(logging.TRACE, "Guest's message %s: %s", message, args)
         if self.guestStatus is None:
-            self.guestStatus = 'Running'
+            self.guestStatus = 'Up'
         if message == 'heartbeat':
-            self.guestStatus = 'Running'
+            self.guestStatus = 'Up'
             self.guestInfo['memUsage'] = int(args['free-ram'])
             # ovirt-guest-agent reports the following fields in 'memory-stat':
             # 'mem_total', 'mem_free', 'mem_unused', 'swap_in', 'swap_out',


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3c6e66365fe02158e5a7bb8db56c724b612b366
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Vinzenz Feenstra <vfeenstr at redhat.com>


More information about the vdsm-patches mailing list