Windows Xenstore Support

pyxs/_internal.py

@@ -13,6 +13,7 @@
 
 __all__ = ["Event", "Op", "Packet"]
 
+import os
 import struct
 from collections import namedtuple
 
@@ -21,7 +22,7 @@
 
 #: Operations supported by XenStore.
 Operations = Op = namedtuple("Operations", [
-    "DEBUG",
+    "CONTROL",
     "DIRECTORY",
     "READ",
     "GET_PERMS",
@@ -67,12 +68,17 @@ class Packet(namedtuple("_Packet", "op rq_id tx_id size payload")):
 
     def __new__(cls, op, payload, rq_id=None, tx_id=None):
         # Checking restrictions:
-        # a) payload is limited to 4096 bytes.
-        if len(payload) > 4096:
-            raise InvalidPayload(payload)
-        # b) operation requested is present in ``xsd_sockmsg_type``.
+        # a) operation requested is present in ``xsd_sockmsg_type``.
         if op not in Op:
             raise InvalidOperation(op)
 
+        # This is to code around http://lists.xenproject.org/archives/html/win-pv-devel/2016-02/msg00005.html
+        if os.name == "nt" and op == Op.READ and payload is None:
+            payload = ""
+
+        # b) payload is limited to 4096 bytes.
+        if len(payload) > 4096:
+            raise InvalidPayload(payload)
+
         return super(Packet, cls).__new__(cls,
             op, rq_id or 0, tx_id or 0, len(payload), payload)

pyxs/client.py

@@ -24,10 +24,11 @@
 import threading
 import time
 import posixpath
+import os
 from collections import deque
 
 from ._internal import Event, Packet, Op
-from .connection import UnixSocketConnection, XenBusConnection
+from .connection import UnixSocketConnection, XenBusConnection, XenBusConnectionWinWINPV, XenBusConnectionWinGPLPV
 from .exceptions import UnexpectedPacket, PyXSError
 from .helpers import validate_path, validate_watch_path, validate_perms, \
     dict_merge, force_unicode, error
@@ -85,11 +86,23 @@ def __init__(self, unix_socket_path=None, socket_timeout=None,
                  xen_bus_path=None, connection=None, transaction=None):
         if connection:
             self.connection = connection
-        elif unix_socket_path or not xen_bus_path:
-            self.connection = UnixSocketConnection(
-                unix_socket_path, socket_timeout=socket_timeout)
+        elif os.name in ["posix"]:
+            if xen_bus_path or not unix_socket_path:
+                self.connection = XenBusConnection(xen_bus_path)
+            else:
+                self.connection = UnixSocketConnection(
+                    unix_socket_path, socket_timeout=socket_timeout)
+        elif os.name in ["nt"]:
+            # There are two windows pv driver projects, examine wmi
+            # classes to try and determine which one we want to use.
+            import wmi
+            try:
+                wmi.WMI(moniker="//./root/wmi", find_classes=False).XenProjectXenStoreBase()
+                self.connection = XenBusConnectionWinWINPV()
+            except AttributeError:
+                self.connection = XenBusConnectionWinGPLPV()
         else:
-            self.connection = XenBusConnection(xen_bus_path)
+            raise ConnectionError("no connection to xenstore available")
 
         self.tx_id = 0
         self.tx_lock = threading.Lock()
@@ -213,7 +226,7 @@ def ls(self, path):
         :param str path: path to list.
         """
         payload = self.execute_command(Op.DIRECTORY, path)
-        return [] if payload is "" else payload.split("\x00")
+        return [] if payload is "" else map(lambda x : x.split('/')[-1], payload.split("\x00"))
 
     def get_permissions(self, path):
         """Returns a list of permissions for a given `path`, see
@@ -441,7 +454,7 @@ def wait(self, sleep=None):
             # Executing a noop, hopefuly we'll get some events queued
             # in the meantime. Note: I know it sucks, but it seems like
             # there's no other way ...
-            self.client.execute_command(Op.DEBUG, "")
+            self.client.execute_command(Op.CONTROL, "noop")
 
             if sleep is not None:
                 time.sleep(sleep)