[PATCH] host/partitions: avoid calling disks.get_partitions_names() for each partition
by Zhou Zheng Sheng
In PartitionModel.lookup(), it calls disks.get_partitions_names() to
verify the given partition is eligible to be used in a new logical
storage pool as follow.
if name not in disks.get_partitions_names():
raise NotFoundError(...)
When the front-end issues GET request to host/partitions, the back-end
would call get_partitions_names() for each partition. If there are many
disks and partitions in the host, get_partitions_names() takes a long
time to finish, and calling get_partitions_names() for each partition
would make the GET request timeout.
This patch is to do the following.
When the partition is listed from the URI host/partitions, we should
avoid calling get_partitions_names() for each of them.
When the partition is listed from the URI host/partitions/sdaX, we
should verify sdaX is among the eligible partitions.
The solution is that we make use of the resource_args in Partitions
collection class and override the _get_resources() method. In the
_get_resources() method, it sets resource_args to "[True]", indicating
that the listed partitions are already verified and eligible, so
PartitionModel.lookup() would skip the check. When we are outside of
_get_resources() method, resource_args is set to "[False]", and
PartitionModel.lookup() enables the check.
Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
---
src/kimchi/control/host.py | 26 +++++++++++++++++++++-----
src/kimchi/model/host.py | 4 ++--
2 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/src/kimchi/control/host.py b/src/kimchi/control/host.py
index ad34919..11673d5 100644
--- a/src/kimchi/control/host.py
+++ b/src/kimchi/control/host.py
@@ -17,11 +17,14 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+import threading
+
import cherrypy
from kimchi.control.base import Collection, Resource, SimpleCollection
from kimchi.control.utils import UrlSubNode, validate_method
from kimchi.exception import OperationFailed
+from kimchi.rollbackcontext import RollbackContext
from kimchi.template import render
@@ -75,18 +78,31 @@ class Partitions(Collection):
def __init__(self, model):
super(Partitions, self).__init__(model)
self.resource = Partition
+ self._reset_resource_args()
+ self._resource_args_lock = threading.Lock()
+
+ def _reset_resource_args(self):
+ self.resource_args = [False]
- # Defining get_resources in order to return list of partitions in UI
- # sorted by their path
def _get_resources(self, flag_filter):
- res_list = super(Partitions, self)._get_resources(flag_filter)
- res_list.sort(key=lambda x: x.info['path'])
+ with RollbackContext() as rollback:
+ self._resource_args_lock.acquire()
+ rollback.prependDefer(self._resource_args_lock.release)
+
+ self.resource_args = [True]
+ rollback.prependDefer(self._reset_resource_args)
+
+ # Defining get_resources in order to return list of partitions in
+ # UI sorted by their path
+ res_list = super(Partitions, self)._get_resources(flag_filter)
+ res_list.sort(key=lambda x: x.info['path'])
return res_list
class Partition(Resource):
- def __init__(self, model, id):
+ def __init__(self, model, verified, id):
super(Partition, self).__init__(model, id)
+ self.model_args = [verified] + list(self.model_args)
@property
def data(self):
diff --git a/src/kimchi/model/host.py b/src/kimchi/model/host.py
index 47b0aa1..ebd6f79 100644
--- a/src/kimchi/model/host.py
+++ b/src/kimchi/model/host.py
@@ -244,8 +244,8 @@ class PartitionModel(object):
def __init__(self, **kargs):
pass
- def lookup(self, name):
- if name not in disks.get_partitions_names():
+ def lookup(self, verified, name):
+ if not verified and name not in disks.get_partitions_names():
raise NotFoundError("KCHPART0001E", {'name': name})
return disks.get_partition_details(name)
--
1.9.0
10 years, 7 months
[PATCH] Correct the ID String of Disk Size in Template Edit Window
by Hongliang Wang
It was "version" instead of "disk".
Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com>
---
ui/pages/template-edit.html.tmpl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl
index f00e4fc..7a1a6a8 100644
--- a/ui/pages/template-edit.html.tmpl
+++ b/ui/pages/template-edit.html.tmpl
@@ -73,10 +73,10 @@
</div>
<div>
<div class="template-edit-wrapper-label">
- <label>$_("Disk (GB)")</label>
+ <label for="template-edit-disk-textbox">$_("Disk (GB)")</label>
</div>
<div class="template-edit-wrapper-controls">
- <input id="template-edit-version-textbox" name="disks" type="text" />
+ <input id="template-edit-disk-textbox" name="disks" type="text" />
</div>
</div>
</fieldset>
--
1.8.1.4
10 years, 7 months
[PATCH 0/8 V2] Enable Kimchi authentication in console pages and spice bug fix
by Aline Manera
From: Aline Manera <alinefm(a)br.ibm.com>
V1 -> V2:
- Properly add the console.html to spec files
- Use the same mechanism to accept the CA for spice console
- Fix spice issue
-------------------------------------------------------------------------------
As I commented in mailing list ([v3] Enable encryption in vm VNC console connection)
to enable Kimchi authentication in console pages those need to be provided by
Kimchi server instead of websockify web server.
I reverted the "Enable encryption in vm VNC console connection" commit, applied
"[PATCH v2] Enable encryption in vm console connection" path send by Mark and
make the changes needed to redirect user from websockify web server to Kimchi.
So noVNC page continues to be rendered by Kimchi.
With all that done, I was able to enable authentication to vnc_auto.html and
spice.html
Aline Manera (7):
Revert "Enable encryption in vm VNC console connection"
Make use of the mini Web server in the websockify
Enable Kimchi authentication in console pages
backend: Redirect 401 error to default page
UI: Redirect user to console page after logging
websockets: Disallow non-encrypted client connections
bug fix: Properly set the listen IP to SPICE console
Mark Wu (1):
Enable encryption in vm console connection
configure.ac | 9 +-
contrib/kimchi.spec.fedora.in | 14 +-
contrib/kimchi.spec.suse.in | 14 +-
src/kimchi/config.py.in | 32 +-
src/kimchi/vnc.py | 3 +-
src/nginx.conf.in | 10 +
tests/test_config.py.in | 32 +-
ui/Makefile.am | 2 +-
ui/css/Makefile.am | 2 +-
ui/css/fonts/Makefile.am | 2 +
ui/css/fonts/novnc/Makefile.am | 20 +
ui/css/fonts/novnc/Orbitron700.ttf | Bin 0 -> 38580 bytes
ui/css/fonts/novnc/Orbitron700.woff | Bin 0 -> 17472 bytes
ui/css/novnc/Makefile.am | 20 +
ui/css/novnc/base.css | 405 ++++++
ui/js/Makefile.am | 2 +-
ui/js/novnc/Makefile.am | 22 +
ui/js/novnc/base64.js | 115 ++
ui/js/novnc/des.js | 273 ++++
ui/js/novnc/display.js | 770 +++++++++++
ui/js/novnc/input.js | 1946 +++++++++++++++++++++++++++
ui/js/novnc/jsunzip.js | 676 ++++++++++
ui/js/novnc/main.js | 103 ++
ui/js/novnc/rfb.js | 1866 +++++++++++++++++++++++++
ui/js/novnc/util.js | 381 ++++++
ui/js/novnc/web-socket-js/Makefile.am | 24 +
ui/js/novnc/web-socket-js/README.txt | 109 ++
ui/js/novnc/web-socket-js/WebSocketMain.swf | Bin 0 -> 177114 bytes
ui/js/novnc/web-socket-js/swfobject.js | 4 +
ui/js/novnc/web-socket-js/web_socket.js | 391 ++++++
ui/js/novnc/websock.js | 422 ++++++
ui/js/novnc/webutil.js | 216 +++
ui/js/src/kimchi.api.js | 20 +-
ui/js/src/kimchi.login_window.js | 19 +-
ui/novnc/Makefile.am | 22 -
ui/novnc/css/Makefile.am | 20 -
ui/novnc/css/Orbitron700.ttf | Bin 38580 -> 0 bytes
ui/novnc/css/Orbitron700.woff | Bin 17472 -> 0 bytes
ui/novnc/css/base.css | 405 ------
ui/novnc/js/Makefile.am | 22 -
ui/novnc/js/base64.js | 115 --
ui/novnc/js/des.js | 273 ----
ui/novnc/js/display.js | 770 -----------
ui/novnc/js/input.js | 1946 ---------------------------
ui/novnc/js/jsunzip.js | 676 ----------
ui/novnc/js/main.js | 103 --
ui/novnc/js/rfb.js | 1866 -------------------------
ui/novnc/js/util.js | 381 ------
ui/novnc/js/web-socket-js/Makefile.am | 24 -
ui/novnc/js/web-socket-js/README.txt | 109 --
ui/novnc/js/web-socket-js/WebSocketMain.swf | Bin 177114 -> 0 bytes
ui/novnc/js/web-socket-js/swfobject.js | 4 -
ui/novnc/js/web-socket-js/web_socket.js | 391 ------
ui/novnc/js/websock.js | 422 ------
ui/novnc/js/webutil.js | 216 ---
ui/novnc/vnc.html | 43 -
ui/pages/Makefile.am | 2 +-
ui/pages/spice.html.tmpl | 4 +-
ui/pages/vnc_auto.html.tmpl | 44 +
ui/pages/websockify/Makefile.am | 20 +
ui/pages/websockify/console.html | 25 +
61 files changed, 7958 insertions(+), 7869 deletions(-)
create mode 100644 ui/css/fonts/novnc/Makefile.am
create mode 100644 ui/css/fonts/novnc/Orbitron700.ttf
create mode 100644 ui/css/fonts/novnc/Orbitron700.woff
create mode 100644 ui/css/novnc/Makefile.am
create mode 100644 ui/css/novnc/base.css
create mode 100644 ui/js/novnc/Makefile.am
create mode 100644 ui/js/novnc/base64.js
create mode 100644 ui/js/novnc/des.js
create mode 100644 ui/js/novnc/display.js
create mode 100644 ui/js/novnc/input.js
create mode 100755 ui/js/novnc/jsunzip.js
create mode 100644 ui/js/novnc/main.js
create mode 100644 ui/js/novnc/rfb.js
create mode 100644 ui/js/novnc/util.js
create mode 100644 ui/js/novnc/web-socket-js/Makefile.am
create mode 100644 ui/js/novnc/web-socket-js/README.txt
create mode 100644 ui/js/novnc/web-socket-js/WebSocketMain.swf
create mode 100644 ui/js/novnc/web-socket-js/swfobject.js
create mode 100644 ui/js/novnc/web-socket-js/web_socket.js
create mode 100644 ui/js/novnc/websock.js
create mode 100644 ui/js/novnc/webutil.js
delete mode 100644 ui/novnc/Makefile.am
delete mode 100644 ui/novnc/css/Makefile.am
delete mode 100644 ui/novnc/css/Orbitron700.ttf
delete mode 100644 ui/novnc/css/Orbitron700.woff
delete mode 100644 ui/novnc/css/base.css
delete mode 100644 ui/novnc/js/Makefile.am
delete mode 100644 ui/novnc/js/base64.js
delete mode 100644 ui/novnc/js/des.js
delete mode 100644 ui/novnc/js/display.js
delete mode 100644 ui/novnc/js/input.js
delete mode 100755 ui/novnc/js/jsunzip.js
delete mode 100644 ui/novnc/js/main.js
delete mode 100644 ui/novnc/js/rfb.js
delete mode 100644 ui/novnc/js/util.js
delete mode 100644 ui/novnc/js/web-socket-js/Makefile.am
delete mode 100644 ui/novnc/js/web-socket-js/README.txt
delete mode 100644 ui/novnc/js/web-socket-js/WebSocketMain.swf
delete mode 100644 ui/novnc/js/web-socket-js/swfobject.js
delete mode 100644 ui/novnc/js/web-socket-js/web_socket.js
delete mode 100644 ui/novnc/js/websock.js
delete mode 100644 ui/novnc/js/webutil.js
delete mode 100644 ui/novnc/vnc.html
create mode 100644 ui/pages/vnc_auto.html.tmpl
create mode 100644 ui/pages/websockify/Makefile.am
create mode 100644 ui/pages/websockify/console.html
--
1.7.10.4
10 years, 7 months
[PATCH V3 0/4] vmiface update support
by shaohef＠linux.vnet.ibm.com
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
V2 -> V3
just support to change persistent network configure.
V1 -> V2
add test case for running VM
We allow user change the interface from one network to another network
when VM is alive.
But we only support change the vm configure no matter vm is alive or not.
ShaoHe Feng (4):
vmiface update support: update API.md
vmiface update support: update model.
vmiface update support: update mockmodel
vmiface update support: update test case
docs/API.md | 8 ++++++++
src/kimchi/API.json | 17 +++++++++++++++++
src/kimchi/control/vm/ifaces.py | 1 +
src/kimchi/i18n.py | 1 +
src/kimchi/mockmodel.py | 12 ++++++++++++
src/kimchi/model/vmifaces.py | 21 +++++++++++++++++++++
tests/test_model.py | 10 ++++++++++
tests/test_rest.py | 8 ++++++++
8 files changed, 78 insertions(+)
--
1.9.0
10 years, 7 months
Rethink the Relationship of Template and VM
by Zhou Zheng Sheng
Hi all,
I'm working on host device passthrough. A a problem troubles me: I see
in current Kimchi code, when adding a specific SCSI or iSCSI LUN, it is
added to the template but not the VM. This is counter-intuitive, because
a template is to store the common information for lots of VMs, while a
specific LUN should only be used by just one VM. It's OK for DIR, NFS
and Logical storage pool being managed by the template, because actually
the template allocates a new specific volume for a new VM, so the
specific volume goes with the specific VM but not the template. Since we
don't define a specific DIR storage volume in the template, why we
define a concrete LUN in it?
The first problem in the current design is that we can not attach a new
LUN to a VM after the VM is created.
Another problem is that we mix the "things in common" and "things
special" in template, thus we make its responsibility complex. Static
and dynamic validations are also mixed in template.
The third problem is that if we get 10 LUNs for 10 VMs, the user has to
create 10 templates at first, then create 10 VMs from the 10 templates
respectively. It's a bit tedious.
The fourth problem is that if a LUN is used by a VM, usually it should
not be used by other VMs, so it implies that by specifying a LUN in a
template, the template should only create just one VM. What's the point
to make a template that only produces one VM?
It seems a cleaner way is putting SCSI LUN handling code in VM. Firstly,
we can assign a SCSI/iSCSI storage pool to the template. When it's time
to create a VM from the template, Kimchi lists all the available LUNs in
the storage pool and the user can just pick some LUNs. The VM override
parameters are suitable to store the LUNs information. It also makes
possible to implement some mechanisms to add/remove LUNs after a VM is
created, which is a very typical user requirement.
The same problem exists in host device passthrough. For a specific
device, it should be passthrough to a specific VM but not a template.
I'd like to collect some thoughts before my device passthrough patch V2.
In which place you'd suggest me to put device passthrough information,
template or VM?
Thanks for sharing your ideas!
--
Thanks and best regards!
Zhou Zheng Sheng / 周征晟
E-mail: zhshzhou(a)linux.vnet.ibm.com
Telephone: 86-10-82454397
10 years, 7 months
[PATCHv4 0/3] UI: manage guest disks
by lvroyce＠linux.vnet.ibm.com
From: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
v1>v3,
Adjust html format(Aline's comments)
Fix disk view display,
Fix align problem in select menu(hongliang's comments)
Fill default value in pool and volume box(hongliang's comments)
v3>v4,
Backend changed param from path to pool/vol,
UI change with backend.
handle option with no value.(hongliang's comments)
Royce Lv (3):
Fix select menu data append
UI: Support add guest disk
Display all disk types in storage edit view
ui/css/theme-default/guest-storage-add.css | 16 ++++
ui/js/src/kimchi.guest_edit_main.js | 5 +-
ui/js/src/kimchi.guest_storage_add.main.js | 137 ++++++++++++++++++++++++-----
ui/js/widgets/select-menu.js | 4 +-
ui/pages/guest-edit.html.tmpl | 17 +++-
ui/pages/guest-storage-add.html.tmpl | 62 +++++++++++--
6 files changed, 208 insertions(+), 33 deletions(-)
--
1.8.3.2
10 years, 7 months
[PATCHv4 0/7] Support guest disk management
by lvroyce＠linux.vnet.ibm.com
From: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
Note:
This patchset depends on
[PATCH V9 7/7] write the template OS info to vm metadata.
v3>v4,
Rebase on shaohe's new metadata patchset.
v1>v3,
Choose bus type according to os info in metadata.
When adding a disk, specify a pool and vol name,
so that kimchi can chek ref_cnt to make sure no others
using that volume,
also volume format is filled to driver so that qcow2 image
will not recognized as raw.
Tested:
1. when no bus is specified,
kimchi chose 'ide' for cdrom and 'virtio' for disk
2. when bus is specified,
kimchi attach disk with specified bus.
3. ide does not support hot plug.
4. Disk size for qcow2 and raw is right.
Royce Lv (7):
Guest disks: Update doc to support manage guest disks
Guest disks: Update api definition and error reporting
Guest disks: Choose proper bus for device
Guest disks: Abstract vm disk functions
Guest disk: deals with disk attachment
Multiple pep8 fixes
Guest disks: Update testcase
docs/API.md | 12 ++--
src/kimchi/API.json | 37 +++++++---
src/kimchi/i18n.py | 28 ++++----
src/kimchi/mockmodel.py | 18 ++---
src/kimchi/model/storagevolumes.py | 9 +--
src/kimchi/model/vmstorages.py | 138 ++++++++++++++++++-------------------
src/kimchi/vmdisks.py | 58 ++++++++++++++++
tests/test_model.py | 75 ++++++++++++++++++++
8 files changed, 265 insertions(+), 110 deletions(-)
create mode 100644 src/kimchi/vmdisks.py
--
1.8.3.2
10 years, 7 months
[PATCH] Return info from run_command on exception.
by Christy Perez
As a follow-up from the discussion here:
http://lists.ovirt.org/pipermail/kimchi-devel/2014-April/004600.html
run_command needs to be updated to return some indication
to the caller that a command did not complete. Currently,
if there is an exception (e.g. the command does not exist),
None is returned for the output, the error output, and
the return code.
msg is already created, but only printed to the log/console,
so return that as the error message. Return -1 for the rc, which
could be, depending on the command passed, an ignorable error
code. Having some indication of a problem is better than None,
though.
Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com>
---
src/kimchi/utils.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/kimchi/utils.py b/src/kimchi/utils.py
index a30dcfe..97adbf8 100644
--- a/src/kimchi/utils.py
+++ b/src/kimchi/utils.py
@@ -199,7 +199,7 @@ def run_command(cmd, timeout=None):
if proc:
return out, error, proc.returncode
else:
- return None, None, None
+ return None, msg, -1
finally:
if timer and not timeout_flag[0]:
timer.cancel()
--
1.9.0
10 years, 7 months
[PATCH 0/6] Enable Kimchi authentication in console pages
by Aline Manera
From: Aline Manera <alinefm(a)br.ibm.com>
As I commented in mailing list ([v3] Enable encryption in vm VNC console connection)
to enable Kimchi authentication in console pages those need to be provided by
Kimchi server instead of websockify web server.
I reverted the "Enable encryption in vm VNC console connection" commit, applied
"[PATCH v2] Enable encryption in vm console connection" path send by Mark and
make the changes needed to redirect user from websockify web server to Kimchi.
So noVNC page continues to be rendered by Kimchi.
With all that done, I was able to enable authentication to vnc_auto.html and
spice.html
Aline Manera (5):
Revert "Enable encryption in vm VNC console connection"
Make use of the mini Web server in the websockify
Enable Kimchi authentication in console pages
backend: Redirect 401 error to default page
UI: Redirect user to console page after logging
Mark Wu (1):
Enable encryption in vm console connection
configure.ac | 9 +-
contrib/kimchi.spec.fedora.in | 14 +-
contrib/kimchi.spec.suse.in | 14 +-
src/kimchi/config.py.in | 32 +-
src/kimchi/vnc.py | 2 +-
src/nginx.conf.in | 15 +
tests/test_config.py.in | 32 +-
ui/Makefile.am | 2 +-
ui/css/Makefile.am | 2 +-
ui/css/fonts/Makefile.am | 2 +
ui/css/fonts/novnc/Makefile.am | 20 +
ui/css/fonts/novnc/Orbitron700.ttf | Bin 0 -> 38580 bytes
ui/css/fonts/novnc/Orbitron700.woff | Bin 0 -> 17472 bytes
ui/css/novnc/Makefile.am | 20 +
ui/css/novnc/base.css | 405 ++++++
ui/js/Makefile.am | 2 +-
ui/js/novnc/Makefile.am | 22 +
ui/js/novnc/base64.js | 115 ++
ui/js/novnc/des.js | 273 ++++
ui/js/novnc/display.js | 770 +++++++++++
ui/js/novnc/input.js | 1946 +++++++++++++++++++++++++++
ui/js/novnc/jsunzip.js | 676 ++++++++++
ui/js/novnc/main.js | 103 ++
ui/js/novnc/rfb.js | 1866 +++++++++++++++++++++++++
ui/js/novnc/util.js | 381 ++++++
ui/js/novnc/web-socket-js/Makefile.am | 24 +
ui/js/novnc/web-socket-js/README.txt | 109 ++
ui/js/novnc/web-socket-js/WebSocketMain.swf | Bin 0 -> 177114 bytes
ui/js/novnc/web-socket-js/swfobject.js | 4 +
ui/js/novnc/web-socket-js/web_socket.js | 391 ++++++
ui/js/novnc/websock.js | 422 ++++++
ui/js/novnc/webutil.js | 216 +++
ui/js/src/kimchi.api.js | 7 +-
ui/js/src/kimchi.login_window.js | 24 +-
ui/novnc/Makefile.am | 22 -
ui/novnc/css/Makefile.am | 20 -
ui/novnc/css/Orbitron700.ttf | Bin 38580 -> 0 bytes
ui/novnc/css/Orbitron700.woff | Bin 17472 -> 0 bytes
ui/novnc/css/base.css | 405 ------
ui/novnc/js/Makefile.am | 22 -
ui/novnc/js/base64.js | 115 --
ui/novnc/js/des.js | 273 ----
ui/novnc/js/display.js | 770 -----------
ui/novnc/js/input.js | 1946 ---------------------------
ui/novnc/js/jsunzip.js | 676 ----------
ui/novnc/js/main.js | 103 --
ui/novnc/js/rfb.js | 1866 -------------------------
ui/novnc/js/util.js | 381 ------
ui/novnc/js/web-socket-js/Makefile.am | 24 -
ui/novnc/js/web-socket-js/README.txt | 109 --
ui/novnc/js/web-socket-js/WebSocketMain.swf | Bin 177114 -> 0 bytes
ui/novnc/js/web-socket-js/swfobject.js | 4 -
ui/novnc/js/web-socket-js/web_socket.js | 391 ------
ui/novnc/js/websock.js | 422 ------
ui/novnc/js/webutil.js | 216 ---
ui/novnc/vnc.html | 43 -
ui/pages/Makefile.am | 2 +-
ui/pages/novnc/Makefile.am | 20 +
ui/pages/novnc/vnc_auto.html | 22 +
ui/pages/vnc_auto.html.tmpl | 44 +
60 files changed, 7955 insertions(+), 7861 deletions(-)
create mode 100644 ui/css/fonts/novnc/Makefile.am
create mode 100644 ui/css/fonts/novnc/Orbitron700.ttf
create mode 100644 ui/css/fonts/novnc/Orbitron700.woff
create mode 100644 ui/css/novnc/Makefile.am
create mode 100644 ui/css/novnc/base.css
create mode 100644 ui/js/novnc/Makefile.am
create mode 100644 ui/js/novnc/base64.js
create mode 100644 ui/js/novnc/des.js
create mode 100644 ui/js/novnc/display.js
create mode 100644 ui/js/novnc/input.js
create mode 100755 ui/js/novnc/jsunzip.js
create mode 100644 ui/js/novnc/main.js
create mode 100644 ui/js/novnc/rfb.js
create mode 100644 ui/js/novnc/util.js
create mode 100644 ui/js/novnc/web-socket-js/Makefile.am
create mode 100644 ui/js/novnc/web-socket-js/README.txt
create mode 100644 ui/js/novnc/web-socket-js/WebSocketMain.swf
create mode 100644 ui/js/novnc/web-socket-js/swfobject.js
create mode 100644 ui/js/novnc/web-socket-js/web_socket.js
create mode 100644 ui/js/novnc/websock.js
create mode 100644 ui/js/novnc/webutil.js
delete mode 100644 ui/novnc/Makefile.am
delete mode 100644 ui/novnc/css/Makefile.am
delete mode 100644 ui/novnc/css/Orbitron700.ttf
delete mode 100644 ui/novnc/css/Orbitron700.woff
delete mode 100644 ui/novnc/css/base.css
delete mode 100644 ui/novnc/js/Makefile.am
delete mode 100644 ui/novnc/js/base64.js
delete mode 100644 ui/novnc/js/des.js
delete mode 100644 ui/novnc/js/display.js
delete mode 100644 ui/novnc/js/input.js
delete mode 100755 ui/novnc/js/jsunzip.js
delete mode 100644 ui/novnc/js/main.js
delete mode 100644 ui/novnc/js/rfb.js
delete mode 100644 ui/novnc/js/util.js
delete mode 100644 ui/novnc/js/web-socket-js/Makefile.am
delete mode 100644 ui/novnc/js/web-socket-js/README.txt
delete mode 100644 ui/novnc/js/web-socket-js/WebSocketMain.swf
delete mode 100644 ui/novnc/js/web-socket-js/swfobject.js
delete mode 100644 ui/novnc/js/web-socket-js/web_socket.js
delete mode 100644 ui/novnc/js/websock.js
delete mode 100644 ui/novnc/js/webutil.js
delete mode 100644 ui/novnc/vnc.html
create mode 100644 ui/pages/novnc/Makefile.am
create mode 100644 ui/pages/novnc/vnc_auto.html
create mode 100644 ui/pages/vnc_auto.html.tmpl
--
1.7.10.4
10 years, 7 months
