- Kimchi-devel - oVirt List Archives

[PATCH] [Wok] Fix test issue
by Lucio Correia 29 Feb '16

29 Feb '16

In a clean environment, system does not create log directory. Fix this issue and also remove unnecessary server init option. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/server.py | 1 + tests/utils.py | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wok/server.py b/src/wok/server.py index 122efff..902d4bf 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -68,6 +68,7 @@ class Server(object): make_dirs = [ os.path.abspath(config.get_log_download_path()), + os.path.abspath(configParser.get("logging", "log_dir")), os.path.dirname(os.path.abspath(options.access_log)), os.path.dirname(os.path.abspath(options.error_log)), os.path.dirname(os.path.abspath(config.get_object_store())) diff --git a/tests/utils.py b/tests/utils.py index 249205d..d158ba1 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -119,7 +119,6 @@ def run_server(host, port, ssl_port, test_mode, cherrypy_port=None, 'websockets_port': 64667, 'ssl_cert': '', 'ssl_key': '', 'max_body_size': '4*1024', 'test': test_mode, 'access_log': '/dev/null', 'error_log': '/dev/null', - 'req_log': '/dev/null', 'environment': environment, 'log_level': 'debug'})() if model is not None: setattr(args, 'model', model) -- 1.9.1

2 1

[PATCH V4] [Wok 0/4] Implement User Request Logger
by Lucio Correia 26 Feb '16

26 Feb '16

Changes in V4: * Update log removal interval to 6 hours Changes in V3: * Replaced cron by cherrypy's BackgroundTask * Created RequestLogger class * Removed --req-log config option * Small fixes Changes in V2: * applied review from gingerbase patch * added download option * added crontab for deleting generated downloads * log login/logout requests User requests log is 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 use at most 6 MB of disk space. Suggestions here are appreciated. The log format is JSON, since: * the web user interface will provide a log utility to easily search and filter log results. * there is a download function which generates a log-like text file based on 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 * download: generate a log-like text file for download Sample JSON response: dev@u1510:~$ curl -u dev -H "Content-Type: application/json" -H "Accept: application/json" "http://localhost:8010/logs?download=True" -X GET -d '{}' Enter host password for user 'dev': { "records":[ { "app":"wok", "req":"POST", "user":"dev", "time":"14:39:59", "date":"2016-02-25", "message":"User 'dev' logout" }, (...truncated...) { "app":"gingerbase", "req":"POST", "user":"dev", "time":"14:42:31", "date":"2016-02-25", "message":"Host software update" } ], "uri":"/data/logs/tmpbnOzP2.txt" } "uri" value can then be used to download log file: dev@u1510:~$ curl -u dev -H "Content-Type: application/json" -H "Accept: application/json" "http://localhost:8010/data/logs/tmpbnOzP2.txt" -X GET -d '{}' Enter host password for user 'dev': [2016-02-25 14:39:59] POST wok dev: User 'dev' logout [2016-02-25 14:40:13] POST gingerbase dev: Create host debug report 'test' [2016-02-25 14:40:58] PUT gingerbase dev: Update host debug report 'test0' [2016-02-25 14:41:10] DELETE gingerbase dev: Delete host debug report 'test0' [2016-02-25 14:41:55] POST gingerbase dev: Enable host software repository 'archive.canonical.com-wily-partner' [2016-02-25 14:42:06] POST gingerbase dev: Disable host software repository 'archive.canonical.com-wily-partner' [2016-02-25 14:42:31] POST gingerbase dev: Host software update Lucio Correia (4): Add User Request Logger Log user requests Implement User Request Logger API Fix tests docs/API/logs.md | 27 +++++++ src/wok/config.py.in | 10 +++ src/wok/control/base.py | 81 +++++++++++++++++++-- src/wok/control/logs.py | 43 +++++++++++ src/wok/i18n.py | 4 +- src/wok/model/logs.py | 31 ++++++++ src/wok/reqlogger.py | 184 ++++++++++++++++++++++++++++++++++++++++++++++++ src/wok/root.py | 28 ++++++++ src/wok/server.py | 6 ++ src/wok/utils.py | 32 +++++++++ tests/utils.py | 1 + 11 files changed, 440 insertions(+), 7 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

2 5

[PATCH V3] [Wok 0/4] Implement User Request Logger
by Lucio Correia 26 Feb '16

26 Feb '16

Changes in V3: * Replaced cron by cherrypy's BackgroundTask * Created RequestLogger class * Removed --req-log config option * Small fixes Changes in V2: * applied review from gingerbase patch * added download option * added crontab for deleting generated downloads * log login/logout requests User requests log is 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 use at most 6 MB of disk space. Suggestions here are appreciated. The log format is JSON, since: * the web user interface will provide a log utility to easily search and filter log results. * there is a download function which generates a log-like text file based on 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 * download: generate a log-like text file for download Sample JSON response: dev@u1510:~$ curl -u dev -H "Content-Type: application/json" -H "Accept: application/json" "http://localhost:8010/logs?download=True" -X GET -d '{}' Enter host password for user 'dev': { "records":[ { "app":"wok", "req":"POST", "user":"dev", "time":"14:39:59", "date":"2016-02-25", "message":"User 'dev' logout" }, (...truncated...) { "app":"gingerbase", "req":"POST", "user":"dev", "time":"14:42:31", "date":"2016-02-25", "message":"Host software update" } ], "uri":"/data/logs/tmpbnOzP2.txt" } "uri" value can then be used to download log file: dev@u1510:~$ curl -u dev -H "Content-Type: application/json" -H "Accept: application/json" "http://localhost:8010/data/logs/tmpbnOzP2.txt" -X GET -d '{}' Enter host password for user 'dev': [2016-02-25 14:39:59] POST wok dev: User 'dev' logout [2016-02-25 14:40:13] POST gingerbase dev: Create host debug report 'test' [2016-02-25 14:40:58] PUT gingerbase dev: Update host debug report 'test0' [2016-02-25 14:41:10] DELETE gingerbase dev: Delete host debug report 'test0' [2016-02-25 14:41:55] POST gingerbase dev: Enable host software repository 'archive.canonical.com-wily-partner' [2016-02-25 14:42:06] POST gingerbase dev: Disable host software repository 'archive.canonical.com-wily-partner' [2016-02-25 14:42:31] POST gingerbase dev: Host software update Lucio Correia (4): Add User Request Logger Log user requests Implement User Request Logger API Fix tests docs/API/logs.md | 27 +++++++ src/wok/config.py.in | 10 +++ src/wok/control/base.py | 81 +++++++++++++++++++-- src/wok/control/logs.py | 43 +++++++++++ src/wok/i18n.py | 4 +- src/wok/model/logs.py | 31 ++++++++ src/wok/reqlogger.py | 184 ++++++++++++++++++++++++++++++++++++++++++++++++ src/wok/root.py | 28 ++++++++ src/wok/server.py | 6 ++ src/wok/utils.py | 32 +++++++++ tests/utils.py | 1 + 11 files changed, 440 insertions(+), 7 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

1 5

[PATCH] [Kimchi] Added Kimchi SVG logo for login page, footer and about window
by sguimaraes943＠gmail.com 26 Feb '16

26 Feb '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch adds kimchi.svg to ui/images folder. Samuel Guimarães (1): Added Kimchi SVG logo for login page, footer and about window ui/images/Makefile.am | 2 +- ui/images/kimchi.svg | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 ui/images/kimchi.svg -- 1.9.3

2 2

[PATCH] [Wok] Added new Wok logo and script to display installed plugins icons
by sguimaraes943＠gmail.com 26 Feb '16

26 Feb '16

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

2 4

[RFC] Memory HotPlug changes to fix issues
by Rodrigo Trujillo 25 Feb '16

25 Feb '16

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

2 1

[PATCH] [Kimchi 0/2] Add release number to Kimchi version
by Aline Manera 24 Feb '16

24 Feb '16

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

2 4

[PATCH v2][Kimchi 0/4] Support to edit max memory
by Rodrigo Trujillo 24 Feb '16

24 Feb '16

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

2 6

[PATCH] [Kimchi] Adding maxmemory for guest and templates
by peterpnns＠gmail.com 24 Feb '16

24 Feb '16

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

2 2

[PATCH] [Wok 0/4] Implement User Request Logger
by Lucio Correia 23 Feb '16

23 Feb '16

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

1 4