Change in vdsm[master]: [WIP]vdsm: add support for S3/S4 suspend calls

Martin Polednik has uploaded a new change for review.

Change subject: [WIP]vdsm: add support for S3/S4 suspend calls
......................................................................

[WIP]vdsm: add support for S3/S4 suspend calls

Change-Id: Ic30016c5cd555f5771dde8db3f1340e1c11b3da7
Signed-off-by: Martin Polednik <mpoledni(a)redhat.com&gt;
---
M vdsm/API.py
M vdsm/BindingXMLRPC.py
M vdsm/guestIF.py
M vdsm_api/vdsmapi-schema.json
4 files changed, 58 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/89/19389/1

diff --git a/vdsm/API.py b/vdsm/API.py
index 37bb908..96119ed 100644
--- a/vdsm/API.py
+++ b/vdsm/API.py
@@ -296,6 +296,20 @@
         else:
             return errCode['nonresp']
 
+    def desktopSuspend(self, mode):
+        """
+        Sleep the guest operating system
+        """
+        try:
+            v = self._cif.vmContainer[self._UUID]
+        except KeyError:
+            return errCode['noVM']
+        v.guestAgent.desktopSuspend(mode)
+        if v.guestAgent.isResponsive():
+            return {'status': doneCode}
+        else:
+            return errCode['nonresp']
+
     def desktopSendHcCommand(self, message):
         """
         Send a command to the guest agent (depricated).
diff --git a/vdsm/BindingXMLRPC.py b/vdsm/BindingXMLRPC.py
index fb65ad4..046bb0c 100644
--- a/vdsm/BindingXMLRPC.py
+++ b/vdsm/BindingXMLRPC.py
@@ -352,6 +352,10 @@
         vm = API.VM(vmId)
         return vm.desktopLogoff(force)
 
+    def vmDesktopSuspend(self, vmId, mode):
+        vm = API.VM(vmId)
+        return vm.desktopSuspend(mode)
+
     def vmDesktopLock(self, vmId):
         vm = API.VM(vmId)
         return vm.desktopLock()
@@ -836,6 +840,7 @@
                 (self.vmMigrationCreate, 'migrationCreate'),
                 (self.vmDesktopLogin, 'desktopLogin'),
                 (self.vmDesktopLogoff, 'desktopLogoff'),
+                (self.vmDesktopSuspend, 'desktopSuspend'),
                 (self.vmDesktopLock, 'desktopLock'),
                 (self.vmDesktopSendHcCommand, 'sendHcCmdToDesktop'),
                 (self.vmHibernate, 'hibernate'),
diff --git a/vdsm/guestIF.py b/vdsm/guestIF.py
index 6f09ef1..2bb654b 100644
--- a/vdsm/guestIF.py
+++ b/vdsm/guestIF.py
@@ -299,6 +299,15 @@
         except:
             self.log.error("desktopLogoff failed", exc_info=True)
 
+    def desktopSuspend(self, mode):
+        try:
+            self.log.debug('desktopSleep called')
+            cmds = ('guest-suspend-ram', 'guest-suspend-hybrid',
+                    'guest-suspend-disk')
+            self._forward(cmds['mode'], {'success_response':
'yes'})
+        except:
+            self.log.debug('desktopSleep failed', exc_info=True)
+
     def desktopShutdown(self, timeout, msg):
         try:
             self.log.debug("desktopShutdown called")
diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json
index 27c12c1..bc54041 100644
--- a/vdsm_api/vdsmapi-schema.json
+++ b/vdsm_api/vdsmapi-schema.json
@@ -5079,6 +5079,36 @@
  'data': {'vmID': 'UUID', 'force': 'bool'}}
 
 ##
+# @guestSuspendMode
+#
+# Enumeration of supported suspend modes
+#
+# @ram:     S3 sleep
+#
+# @disk:    S4 sleep
+#
+# @hybrid:  Combination of @ram and @disk
+#
+# Since: 4.12.0
+##
+{'enum': 'guestSuspendMode', 'data': ['ram',
'disk', 'hybrid']}
+
+
+##
+# @VM.desktopSuspend:
+#
+# Suspend the guest operating system
+#
+# @vmID:   The UUID of the VM
+#
+# @mode:   Type of suspension
+#
+# Since: 4.12.0
+##
+{'command': {'class': 'VM', 'name':
'desktopSuspend'},
+ 'data': {'vmID': 'UUID', 'mode':
'guestSuspendMode'}}
+
+##
 # @VM.desktopSendHcCommand:
 #
 # Send an arbitrary command to the guest agent.


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic30016c5cd555f5771dde8db3f1340e1c11b3da7
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Polednik <mpoledni(a)redhat.com&gt;