- Kimchi-devel - oVirt List Archives

[PATCH][Wok 1/2] Issue #116: Suggestion to check spec guidelines
by Ramon Medeiros 01 Nov '16

01 Nov '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Makefile.am | 5 ++++- check_spec_errors.sh | 36 ++++++++++++++++++++++++++++++++++++ configure.ac | 1 + docs/fedora-deps.md | 2 +- docs/opensuse-deps.md | 2 +- 5 files changed, 43 insertions(+), 3 deletions(-) create mode 100755 check_spec_errors.sh diff --git a/Makefile.am b/Makefile.am index 8b3f508..e7549f0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,7 +68,10 @@ check-local: && echo "ERROR: Whitespaces found" || echo "Ok"; \ echo "Check IBM license header and copyright date ..." ; \ /bin/bash check-IBM-license-header.sh ; \ - fi + fi; + @if [ -f $(RPMLINT) ]; then \ + ./check_spec_errors.sh; \ + fi; # Link built mo files in the source tree to enable use of translations from # within the source tree diff --git a/check_spec_errors.sh b/check_spec_errors.sh new file mode 100755 index 0000000..e5f47f4 --- /dev/null +++ b/check_spec_errors.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +# +# Project Wok +# +# Copyright IBM Corp, 2016 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +echo "Checking spec guidelines" + +# create links +cp contrib/wok.spec.fedora contrib/wok_fedora.spec +cp contrib/wok.spec.suse contrib/wok_suse.spec + +# run checking +rpmlint contrib/wok_fedora.spec +rpmlint contrib/wok_suse.spec + +# remove links +rm contrib/wok_fedora.spec +rm contrib/wok_suse.spec + + diff --git a/configure.ac b/configure.ac index ff41c84..0c27859 100644 --- a/configure.ac +++ b/configure.ac @@ -38,6 +38,7 @@ AM_INIT_AUTOMAKE([-Wno-portability]) AM_PATH_PYTHON([2.6]) AC_PATH_PROG([PEP8], [pep8], [/usr/bin/pep8]) AC_PATH_PROG([GIT], [git], [/usr/bin/git]) +AC_PATH_PROG([RPMLINT], [rpmlint], [/usr/bin/rpmlint]) AC_PYTHON_MODULE([unittest]) AC_SUBST([HAVE_PYMOD_UNITTEST]) AC_SUBST([PYTHON_VERSION]) diff --git a/docs/fedora-deps.md b/docs/fedora-deps.md index e665cdb..260390e 100644 --- a/docs/fedora-deps.md +++ b/docs/fedora-deps.md @@ -42,7 +42,7 @@ Packages required for UI development Packages required for tests --------------------------- - $ sudo yum install pyflakes python-pep8 python-requests + $ sudo yum install pyflakes python-pep8 python-requests rpmlint # For RHEL systems, install the additional packages: $ sudo yum install python-unittest2 diff --git a/docs/opensuse-deps.md b/docs/opensuse-deps.md index 4fe3876..7fe1763 100644 --- a/docs/opensuse-deps.md +++ b/docs/opensuse-deps.md @@ -29,4 +29,4 @@ Packages required for UI development Packages required for tests --------------------------- - $ sudo zypper install python-pyflakes python-pep8 python-requests + $ sudo zypper install python-pyflakes python-pep8 python-requests rpmlint -- 2.7.4

2 3

[PATCH][Wok] Issue #139: Do not generate logrotate config file on the fly
by Ramon Medeiros 01 Nov '16

01 Nov '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Makefile.am | 2 +- src/Makefile.am | 1 + src/wok.conf.in | 8 +++++--- src/wok.logrotate | 9 +++++++++ src/wok/server.py | 28 +--------------------------- 5 files changed, 17 insertions(+), 31 deletions(-) create mode 100644 src/wok.logrotate diff --git a/Makefile.am b/Makefile.am index 8b3f508..4deadb1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -155,7 +155,7 @@ install-data-local: $(INSTALL_DATA) src/dhparams.pem $(DESTDIR)/etc/wok/dhparams.pem touch $(DESTDIR)/etc/nginx/conf.d/wok.conf mkdir -p $(DESTDIR)/etc/logrotate.d/ - touch $(DESTDIR)/etc/logrotate.d/wokd + $(INSTALL_DATA) $(top_srcdir)/src/wok.logrotate $(DESTDIR)/etc/logrotate.d/wokd uninstall-local: @if test -f $(systemdsystemunitdir)/wokd.service; then \ diff --git a/src/Makefile.am b/src/Makefile.am index f06d755..27e0815 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,6 +24,7 @@ SUBDIRS = wok nginx EXTRA_DIST = wokd.in \ wok.conf.in \ firewalld.xml \ + wok.logrotate \ $(NULL) bin_SCRIPTS = wokd diff --git a/src/wok.conf.in b/src/wok.conf.in index 5e04b20..254f786 100644 --- a/src/wok.conf.in +++ b/src/wok.conf.in @@ -50,14 +50,16 @@ [logging] # Log directory + +# Be aware that editting logging directory, you must change logrotate +# configuration file to keep logs being compressed. +# Look /etc/logrotate.d/wokd + #log_dir = @localstatedir@/log/wok # Logging level: debug, info, warning, error or critical #log_level = debug -# Log file size (specify size in K, M or G) -#log_size = 10M - [authentication] # Authentication method, available option: pam, ldap. # method = pam diff --git a/src/wok.logrotate b/src/wok.logrotate new file mode 100644 index 0000000..505c3e7 --- /dev/null +++ b/src/wok.logrotate @@ -0,0 +1,9 @@ +/var/log/wok { + daily + nomail + maxsize 10M + rotate 10 + nomissingok + compress +} + diff --git a/src/wok/server.py b/src/wok/server.py index fecca48..9d864df 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -30,7 +30,7 @@ from string import Template from wok import auth from wok import config from wok.config import config as configParser -from wok.config import paths, PluginConfig, WokConfig +from wok.config import PluginConfig, WokConfig from wok.control import sub_nodes from wok.model import model from wok.proxy import start_proxy @@ -45,17 +45,6 @@ LOGGING_LEVEL = {"debug": logging.DEBUG, "warning": logging.WARNING, "error": logging.ERROR, "critical": logging.CRITICAL} -LOGROTATE_TEMPLATE = """ -${log_dir}/*log { - daily - nomail - maxsize ${log_size} - rotate 10 - nomissingok - compress -} -""" - def set_no_cache(): from time import strftime, gmtime @@ -147,21 +136,6 @@ class Server(object): # start request logger self.reqLogger = RequestLogger() - # only add logrotate if wok is installed - if paths.installed: - - # redefine logrotate configuration according to wok.conf - data = Template(LOGROTATE_TEMPLATE) - data = data.safe_substitute( - log_dir=configParser.get("logging", "log_dir"), - log_size=configParser.get("logging", "log_size") - ) - - # Write file to be used for nginx. - config_file = open(os.path.join(paths.logrotate_dir, "wokd"), "w") - config_file.write(data) - config_file.close() - # Handling running mode if not dev_env: cherrypy.config.update({'environment': 'production'}) -- 2.7.4

2 2

[Wok][RFC] Issue #175: Do not generate nginx conf file on the fly
by Ramon Medeiros 31 Oct '16

31 Oct '16

Propose: Do not regenerate wok.conf at nginx at startup of wok. Questions: 1) The wok.conf will be generated at make ? And then copied at make rpm? 2) If using make to generate it, how development run (when running from git), will work? The developer must copy wok.conf to nginx directory? 3) The [server] configuration at wok.conf will be removed? letting to the user to change parameters? -- Ramon Nunes Medeiros Kimchi Developer Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

2 2

[PATCH] [Wok] Bug fix #176: Assume plugin URI is /plugins/<plugin-name>
by Aline Manera 28 Oct '16

28 Oct '16

Today, every plugin configuration file has a 'uri' parameter that can be changed. But now, the user can change the Wok base URI so there is no need to have this kind of configuration on each plugin. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/wok/config.py.in | 5 +++++ src/wok/model/plugins.py | 3 ++- src/wok/server.py | 6 +++--- src/wok/utils.py | 11 +---------- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/wok/config.py.in b/src/wok/config.py.in index 46544fa..f1167f4 100644 --- a/src/wok/config.py.in +++ b/src/wok/config.py.in @@ -293,5 +293,10 @@ def _get_config(): config = _get_config() +def get_base_plugin_uri(p_name): + return os.path.join("/", config.get("server", "server_root"), + "plugins", p_name) + + if __name__ == '__main__': print paths.prefix diff --git a/src/wok/model/plugins.py b/src/wok/model/plugins.py index 4beff44..1b8ec5e 100644 --- a/src/wok/model/plugins.py +++ b/src/wok/model/plugins.py @@ -21,6 +21,7 @@ import cherrypy +from wok.config import get_base_plugin_uri from wok.utils import get_enabled_plugins @@ -32,4 +33,4 @@ class PluginsModel(object): # Will only return plugins that were loaded correctly by WOK and are # properly configured in cherrypy return [plugin for (plugin, config) in get_enabled_plugins() - if config.get('wok').get('uri') in cherrypy.tree.apps.keys()] + if get_base_plugin_uri(plugin) in cherrypy.tree.apps.keys()] diff --git a/src/wok/server.py b/src/wok/server.py index fecca48..93d28c6 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -189,9 +189,7 @@ class Server(object): plugin_class = ('plugins.%s.%s' % (plugin_name, plugin_name[0].upper() + plugin_name[1:])) - script_name = plugin_config['wok']['uri'] del plugin_config['wok'] - plugin_config.update(PluginConfig(plugin_name)) except KeyError: continue @@ -229,7 +227,9 @@ class Server(object): "error: %s" % (plugin_class, e.message) ) - cherrypy.tree.mount(plugin_app, script_name, plugin_config) + cherrypy.tree.mount(plugin_app, + config.get_base_plugin_uri(plugin_name), + plugin_config) def start(self): # Subscribe to SignalHandler plugin diff --git a/src/wok/utils.py b/src/wok/utils.py index 52f6cea..9a08001 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -39,7 +39,7 @@ from datetime import datetime, timedelta from multiprocessing import Process, Queue from threading import Timer -from wok.config import config, paths, PluginPaths +from wok.config import paths, PluginPaths from wok.exception import InvalidParameter, TimeoutExpired from wok.stringutils import decode_value @@ -71,14 +71,6 @@ def _load_plugin_conf(name): (plugin_conf, e.message)) -def _check_plugin_relative_path(plugin_config): - rel_path = config.get("server", "server_root") - plugin_uri = plugin_config['wok']['uri'] - if (rel_path is not "") and (not plugin_uri.startswith(rel_path)): - plugin_config['wok']['uri'] = rel_path + plugin_uri - return plugin_config - - def get_enabled_plugins(): plugin_dir = paths.plugins_dir try: @@ -90,7 +82,6 @@ def get_enabled_plugins(): plugin_config = _load_plugin_conf(name) try: if plugin_config['wok']['enable']: - plugin_config = _check_plugin_relative_path(plugin_config) yield (name, plugin_config) except (TypeError, KeyError): continue -- 2.7.4

2 2

[PATCH] [Kimchi] Remove URI configuration from kimchi.conf file
by Aline Manera 28 Oct '16

28 Oct '16

Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- This patch depends on Wok patch - [PATCH] [Wok] Bug fix #176: Assume plugin URI is /plugins/<plugin-name> --- kimchi.conf | 3 --- tests/test_config.py.in | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/kimchi.conf b/kimchi.conf index ede2f15..97a14bd 100644 --- a/kimchi.conf +++ b/kimchi.conf @@ -2,9 +2,6 @@ # Enable Kimchi plugin on Wok server (values: True|False) enable = True -# Root URI for Kimchi APIs -uri = '/plugins/kimchi' - [kimchi] # Federation feature: register Wok server on openSLP and discover peers # in the same network. Check README-federation for more details. diff --git a/tests/test_config.py.in b/tests/test_config.py.in index 48f5579..74ea84a 100644 --- a/tests/test_config.py.in +++ b/tests/test_config.py.in @@ -77,8 +77,7 @@ class ConfigTests(unittest.TestCase): pluginPrefix = paths.add_prefix(paths.plugin_dir) configObj = { 'wok': { - 'enable': True, - 'uri': '/plugins/kimchi' + 'enable': True }, 'kimchi': { 'federation': False, -- 2.7.4

2 2

[PATCH] [Kimchi] Issue #1060: Edit template/Guest for s390x, console drop down shows empty box along with virtio and sclp.
by archus＠linux.vnet.ibm.com 28 Oct '16

28 Oct '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> For s390x, console can be either virtio or sclp. Cannot be blank. Hence this fix will remove empty box for console in edit template and edit guest UI panels. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- ui/pages/guest-edit.html.tmpl | 1 - ui/pages/template-edit.html.tmpl | 1 - 2 files changed, 2 deletions(-) diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 88ccb10..0bf17c6 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -74,7 +74,6 @@ <div class="form-group" id="guest-console-panel" style="display:none;"> <label for="guest-edit-console">$_("Console")</label> <select id="guest-edit-console" name="console" class="form-control"> - <option value=""></option> <option value="sclp">$_("sclp")</option> <option value="virtio">$_("virtio")</option> </select> diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 88454dc..e9a479e 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -109,7 +109,6 @@ </div> <div class="template-edit-wrapper-controls console" style="display:none"> <select id="template-edit-console" name="console" class="form-control"> - <option value=""></option> <option value="sclp">$_("sclp")</option> <option value="virtio">$_("virtio")</option> </select> -- 2.7.4

3 2

[PATCH] [Kimchi] Issue #1061: For s390x, in edit template add storage path, even after changing value in path textbox its border still remains red.
by archus＠linux.vnet.ibm.com 28 Oct '16

28 Oct '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Currently for storage path textbox, on change event only the check for value is done.Due to which only after clicking outside of textbox the value is validated. This fix in addition to chnage added keyup and input events. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.template_edit_main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index 31cb8d9..7428ae6 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -338,7 +338,7 @@ kimchi.template_edit_main = function() { } }); - $(storageRow + ' input.storage-path').on('change',function(){ + $(storageRow + ' input.storage-path').on('change input keyup',function(){ if($(storageRow + ' input.storage-path').val()){ $(storageRow + ' span.storage-path').removeClass('has-error'); }else{ -- 2.7.4

3 2

[PATCH] [Kimchi] Issue #1059: Not able to save corrected img path after editing img based template which has incorrect img path due to the img is not available.
by archus＠linux.vnet.ibm.com 28 Oct '16

28 Oct '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> The error was due to invalid additional parameter "vm-image" passed to template update API. The vm-image is already passed as "base" paramter in "disks" to update the vm-image in the template. So removed "vm-image" parameter from UI and just passed the vm-image as "base" parameter of "disks" to template update API. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.template_edit_main.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index 31cb8d9..78f25e2 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -809,10 +809,6 @@ kimchi.template_edit_main = function() { data['cdrom'] = $('.tab-content input[name="cdrom"]').val(); } - if ($('.tab-content .has-changes > input[name="vm-image"]').length) { - data['vm-image'] = $('.tab-content input[name="vm-image"]').val(); - } - if ($("input:checkbox", "#form-template-processor").prop("checked")) { //Check if maxCpu field has a value data['cpu_info'] = { -- 2.7.4

3 2

[PATCH] [Kimchi 0/2] Fix WOK issues #173 and #174
by Aline Manera 27 Oct '16

27 Oct '16

This patch set depends on Wok patch to work as expected. - [PATCH] [Wok 00/10] Fix issues #173 and #174 Aline Manera (2): Wok issue #174: Let Wok create the whole navigation bar Wok issue #173: Set tab color on tab-ext.xml and update SCSS files ui/config/tab-ext.xml | 2 +- ui/css/src/kimchi.scss | 31 +++++++++++++++++++++---------- ui/css/src/modules/_edit-guests.scss | 2 +- ui/css/src/modules/_guests.scss | 6 +++--- ui/css/src/modules/_iso-list.scss | 2 +- ui/css/src/modules/_storage.scss | 4 ++-- ui/js/src/kimchi.guest_main.js | 6 +++++- ui/js/src/kimchi.network.js | 6 +++++- ui/js/src/kimchi.storage_main.js | 6 +++++- ui/js/src/kimchi.template_main.js | 6 +++++- ui/pages/i18n.json.tmpl | 4 ++++ ui/pages/tabs/guests.html.tmpl | 19 ------------------- ui/pages/tabs/network.html.tmpl | 19 ------------------- ui/pages/tabs/storage.html.tmpl | 19 ------------------- ui/pages/tabs/templates.html.tmpl | 19 ------------------- 15 files changed, 53 insertions(+), 98 deletions(-) -- 2.7.4

2 4

[PATCH] [Wok 00/10] Fix issues #173 and #174
by Aline Manera 27 Oct '16

27 Oct '16

This patch set depends on {Kimchi,Ginger,Gingerbase} patches to work as expected. Aline Manera (10): fix Bug fix #174: Automatic create navigation toolbar when loading plugin Bug fix #173: Get color tab from tab-ext.xml file Bug fix #173: Get plugin color to set user log data Update Wok variables names for better meaning Remove unused SCSS variables Align _wok-variables.scss content for visual matters Remove non-Wok strings from Wok source code Remove build warning message from Wok Remove Ginger Base specific CSS from Wok source code ui/config/tab-ext.xml | 2 +- ui/css/bootstrap.custom.css | 686 +++++++++------------------------ ui/css/datatables.bootstrap.css | 10 +- ui/css/settings.css | 36 -- ui/css/src/modules/_buttons.scss | 4 +- ui/css/src/modules/_menu-flat.scss | 2 +- ui/css/src/modules/_modal-flat.scss | 4 +- ui/css/src/modules/_navbar-flat.scss | 15 - ui/css/src/modules/_toolbar.scss | 33 -- ui/css/src/modules/_wok-variables.scss | 132 +++---- ui/css/src/settings.scss | 20 +- ui/css/theme-default/window.css | 5 - ui/css/wok.css | 162 +------- ui/js/src/wok.main.js | 50 ++- ui/js/wok.bootgrid.js | 2 +- ui/pages/i18n.json.tmpl | 2 - ui/pages/tabs/settings.html.tmpl | 5 - ui/pages/wok-ui.html.tmpl | 37 +- 18 files changed, 302 insertions(+), 905 deletions(-) -- 2.7.4

2 14