Use Websocket facilities from WoK

The 'websocket' module was moved from Kimchi to WoK to allow
WoK and all its plug-ins to have websocket capabilities.

This patch removes the existing websocket module inside
Kimchi and updates all the references to use the WoK
module instead.

The initialization of the ws_proxy was also removed from
root.py - this process is also being done by WoK now.

Signed-off-by: Daniel Henrique Barboza <[email protected]>

Author: danielhb

contrib/DEBIAN/control.in

@@ -7,7 +7,6 @@ Depends: wok (>= 2.1.0),
          ginger-base,
          python-imaging,
          python-configobj,
-         websockify,
          novnc,
          python-jsonschema (>= 1.3.0),
          python-libvirt,

contrib/kimchi.spec.fedora.in

@@ -14,7 +14,6 @@ Requires:	gettext
 Requires:	libvirt
 Requires:	libvirt-python
 Requires:	libvirt-daemon-config-network
-Requires:	python-websockify
 Requires:	python-configobj
 Requires:	novnc
 Requires:	python-pillow

contrib/kimchi.spec.suse.in

@@ -14,7 +14,6 @@ Requires:	gettext-tools
 Requires:	libvirt
 Requires:	libvirt-python
 Requires:	libvirt-daemon-config-network
-Requires:	python-websockify
 Requires:	python-configobj
 Requires:	novnc
 Requires:	python-Pillow

docs/fedora-deps.md

@@ -28,7 +28,7 @@ Runtime Dependencies
     $ sudo yum install libvirt-python libvirt libvirt-daemon-config-network \
                         qemu-kvm python-ethtool sos python-ipaddr nfs-utils \
                         iscsi-initiator-utils pyparted python-libguestfs \
-                        libguestfs-tools python-websockify novnc spice-html5 \
+                        libguestfs-tools novnc spice-html5 \
                         python-configobj python-magic python-paramiko \
                         python-pillow
 

docs/opensuse-deps.md

@@ -33,8 +33,7 @@ Runtime Dependencies
                             python-ipaddr libvirt-daemon-config-network \
                             nfs-client open-iscsi python-parted \
                             python-libguestfs python-configobj guestfs-tools \
-                            python-websockify novnc python-magic \
-                            python-paramiko python-Pillow
+                            novnc python-magic python-paramiko python-Pillow
 
 Packages required for UI development
 ------------------------------------

docs/ubuntu-deps.md

@@ -15,7 +15,7 @@ Build Dependencies
 Runtime Dependencies
 --------------------
 
-    $ sudo apt-get install python-configobj websockify novnc python-libvirt \
+    $ sudo apt-get install python-configobj novnc python-libvirt \
                             libvirt-bin nfs-common qemu-kvm python-parted \
                             python-ethtool sosreport python-ipaddr \
                             python-lxml open-iscsi python-guestfs \

model/vms.py

@@ -36,6 +36,7 @@
 from lxml.builder import E
 from xml.etree import ElementTree
 
+from wok import websocket
 from wok.asynctask import AsyncTask
 from wok.config import config
 from wok.exception import InvalidOperation, InvalidParameter
@@ -48,7 +49,6 @@
 from wok.xmlutils.utils import xml_item_remove, xml_item_update
 
 from wok.plugins.kimchi import model
-from wok.plugins.kimchi import websocket
 from wok.plugins.kimchi import serialconsole
 from wok.plugins.kimchi.config import READONLY_POOL_TYPE, get_kimchi_version
 from wok.plugins.kimchi.kvmusertests import UserTests

root.py

@@ -22,7 +22,7 @@
 import os
 import tempfile
 
-from wok.plugins.kimchi import config, mockmodel, websocket
+from wok.plugins.kimchi import config, mockmodel
 from wok.plugins.kimchi.i18n import messages
 from wok.plugins.kimchi.control import sub_nodes
 from wok.plugins.kimchi.model import model as kimchiModel
@@ -59,8 +59,6 @@ def remove_objectstore():
             cherrypy.engine.subscribe('exit', remove_objectstore)
         else:
             self.model = kimchiModel.Model()
-            ws_proxy = websocket.new_ws_proxy()
-            cherrypy.engine.subscribe('exit', ws_proxy.terminate)
 
         dev_env = wok_options.environment != 'production'
         super(Kimchi, self).__init__(self.model, dev_env)

tests/test_mockmodel.py

@@ -46,7 +46,7 @@ def setUpModule():
     iso_gen.construct_fake_iso(fake_iso, True, '12.04', 'ubuntu')
 
 
-def tearDown():
+def tearDownModule():
     test_server.stop()
     os.unlink(fake_iso)