[PATCH] [Wok] Added new Wok logo and script to display installed plugins icons
by sguimaraes943＠gmail.com
From: Samuel Guimarães <sguimaraes943(a)gmail.com>
This patch replaces the old Kimchi logo in Wok with the new Wok logo, following other image assets like iOS, Android and Windows 8/8.1/10 application bookmark icons and Safari pinnable bookmark/panel icon.
It also comes with a new script that checks the installed plugins as well as their versions and if a *.svg or *.png file with the plugin name in ui/images/ is found, the script will append a list with the logos in the desired element.
Samuel Guimarães (1):
Added new Wok logo and script to display installed plugins icons and
versions
ui/css/bootstrap.custom.css | 2 +-
ui/css/src/modules/_about.scss | 41 +++++++-
ui/css/src/modules/_animation.scss | 18 +++-
ui/css/src/modules/_login.scss | 48 +++++++++
ui/css/src/modules/_navbar-flat.scss | 2 +-
ui/css/src/modules/_wok-variables.scss | 2 +-
ui/css/src/wok.scss | 58 +++++++++++
ui/css/wok.css | 161 ++++++++++++++++++++++++++++-
ui/images/Makefile.am | 2 +-
ui/images/android-chrome-144x144.png | Bin 0 -> 742 bytes
ui/images/android-chrome-192x192.png | Bin 3508 -> 851 bytes
ui/images/android-chrome-36x36.png | Bin 0 -> 391 bytes
ui/images/android-chrome-48x48.png | Bin 0 -> 443 bytes
ui/images/android-chrome-72x72.png | Bin 0 -> 538 bytes
ui/images/android-chrome-96x96.png | Bin 0 -> 585 bytes
ui/images/apple-touch-icon-114.png | Bin 2360 -> 0 bytes
ui/images/apple-touch-icon-114x114.png | Bin 0 -> 561 bytes
ui/images/apple-touch-icon-120.png | Bin 2382 -> 0 bytes
ui/images/apple-touch-icon-120x120.png | Bin 0 -> 600 bytes
ui/images/apple-touch-icon-144.png | Bin 2758 -> 0 bytes
ui/images/apple-touch-icon-144x144.png | Bin 0 -> 674 bytes
ui/images/apple-touch-icon-152.png | Bin 2962 -> 0 bytes
ui/images/apple-touch-icon-152x152.png | Bin 0 -> 757 bytes
ui/images/apple-touch-icon-180.png | Bin 3404 -> 0 bytes
ui/images/apple-touch-icon-180x180.png | Bin 0 -> 786 bytes
ui/images/apple-touch-icon-57.png | Bin 1449 -> 0 bytes
ui/images/apple-touch-icon-57x57.png | Bin 0 -> 469 bytes
ui/images/apple-touch-icon-60.png | Bin 1476 -> 0 bytes
ui/images/apple-touch-icon-60x60.png | Bin 0 -> 462 bytes
ui/images/apple-touch-icon-72.png | Bin 1718 -> 0 bytes
ui/images/apple-touch-icon-72x72.png | Bin 0 -> 516 bytes
ui/images/apple-touch-icon-76.png | Bin 1734 -> 0 bytes
ui/images/apple-touch-icon-76x76.png | Bin 0 -> 532 bytes
ui/images/apple-touch-icon-precomposed.png | Bin 3673 -> 1139 bytes
ui/images/apple-touch-icon.png | Bin 3404 -> 786 bytes
ui/images/favicon-16x16.png | Bin 0 -> 622 bytes
ui/images/favicon-194x194.png | Bin 0 -> 1868 bytes
ui/images/favicon-32x32.png | Bin 0 -> 755 bytes
ui/images/favicon-96x96.png | Bin 0 -> 1248 bytes
ui/images/favicon.ico | Bin 15086 -> 15086 bytes
ui/images/favicon.png | Bin 17356 -> 1868 bytes
ui/images/large.png | Bin 36434 -> 0 bytes
ui/images/mstile-144x144.png | Bin 0 -> 712 bytes
ui/images/mstile-150x150.png | Bin 0 -> 705 bytes
ui/images/mstile-310x150.png | Bin 0 -> 729 bytes
ui/images/mstile-310x310.png | Bin 0 -> 1067 bytes
ui/images/mstile-70x70.png | Bin 0 -> 601 bytes
ui/images/safari-pinned-tab.svg | 19 ++++
ui/images/square.png | Bin 15679 -> 0 bytes
ui/images/theme-default/logo-white.png | Bin 7583 -> 3229 bytes
ui/images/tiny.png | Bin 6539 -> 0 bytes
ui/images/wide.png | Bin 44544 -> 0 bytes
ui/images/wok-logo.png | Bin 0 -> 3229 bytes
ui/images/wok.png | Bin 0 -> 3327 bytes
ui/images/wok.svg | 45 ++++++++
ui/js/src/wok.login.js | 2 +
ui/js/src/wok.logos.js | 102 ++++++++++++++++++
ui/js/src/wok.main.js | 2 +
ui/pages/login.html.tmpl | 120 +++++++++++----------
ui/pages/wok-ui.html.tmpl | 67 ++++++++----
60 files changed, 602 insertions(+), 89 deletions(-)
create mode 100644 ui/images/android-chrome-144x144.png
create mode 100644 ui/images/android-chrome-36x36.png
create mode 100644 ui/images/android-chrome-48x48.png
create mode 100644 ui/images/android-chrome-72x72.png
create mode 100644 ui/images/android-chrome-96x96.png
delete mode 100644 ui/images/apple-touch-icon-114.png
create mode 100644 ui/images/apple-touch-icon-114x114.png
delete mode 100644 ui/images/apple-touch-icon-120.png
create mode 100644 ui/images/apple-touch-icon-120x120.png
delete mode 100644 ui/images/apple-touch-icon-144.png
create mode 100644 ui/images/apple-touch-icon-144x144.png
delete mode 100644 ui/images/apple-touch-icon-152.png
create mode 100644 ui/images/apple-touch-icon-152x152.png
delete mode 100644 ui/images/apple-touch-icon-180.png
create mode 100644 ui/images/apple-touch-icon-180x180.png
delete mode 100644 ui/images/apple-touch-icon-57.png
create mode 100644 ui/images/apple-touch-icon-57x57.png
delete mode 100644 ui/images/apple-touch-icon-60.png
create mode 100644 ui/images/apple-touch-icon-60x60.png
delete mode 100644 ui/images/apple-touch-icon-72.png
create mode 100644 ui/images/apple-touch-icon-72x72.png
delete mode 100644 ui/images/apple-touch-icon-76.png
create mode 100644 ui/images/apple-touch-icon-76x76.png
create mode 100644 ui/images/favicon-16x16.png
create mode 100644 ui/images/favicon-194x194.png
create mode 100644 ui/images/favicon-32x32.png
create mode 100644 ui/images/favicon-96x96.png
delete mode 100644 ui/images/large.png
create mode 100644 ui/images/mstile-144x144.png
create mode 100644 ui/images/mstile-150x150.png
create mode 100644 ui/images/mstile-310x150.png
create mode 100644 ui/images/mstile-310x310.png
create mode 100644 ui/images/mstile-70x70.png
create mode 100644 ui/images/safari-pinned-tab.svg
delete mode 100644 ui/images/square.png
delete mode 100644 ui/images/tiny.png
delete mode 100644 ui/images/wide.png
create mode 100644 ui/images/wok-logo.png
create mode 100644 ui/images/wok.png
create mode 100644 ui/images/wok.svg
create mode 100644 ui/js/src/wok.logos.js
--
1.9.3
8 years, 9 months
[RFC] Memory HotPlug changes to fix issues
by Rodrigo Trujillo
Hi all,
with latest changes in Kimchi backend/frontend (enable Memory
hotplug[UI] and support to update MaxMemory) I am facing
a new issue related to maxMemory:
How is done today:
- whenever a user adds memory when guest is running, Kimchi is going to
add enough 1GiB Memory Device to guest XML;
- when user changes the Memory in a offline guest, Kimchi is going to
change the value in "NUMA -> Memory" tag, which becomes
"currentMemory" tag
- the value in "NUMA -> Memory" plus the sum of 1GiB Memory Devices
(DIMM) added , become the "memory" tag
Problem:
- the memory devices added are persistent, once added user will never be
able to remove them, except editing the guest XML;
- libvirt does not provide memory hot-unplug;
- so, when user turns off the guest that has memory devices and try to
increase or decrease the amount of memory,
the new value is going to be be sum with memory devices amount,
causing most of the time to errors with value of "maxMemory" configured.
Example1:
- Guest has configured 4GB maxMemory, 2GB currentMemory|Numa->memory ,
0 Memory Devices, 2GB memory
- Run guest and add 2GB -> 4GB maxMemory, 2GB
currentMemory|Numa->memory, 2x1GB Memory Devices, 4GB memory
- Stop guest and edit it. The memory field is going to show 4GB
- Change memory fileld to 3GB (decrease) -> 4GB maxMemory, 3GB
currentMemory|Numa->memory, 2x1GB Memory Devices, 5GB memory
Notice the error: memory > maxMemory
Example2:
- Guest has configured 4GB maxMemory, 1GB currentMemory|Numa->memory ,
0 Memory Devices, 1GB memory
- Run guest and add 2GB -> 4GB maxMemory, 1GB
currentMemory|Numa->memory, 2x1GB Memory Devices, 3GB memory
- Stop guest and edit it. The memory field is going to show 3GB
- Change memory field to 4GB (increase) -> 4GB maxMemory, 4GB
currentMemory|Numa->memory, 2x1GB Memory Devices, 6GB memory
Notice the error: memory > maxMemory
------
Possible Solution 1:
- Make memory devices NOT persistent. Then when guest is turn off,
memory back to lower values configured before the memory hotplug action;
Possible Solution 2:
- Change memory update function to check if there are memory devices
configured and adjust the number of devices according to the new value
passed.
Ex.:
- Stopped guest has: 6GB maxMemory, 2GB currentMemory|Numa->memory,
2x1GB Memory Devices, 4GB memory
- Change memory field to 3GB (decrease) -> 4GB maxMemory, 2GB
currentMemory|Numa->memory, 1x1GB Memory Devices, 3GB memory
Notice: memory device was removed instead of change the currentMemory
Solution 1 is simpler and quicker to implement.
Solution 2 seems to be the best, but will demand more time to code and
specially test.
What you think ?
Rodrigo Trujillo
8 years, 9 months
[PATCH] [Kimchi 0/2] Add release number to Kimchi version
by Aline Manera
Aline Manera (2):
Add release number to Kimchi version
Update pkg-version script to work with submodules
build-aux/pkg-version | 2 +-
config.py.in | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
--
2.5.0
8 years, 9 months
[PATCH v2][Kimchi 0/4] Support to edit max memory
by Rodrigo Trujillo
V2:
- Includes fixes from reviews;
- New validate_memory function to be used in Templates and Guests
creation/update processes;
- Adds new function to update objectstore, to update 'memory'
from old to new schema.
V1:
This patchset implements the support in backend to allow user to
change maxMemory xml tag.
It also changes the memory API from 'memory: XXX' to
'memory': {'current': XXX, 'maxmemory': YYY}
maxMemory xml tag is not created by default anymore, when a guest is
created. Tag will be created only when the user changes maxmemory
manually, and if the value is different (higher) of 'current' memory.
So in order to performe memory hotplug, an user has to stop guest,
modify maxmemory and then start the guest.
Tests were fixed and new ones were included.
Rodrigo Trujillo (4):
Add support to edit max memory in Templates
Add function to update 'memory' in objectstore
Add support to edit max memory in Guest
Changes and add tests to support new memory API (templates/guest)
API.json | 41 ++++----
docs/API.md | 29 ++++--
i18n.py | 12 ++-
model/templates.py | 64 +++++++++++-
model/vms.py | 245 ++++++++++++++++++++++++--------------------
osinfo.py | 16 ++-
root.py | 4 +
template.conf | 10 +-
tests/test_livemigration.py | 6 +-
tests/test_model.py | 22 ++--
tests/test_rest.py | 23 ++++-
tests/test_template.py | 38 +++++--
tests/test_vmtemplate.py | 26 +++--
utils.py | 46 +++++++++
vmtemplate.py | 75 ++++++--------
15 files changed, 428 insertions(+), 229 deletions(-)
--
2.1.0
8 years, 9 months
[PATCH] [Kimchi] Adding maxmemory for guest and templates
by peterpnns＠gmail.com
From: peterpennings <peterpnns(a)gmail.com>
Adding maxmemory for guest and templates
Samuel Guimarães (1):
Adding maxmemory for guest and templates
ui/css/kimchi.css | 20 +++++++-------------
ui/css/src/modules/_edit-guests.scss | 5 +----
ui/js/src/kimchi.guest_edit_main.js | 18 ++++++++++++++++++
ui/js/src/kimchi.template_edit_main.js | 24 ++++++++++++++++++++++--
ui/pages/guest-edit.html.tmpl | 9 ++++++++-
ui/pages/tabs/templates.html.tmpl | 2 +-
ui/pages/template-edit.html.tmpl | 9 ++++++++-
7 files changed, 65 insertions(+), 22 deletions(-)
--
2.5.0
8 years, 9 months
[PATCH] [Wok 0/4] Implement User Request Logger
by Lucio Correia
User request logs are saved by default at log/wok-req.log. The maximum file
size is 3 MB and there is rotation with log/wok-req.log.1, which means it will
spend at most 6 MB of disk space.
The log format is JSON, since the web user interface will provide a log utility
to easily search and filter log results. Sample contents of log/wok-req.log:
{"date": "2016-02-23", "app": "gingerbase", "req": "DELETE", "user": "lucio", "time": "15:08:02"} >>> Delete host debug report 'test1'
{"date": "2016-02-23", "app": "gingerbase", "req": "POST", "user": "lucio", "time": "15:41:07"} >>> Enable host software repository 'rhel7.2'
{"date": "2016-02-23", "app": "gingerbase", "req": "POST", "user": "lucio", "time": "15:42:07"} >>> Disable host software repository 'rhel7.2'
There will be a download function for search results, which will generate a
more log-like text file based on the search results.
Request log results can be searched using the following parameters:
* app: filter by application that received the request (wok, kimchi, etc.)
* user: filter by user that performed the request
* req: filter by request type: POST, DELETE, PUT. GET requests are not logged.
* date: filter by request date in format YYYY-MM-DD
Sample search on user request log using parameters user and app:
curl -u lucio -H "Content-Type: application/json" -H "Accept: application/json" "http://localhost:8010/logs?app=wok&user=root" -X GET -d '{}'
Lucio Correia (4):
Add User Request Logger
Log user requests
Implement User Request Logger API
Fix tests
docs/API/logs.md | 21 ++++++++++
src/wok/control/base.py | 80 ++++++++++++++++++++++++++++++++++---
src/wok/control/logs.py | 43 ++++++++++++++++++++
src/wok/model/logs.py | 31 +++++++++++++++
src/wok/reqlogger.py | 103 ++++++++++++++++++++++++++++++++++++++++++++++++
src/wok/server.py | 10 +++++
src/wok/utils.py | 12 ++++++
src/wokd.in | 4 ++
tests/utils.py | 1 +
9 files changed, 299 insertions(+), 6 deletions(-)
create mode 100644 docs/API/logs.md
create mode 100644 src/wok/control/logs.py
create mode 100644 src/wok/model/logs.py
create mode 100644 src/wok/reqlogger.py
--
1.9.1
8 years, 9 months
[PATCH] [Kimchi 0/2] Verify IBM copyright on make check-local
by Aline Manera
Aline Manera (2):
Verify IBM copyright on make check-local
Update copyright according to make check-local result
IBM-license-blacklist | 37 +++++++++++++++++++++++++
Makefile.am | 2 ++
__init__.py | 2 +-
autogen.sh | 18 ++++++++++++
check_ui_code_errors.sh | 2 +-
config.py.in | 2 +-
contrib/DEBIAN/Makefile.am | 2 +-
contrib/check_i18n.py | 2 +-
contrib/make-deb.sh.in | 18 ++++++++++++
control/Makefile.am | 2 +-
control/__init__.py | 2 +-
control/config.py | 2 +-
control/cpuinfo.py | 2 +-
control/groups.py | 2 +-
control/host.py | 2 +-
control/interfaces.py | 2 +-
control/networks.py | 2 +-
control/peers.py | 2 +-
control/storagepools.py | 2 +-
control/storageservers.py | 2 +-
control/storagevolumes.py | 2 +-
control/templates.py | 2 +-
control/users.py | 2 +-
control/vm/Makefile.am | 2 +-
control/vm/__init__.py | 2 +-
control/vm/hostdevs.py | 2 +-
control/vm/ifaces.py | 2 +-
control/vm/snapshots.py | 2 +-
control/vm/storages.py | 2 +-
control/vms.py | 2 +-
disks.py | 2 +-
distroloader.py | 2 +-
distros.d/Makefile.am | 2 +-
i18n.py | 2 +-
imageinfo.py | 2 +-
iscsi.py | 2 +-
isoinfo.py | 2 +-
kvmusertests.py | 2 +-
mockmodel.py | 2 +-
model/Makefile.am | 2 +-
model/__init__.py | 2 +-
model/config.py | 2 +-
model/cpuinfo.py | 2 +-
model/diskutils.py | 2 +-
model/featuretests.py | 2 +-
model/groups.py | 2 +-
model/host.py | 2 +-
model/hostdev.py | 2 +-
model/interfaces.py | 2 +-
model/libvirtconnection.py | 2 +-
model/libvirtstoragepool.py | 2 +-
model/model.py | 2 +-
model/networks.py | 2 +-
model/peers.py | 2 +-
model/storagepools.py | 2 +-
model/storageservers.py | 2 +-
model/storagetargets.py | 2 +-
model/storagevolumes.py | 2 +-
model/templates.py | 2 +-
model/users.py | 2 +-
model/utils.py | 2 +-
model/vmhostdevs.py | 2 +-
model/vmifaces.py | 2 +-
model/vms.py | 2 +-
model/vmsnapshots.py | 2 +-
model/vmstorages.py | 2 +-
netinfo.py | 2 +-
network.py | 2 +-
osinfo.py | 2 +-
po/de_DE.po | 4 +--
po/en_US.po | 2 +-
po/es_ES.po | 4 +--
po/fr_FR.po | 4 +--
po/gen-pot.in | 18 ++++++++++++
po/it_IT.po | 4 +--
po/ja_JP.po | 4 +--
po/ko_KR.po | 4 +--
po/pt_BR.po | 4 +--
po/ru_RU.po | 4 +--
po/zh_CN.po | 4 +--
po/zh_TW.po | 4 +--
root.py | 2 +-
scan.py | 2 +-
screenshot.py | 2 +-
serialconsole.py | 2 +-
tests/Makefile.am | 2 +-
tests/iso_gen.py | 2 +-
tests/run_tests.sh.in | 2 +-
tests/test_authorization.py | 2 +-
tests/test_config.py.in | 2 +-
tests/test_host.py | 2 +-
tests/test_livemigration.py | 2 +-
tests/test_mock_storagepool.py | 2 +-
tests/test_mock_storagevolume.py | 2 +-
tests/test_mockmodel.py | 2 +-
tests/test_model.py | 2 +-
tests/test_model_storagepool.py | 2 +-
tests/test_model_storagevolume.py | 2 +-
tests/test_osinfo.py | 2 +-
tests/test_rest.py | 2 +-
tests/test_storagepoolxml.py | 2 +-
tests/test_vmtemplate.py | 2 +-
ui/Makefile.am | 2 +-
ui/config/Makefile.am | 2 +-
ui/css/Makefile.am | 2 +-
ui/css/kimchi.css | 2 +-
ui/css/src/kimchi.scss | 2 +-
ui/css/src/modules/_edit-guests.scss | 2 +-
ui/css/src/modules/_guests.scss | 2 +-
ui/css/src/modules/_iso-list.scss | 2 +-
ui/css/src/modules/_network.scss | 2 +-
ui/css/src/modules/_storage.scss | 2 +-
ui/css/src/modules/_templates.scss | 2 +-
ui/images/Makefile.am | 2 +-
ui/js/Makefile.am | 2 +-
ui/js/src/kimchi.api.js | 2 +-
ui/js/src/kimchi.guest_add_main.js | 2 +-
ui/js/src/kimchi.guest_edit_main.js | 2 +-
ui/js/src/kimchi.guest_livemigration.js | 2 +-
ui/js/src/kimchi.guest_main.js | 2 +-
ui/js/src/kimchi.guest_media_main.js | 2 +-
ui/js/src/kimchi.guest_storage_add.main.js | 2 +-
ui/js/src/kimchi.main.js | 2 +-
ui/js/src/kimchi.network_add_main.js | 2 +-
ui/js/src/kimchi.storage_main.js | 2 +-
ui/js/src/kimchi.storagepool_add_main.js | 2 +-
ui/js/src/kimchi.storagepool_add_volume_main.js | 2 +-
ui/js/src/kimchi.template_add_main.js | 2 +-
ui/js/src/kimchi.template_edit_main.js | 2 +-
ui/js/src/kimchi.template_main.js | 2 +-
ui/pages/Makefile.am | 2 +-
ui/pages/guest-add.html.tmpl | 2 +-
ui/pages/guest-edit.html.tmpl | 2 +-
ui/pages/guest-migration.html.tmpl | 2 +-
ui/pages/guest-storage-add.html.tmpl | 2 +-
ui/pages/guest.html.tmpl | 2 +-
ui/pages/help/Makefile.am | 2 +-
ui/pages/help/de_DE/Makefile.am | 2 +-
ui/pages/help/en_US/Makefile.am | 2 +-
ui/pages/help/es_ES/Makefile.am | 2 +-
ui/pages/help/fr_FR/Makefile.am | 2 +-
ui/pages/help/it_IT/Makefile.am | 2 +-
ui/pages/help/ja_JP/Makefile.am | 2 +-
ui/pages/help/kimchi.css | 2 +-
ui/pages/help/ko_KR/Makefile.am | 2 +-
ui/pages/help/pt_BR/Makefile.am | 2 +-
ui/pages/help/ru_RU/Makefile.am | 2 +-
ui/pages/help/zh_CN/Makefile.am | 2 +-
ui/pages/help/zh_TW/Makefile.am | 2 +-
ui/pages/i18n.json.tmpl | 2 +-
ui/pages/network-add.html.tmpl | 2 +-
ui/pages/storagepool-add-volume.html.tmpl | 2 +-
ui/pages/storagepool-add.html.tmpl | 2 +-
ui/pages/tabs/Makefile.am | 2 +-
ui/pages/tabs/guests.html.tmpl | 2 +-
ui/pages/tabs/network.html.tmpl | 2 +-
ui/pages/tabs/storage.html.tmpl | 2 +-
ui/pages/tabs/templates.html.tmpl | 2 +-
ui/pages/template-add.html.tmpl | 2 +-
ui/pages/template-edit.html.tmpl | 2 +-
ui/serial/html/serial.html | 2 +-
ui/spice-html5/Makefile.am | 2 +-
ui/spice-html5/css/Makefile.am | 2 +-
ui/spice-html5/pages/Makefile.am | 2 +-
ui/spice-html5/thirdparty/Makefile.am | 2 +-
utils.py | 2 +-
vmtemplate.py | 2 +-
websocket.py | 2 +-
xmlutils/Makefile.am | 2 +-
xmlutils/__init__.py | 2 +-
xmlutils/cpu.py | 2 +-
xmlutils/disk.py | 2 +-
xmlutils/graphics.py | 2 +-
xmlutils/interface.py | 2 +-
xmlutils/network.py | 2 +-
xmlutils/qemucmdline.py | 2 +-
xmlutils/serial.py | 2 +-
177 files changed, 275 insertions(+), 182 deletions(-)
create mode 100644 IBM-license-blacklist
--
2.5.0
8 years, 9 months
[PATCH] [Kimchi] Remove help and screenshot URI configuraton from kimchi.conf file
by Aline Manera
kimchi.conf file may be edited by user and the information related to
the help pages and screenshot files location can not be changed as it is
defined in the application setup.
So move the help and screenshot URI configuration to config.py.in
Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com>
---
config.py.in | 11 ++++++++++-
kimchi.conf | 10 ----------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/config.py.in b/config.py.in
index 0753a00..3cd2e80 100644
--- a/config.py.in
+++ b/config.py.in
@@ -128,6 +128,7 @@ class KimchiConfig(PluginConfig):
super(KimchiConfig, self).__init__('kimchi')
static_config = {
+
'/novnc': {'type': 'dir',
'path': kimchiPaths.novnc_dir},
'/spice-html5': {'type': 'dir',
@@ -139,7 +140,15 @@ class KimchiConfig(PluginConfig):
'/serial': {'type': 'dir',
'path': kimchiPaths.serial_dir}}
- custom_config = {}
+ custom_config = {
+ '/help': {'tools.nocache.on': True,
+ 'tools.staticdir.dir':
+ os.path.join(kimchiPaths.ui_dir, 'pages/help'),
+ 'tools.staticdir.on': True},
+ '/data/screenshots': {'tools.nocache.on': False,
+ 'tools.staticdir.dir':
+ get_screenshot_path(),
+ 'tools.staticdir.on': True}}
for uri, data in static_config.iteritems():
custom_config[uri] = {'tools.nocache.on': True,
'tools.wokauth.on': True}
diff --git a/kimchi.conf b/kimchi.conf
index 108ef9c..1bfd6f9 100644
--- a/kimchi.conf
+++ b/kimchi.conf
@@ -25,13 +25,3 @@ tools.sessions.httponly = True
tools.sessions.locking = 'explicit'
tools.sessions.storage_type = 'ram'
tools.sessions.timeout = 10
-
-[/data/screenshots]
-tools.staticdir.on = True
-tools.staticdir.dir = wok.config.PluginPaths('kimchi').state_dir + '/screenshots'
-tools.nocache.on = False
-
-[/help]
-tools.staticdir.on = True
-tools.staticdir.dir = wok.config.PluginPaths('kimchi').ui_dir + '/pages/help'
-tools.nocache.on = True
--
2.5.0
8 years, 9 months
[PATCH] [Kimchi 0/3] Disallow hotplug of 3D graphic cards
by Jose Ricardo Ziviani
This patchset disallow hotplug of 3D graphic cards in both back and
front end.
Jose Ricardo Ziviani (3):
Disallow hotplug of graphic cards because it is no supported
Disable hotplug of graphic card devices in the frontend
Update the API document
docs/API.md | 1 +
i18n.py | 1 +
model/host.py | 15 +++++++++++++++
model/vmhostdevs.py | 5 +++++
ui/js/src/kimchi.guest_edit_main.js | 2 +-
5 files changed, 23 insertions(+), 1 deletion(-)
--
1.9.1
8 years, 9 months
[PATCH] [Kimchi 0/3] Issue #372: Add support to netboot installation.
by pvital＠linux.vnet.ibm.com
From: Paulo Vital <pvital(a)linux.vnet.ibm.com>
This patchset adds support in backend to create templates and guests to netboot
without setting a cdrom path or URL as image to install. Once created a guest
to boot via network, the guest will request DHCP/TFTP/(NFS/HTTP/FTP) network
installation servers to download the configured images and start the install.
To test, use the curl commands:
curl -k -u test -H "Content-Type: application/json" -H \
"Accept: application/json" 'https://localhost:8001/plugins/kimchi/templates' \
-X POST -d '{"name": "test-netboot"}'
Enter host password for user 'test':
{
"cpu_info":{
"maxvcpus":1,
"vcpus":1
},
"graphics":{
"type":"vnc",
"listen":"127.0.0.1"
},
"cdrom":"netboot",
"networks":[
"default"
],
"icon":"plugins/kimchi/images/icon-vm.png",
"os_distro":"unknown",
"name":"test-netboot",
"disks":[
{
"index":0,
"format":"qcow2",
"pool":{
"type":"dir",
"name":"/plugins/kimchi/storagepools/default"
},
"size":10
}
],
"invalid":{},
"os_version":"unknown",
"memory":1024,
"folder":[]
}
curl -k -u test -H "Content-Type: application/json" -H \
"Accept: application/json" 'https://localhost:8001/plugins/kimchi/vms' -X POST \
-d '{"name":"1netboot-test","template":"/plugins/kimchi/templates/test-netboot"}'
Enter host password for user 'test':
{
"status":"running",
"message":"OK",
"id":"1",
"target_uri":"/plugins/kimchi/vms/1netboot-test"
}
Paulo Vital (3):
Add support to create templates without ISO image.
Add support to create guests without ISO image.
Update test cases to support netboot.
model/templates.py | 35 ++++++++++++++++++++++-------------
tests/test_template.py | 18 ++++++++++++++----
tests/test_vmtemplate.py | 16 ++++++++++++++++
vmtemplate.py | 29 ++++++++++++++++++-----------
xmlutils/bootorder.py | 44 ++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 114 insertions(+), 28 deletions(-)
create mode 100644 xmlutils/bootorder.py
--
2.5.0
8 years, 9 months
