- Kimchi-devel - oVirt List Archives

Re: [Kimchi-devel] [PATCH V2] [Kimchi 0/2] Fix VM name conflicts with snapshot reverts
by Aline Manera 03 Jun '16

03 Jun '16

Hi Lucio, I was expecting to have all test passing on Fedora 23 with those patches but I got one error while running the tests: make[4]: Entering directory '/home/alinefm/wok/src/wok/plugins/kimchi/tests' /bin/mkdir -p ../data/screenshots ./run_tests.sh ***** Running unit test: test_mock_storagepool... PASSED - Ran 1 test in 9.337s ***** Running unit test: test_authorization... PASSED - Ran 1 test in 10.786s ***** Running unit test: test_networkxml... PASSED - Ran 10 tests in 0.003s ***** Running unit test: test_storagepoolxml... PASSED - Ran 1 test in 0.001s ***** Running unit test: test_livemigration... PASSED - Ran 11 tests in 0.001s ***** Running unit test: test_mock_storagevolume... FAILED ====================================================================== FAIL: test_storagevolume (test_mock_storagevolume.MockStorageVolumeTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "test_mock_storagevolume.py", line 99, in test_storagevolume _do_volume_test(self, model, host, ssl_port, pool_name) File "test_model_storagevolume.py", line 139, in _do_volume_test self.assertEquals(200, resp.status) AssertionError: 200 != 404 ---------------------------------------------------------------------- Ran 1 test in 7.703s FAILED (failures=1) ***** Running unit test: test_config... PASSED - Ran 3 tests in 0.002s ***** Running unit test: test_vmtemplate... PASSED - Ran 7 tests in 0.453s ***** Running unit test: test_mock_network... PASSED - Ran 1 test in 4.409s ***** Running unit test: test_model_storagepool... PASSED - Ran 1 test in 7.068s ***** Running unit test: test_model_network... PASSED - Ran 4 tests in 12.094s ***** Running unit test: test_template... PASSED - Ran 5 tests in 28.958s ***** Running unit test: test_model_libvirtevents... PASSED - Ran 1 test in 40.671s ***** Running unit test: test_rest... PASSED - Ran 42 tests in 155.819s ***** Running unit test: test_osinfo... PASSED - Ran 5 tests in 0.025s ***** Running unit test: test_mockmodel... PASSED - Ran 5 tests in 20.952s ***** Running unit test: test_model... FAILED ====================================================================== ERROR: test_vm_edit (test_model.ModelTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "test_model.py", line 1083, in test_vm_edit inst.vm_update('kimchi-vm1', params) File "/home/alinefm/wok/src/wok/plugins/kimchi/model/vms.py", line 290, in update vm_name, dom = self._static_vm_update(name, dom, params) File "/home/alinefm/wok/src/wok/plugins/kimchi/model/vms.py", line 816, in _static_vm_update self._redefine_snapshots(dom, snapshots_info) File "/home/alinefm/wok/src/wok/plugins/kimchi/model/vms.py", line 737, in _redefine_snapshots xml = xml_item_update(xml, XPATH_SNAP_VM_NAME, dom.name(), None) File "/home/alinefm/wok/src/wok/xmlutils/utils.py", line 52, in xml_item_update item.text = value File "lxml.etree.pyx", line 951, in lxml.etree._Element.text.__set__ (src/lxml/lxml.etree.c:46377) File "apihelpers.pxi", line 695, in lxml.etree._setNodeText (src/lxml/lxml.etree.c:20989) File "apihelpers.pxi", line 683, in lxml.etree._createTextNode (src/lxml/lxml.etree.c:20865) File "apihelpers.pxi", line 1393, in lxml.etree._utf8 (src/lxml/lxml.etree.c:27155) ValueError: All strings must be XML compatible: Unicode or ASCII, no NULL bytes or control characters ====================================================================== ERROR: test_vm_lifecycle (test_model.ModelTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "test_model.py", line 223, in test_vm_lifecycle inst.vm_update('kimchi-vm', {'name': u'kimchi-vm-new'}) File "/home/alinefm/wok/src/wok/plugins/kimchi/model/vms.py", line 290, in update vm_name, dom = self._static_vm_update(name, dom, params) File "/home/alinefm/wok/src/wok/plugins/kimchi/model/vms.py", line 823, in _static_vm_update 'err': e.get_error_message()}) OperationFailed: KCHVM0008E: KCHVM0008E ---------------------------------------------------------------------- Ran 25 tests in 94.421s FAILED (errors=2, skipped=1) ***** Running unit test: test_host... PASSED - Ran 3 tests in 4.786s ***** Running unit test: test_model_storagevolume... FAILED ====================================================================== FAIL: test_storagevolume_action (test_model_storagevolume.StorageVolumeTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "test_model_storagevolume.py", line 274, in test_storagevolume_action _do_volume_test(self, model, host, ssl_port, 'default') File "test_model_storagevolume.py", line 139, in _do_volume_test self.assertEquals(200, resp.status) AssertionError: 200 != 404 ---------------------------------------------------------------------- Ran 2 tests in 10.781s FAILED (failures=1) [03/Jun/2016:18:03:32] ENGINE Waiting for child threads to terminate... ====================================================================== ===================== Kimchi Unit Tests Summary ====================== Ran 129 tests in 408.270 seconds. test_mock_storagevolume FAILED: (failures=1) - full log available at /tmp/tmp.Qe5CD4LmgQ test_model FAILED: (errors=2, skipped=1) - full log available at /tmp/tmp.Qe5CD4LmgQ test_model_storagevolume FAILED: (failures=1) - full log available at /tmp/tmp.Qe5CD4LmgQ And one VM named 'пeω-∨м' was left n my system after running the tests. [alinefm@alinefm-TP440 kimchi]$ sudo virsh list --all [sudo] password for alinefm: Id Name State ---------------------------------------------------- - fedora23 shut off - opensuse42.1 shut off - rhel7.2 shut off - ubuntu15.10 shut off - windows7 shut off - пeω-∨м shut off Could you take a look on it? Thanks, Aline Manera On 06/01/2016 03:48 PM, Lucio Correia wrote: > Changes in V2: > * Fix tests > > Lucio Correia (2): > Always update snapshot XML with new name and UUID > Update tests to reflect new behavior > > model/vms.py | 12 +++++++++++- > tests/test_model.py | 9 ++++++--- > 2 files changed, 17 insertions(+), 4 deletions(-) >

1 0

[PATCHv2] [Kimchi] Properly display network interfaces when more than one exists
by Socorro Stoppler 03 Jun '16

03 Jun '16

v2: Fix for showing all of the interface(s) when creating a network. v1: Display all of the interfaces when more than one exists when listing networks. Tooltip is shown when hovering over the interface to show all of the interfaces. Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com> --- ui/css/kimchi.css | 8 ++++++-- ui/css/src/modules/_network.scss | 9 ++++++--- ui/js/src/kimchi.network.js | 4 +++- ui/js/src/kimchi.network_add_main.js | 2 +- ui/pages/tabs/network.html.tmpl | 4 ++-- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index 49ea39a..72f340c 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -2156,12 +2156,16 @@ body.wok-gallery { #network-root-container .wok-datagrid > .wok-datagrid-header > span.column-interface, #network-root-container .wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > span.column-interface { - width: 10.3896%; + width: 15.3896%; + padding-right: 40px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } #network-root-container .wok-datagrid > .wok-datagrid-header > span.column-space, #network-root-container .wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > span.column-space { - width: 30%; + width: 25%; } #network-root-container .wok-datagrid > .wok-datagrid-header > span.column-action, diff --git a/ui/css/src/modules/_network.scss b/ui/css/src/modules/_network.scss index 4627ab5..ab47c89 100644 --- a/ui/css/src/modules/_network.scss +++ b/ui/css/src/modules/_network.scss @@ -93,18 +93,21 @@ } > span.column-interface { - width: 10.3896%; + width: 15.3896%; + padding-right: 40px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } > span.column-space { - width: 30%; + width: 25%; } > span.column-action { width: 25.909%; text-align: right; } - } .wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > span { diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 381449d..ac6bf74 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -35,6 +35,7 @@ kimchi.initNetwork = function() { kimchi.initNetworkListView = function() { $('.wok-mask').removeClass('hidden'); kimchi.listNetworks(function(data) { + $('[data-toggle="tooltip"]').tooltip(); for (var i = 0; i < data.length; i++) { var network = { name : data[i].name, @@ -46,7 +47,8 @@ kimchi.initNetworkListView = function() { } else { network.type = data[i].connection; } - network.interface = data[i].interfaces ? data[i].interfaces[0] : null; + network.interface = data[i].interfaces ? data[i].interfaces : null; + network.interface.join(); network.addrSpace = data[i].subnet ? data[i].subnet : null; network.persistent = data[i].persistent; kimchi.addNetworkItem(network); diff --git a/ui/js/src/kimchi.network_add_main.js b/ui/js/src/kimchi.network_add_main.js index 85df203..fd45f34 100644 --- a/ui/js/src/kimchi.network_add_main.js +++ b/ui/js/src/kimchi.network_add_main.js @@ -44,7 +44,7 @@ kimchi.startNetworkCreation = function() { kimchi.createNetwork(data, function(result) { network.state = result.state === "active" ? "up" : "down"; - network.interface = result.interfaces ? result.interfaces[0] : i18n["KCHNET6001M"]; + network.interface = result.interfaces ? result.interfaces : i18n["KCHNET6001M"]; network.addrSpace = result.subnet ? result.subnet : i18n["KCHNET6001M"]; network.persistent = result.persistent; $('#networkGrid').dataGrid('addRow', kimchi.addNetworkItem(network)); diff --git a/ui/pages/tabs/network.html.tmpl b/ui/pages/tabs/network.html.tmpl index 6ddabaa..7e2825d 100644 --- a/ui/pages/tabs/network.html.tmpl +++ b/ui/pages/tabs/network.html.tmpl @@ -85,11 +85,11 @@ </div> <div id="modalWindow" class="modal fade network-modal" tabindex="-1" role="dialog" aria-labelledby="networkModalLabel" aria-hidden="true"> </div> <script id="networkItem" type="text/html"> - <div id='{name}' class='wok-nw-grid-body remove-when-logged-off '> + <div id='{name}' class='wok-nw-grid-body remove-when-logged-off'> <span class='column-state' val="{state}"><span class='network-state {state}'><i class="fa fa-power-off"></i><span class="wok-nw-loading-icon"></span></span></span><span class='column-name' title="{name}" val="{name}">{name}</span><span class='column-type' val="{type}">{type}</span><span class='column-interface' val="{interface}">{interface}</span><span class='column-interface' data-placement="top" data-toggle="tooltip" title="{interface}" val="{interface}">{interface}</span><span class='column-space' val="{addrSpace}">{addrSpace}</span><span class='column-action' style="display:none"> <span class="pull-right"> -- 2.5.0

2 1

[PATCH] [Kimchi] Properly display network interfaces when more than one exists
by Socorro Stoppler 03 Jun '16

03 Jun '16

This patch fixes a bug in the listing of networks in that only one network interface is being shown regardless of the number of interfaces that exist for that network. In addition to now displaying all of the interfaces, in the case that there's too many to fit in the column, an ellipsis has been added to indicate that there's more interfaces than what it being shown. A tooltip will be seen when the user hovers over the interface(s) to show all of the interfaces. Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com> --- ui/css/kimchi.css | 8 ++++++-- ui/css/src/modules/_network.scss | 9 ++++++--- ui/js/src/kimchi.network.js | 4 +++- ui/pages/tabs/network.html.tmpl | 4 ++-- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index 49ea39a..72f340c 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -2156,12 +2156,16 @@ body.wok-gallery { #network-root-container .wok-datagrid > .wok-datagrid-header > span.column-interface, #network-root-container .wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > span.column-interface { - width: 10.3896%; + width: 15.3896%; + padding-right: 40px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } #network-root-container .wok-datagrid > .wok-datagrid-header > span.column-space, #network-root-container .wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > span.column-space { - width: 30%; + width: 25%; } #network-root-container .wok-datagrid > .wok-datagrid-header > span.column-action, diff --git a/ui/css/src/modules/_network.scss b/ui/css/src/modules/_network.scss index 4627ab5..ab47c89 100644 --- a/ui/css/src/modules/_network.scss +++ b/ui/css/src/modules/_network.scss @@ -93,18 +93,21 @@ } > span.column-interface { - width: 10.3896%; + width: 15.3896%; + padding-right: 40px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } > span.column-space { - width: 30%; + width: 25%; } > span.column-action { width: 25.909%; text-align: right; } - } .wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > span { diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 381449d..ac6bf74 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -35,6 +35,7 @@ kimchi.initNetwork = function() { kimchi.initNetworkListView = function() { $('.wok-mask').removeClass('hidden'); kimchi.listNetworks(function(data) { + $('[data-toggle="tooltip"]').tooltip(); for (var i = 0; i < data.length; i++) { var network = { name : data[i].name, @@ -46,7 +47,8 @@ kimchi.initNetworkListView = function() { } else { network.type = data[i].connection; } - network.interface = data[i].interfaces ? data[i].interfaces[0] : null; + network.interface = data[i].interfaces ? data[i].interfaces : null; + network.interface.join(); network.addrSpace = data[i].subnet ? data[i].subnet : null; network.persistent = data[i].persistent; kimchi.addNetworkItem(network); diff --git a/ui/pages/tabs/network.html.tmpl b/ui/pages/tabs/network.html.tmpl index 6ddabaa..7e2825d 100644 --- a/ui/pages/tabs/network.html.tmpl +++ b/ui/pages/tabs/network.html.tmpl @@ -85,11 +85,11 @@ </div> <div id="modalWindow" class="modal fade network-modal" tabindex="-1" role="dialog" aria-labelledby="networkModalLabel" aria-hidden="true"> </div> <script id="networkItem" type="text/html"> - <div id='{name}' class='wok-nw-grid-body remove-when-logged-off '> + <div id='{name}' class='wok-nw-grid-body remove-when-logged-off'> <span class='column-state' val="{state}"><span class='network-state {state}'><i class="fa fa-power-off"></i><span class="wok-nw-loading-icon"></span></span></span><span class='column-name' title="{name}" val="{name}">{name}</span><span class='column-type' val="{type}">{type}</span><span class='column-interface' val="{interface}">{interface}</span><span class='column-interface' data-placement="top" data-toggle="tooltip" title="{interface}" val="{interface}">{interface}</span><span class='column-space' val="{addrSpace}">{addrSpace}</span><span class='column-action' style="display:none"> <span class="pull-right"> -- 2.5.0

2 2

[PATCH v7] [Kimchi] Storage Volume management
by sguimaraes943＠gmail.com 03 Jun '16

03 Jun '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch adds Storage Volume management functions Wipe, Clone, Resize and Delete with multiple selection. It also includes a filter input for each Storage Pool and Gallery View for Storage Volumes. v1: - HTML and CSS v2: - Delete and Wipe with multi-selection - Confirm messages with list of selected volumes when wiping or deleting volumes (requires SCSS/CSS patch sent to Wok) - Filter working - Removed "Add Volume" link from Storage Pool action button - Added "Add Volume" to Volume box action button v3: - Clone function working with multiple selection - Progress bar working for clone and create volume - Temporary volume added to the volumes when cloning - Seamless refresh on the volumes once each task is finished - Fixed issue when list wouldn't refresh when all volumes are removed from the storage pool. v4: - Prevent scroll when Drop-down in volumes list is clicked - Dropdown is not clipped from volumes list when there's only one or two items on the list - Added Media Queries for small screen resolutions v5: - Fixed black border in Firefox and IE when switching from List View to Gallery View - Allocation and % Used in the parent table are now updated when wiping/resizing/deleting/cloning volumes - Removed success messages / duplicated messages - Changed scrollbar position in Volumes area - When applying multiple actions, the checkbox is hidden/disabled and a spinner is shown while the the queue of selected items is being processed v6: - Progress-bar hidden in List View - Fixed MiB text to MB - Added "Used By" column v7: - Removed tooltip when volume is not in use by any guest Samuel Guimarães (1): Storage Volume management model/storagevolumes.py | 2 +- ui/css/kimchi.css | 436 +++++++++++++++-- ui/css/src/modules/_storage.scss | 406 ++++++++++++++-- ui/js/src/kimchi.api.js | 50 ++ ui/js/src/kimchi.storage_main.js | 515 +++++++++++++++++---- ui/js/src/kimchi.storagepool_add_volume_main.js | 2 +- ui/js/src/kimchi.storagepool_resize_volume_main.js | 59 +++ ui/pages/i18n.json.tmpl | 5 + ui/pages/storagepool-resize-volume.html.tmpl | 51 ++ ui/pages/tabs/storage.html.tmpl | 157 ++++--- 10 files changed, 1421 insertions(+), 262 deletions(-) create mode 100644 ui/js/src/kimchi.storagepool_resize_volume_main.js create mode 100644 ui/pages/storagepool-resize-volume.html.tmpl -- 1.9.3

2 2

Re: [Kimchi-devel] [PATCH][Wok 2/5] Creates pluginmanager.py module
by Aline Manera 01 Jun '16

01 Jun '16

On 05/31/2016 02:51 PM, Rodrigo Trujillo wrote: > Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> > --- > src/wok/pluginsmanager.py | 133 ++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 133 insertions(+) > create mode 100644 src/wok/pluginsmanager.py > > diff --git a/src/wok/pluginsmanager.py b/src/wok/pluginsmanager.py > new file mode 100644 > index 0000000..b7bb92b > --- /dev/null > +++ b/src/wok/pluginsmanager.py > @@ -0,0 +1,133 @@ > +# > +# Project Wok > +# > +# Copyright IBM Corp, 2016 > +# > +# Code derived from Project Kimchi > +# This is a new code, right? So not derived from Kimchi > +# 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 > +# > + > + > +import cherrypy > +import copy > +import os > +from cherrypy.lib.reprconf import Parser > +from configobj import ConfigObj > + > + > +from basemodel import Singleton > +from wok.config import paths, PluginConfig, PluginPaths > +from wok.exception import OperationFailed > + > + > +wok_log = cherrypy.log.error_log > + > + > +class Plugins(): > + __metaclass__ = Singleton > + > + def __init__(self): > + # { '<PLUGIN_NAME>': { > + # config: <PLUGIN_CONFIG>, > + # enabled: <TRUE/FALSE>, > + # uri: <PLUGIN_URI_FROM_CONFIG>, > + # plugin_class: <PLUGIN_CLASS_FROM_CONFIG> plugin_class is not part of plugin config anymore. > + self._plugins_dict = {} > + self._init_all_plugins() > + > + def _load_plugin_conf(self, name): > + plugin_conf = PluginPaths(name).conf_file > + ret = {} > + if not os.path.exists(plugin_conf): > + cherrypy.log.error_log.error("Plugin configuration file %s" > + " doesn't exist." % plugin_conf) > + else: > + try: > + ret = Parser().dict_from_file(plugin_conf) > + except ValueError as e: > + msg = "Failed to load plugin conf from %s: %s" > + cherrypy.log.error_log.error(msg % (plugin_conf, e.message)) > + ret.update(PluginConfig(name)) > + return ret > + > + def _init_all_plugins(self): > + plugin_dir = paths.plugins_dir > + try: > + dir_contents = os.listdir(plugin_dir) > + except OSError: > + return > + for name in dir_contents: > + if os.path.isdir(os.path.join(plugin_dir, name)): > + wok_log.info("Loading plugin: %s" % name) > + cfg = self._load_plugin_conf(name) > + plugin_cls = cfg.get('wok', {}).get('plugin_class', '') Same I commented above. plugin_class is not used anymore. > + if plugin_cls == '': > + plugin_cls = ('plugins.%s.%s' % (name, name[0].upper() + > + name[1:])) > + self._plugins_dict[name] = { > + 'config': cfg, > + 'enabled': cfg.get('wok', {}).get('enable', False), > + 'uri': cfg.get('wok', {}).get('uri', ''), > + 'plugin_class': plugin_cls, > + 'conf_file': PluginPaths(name).conf_file > + } > + > + if 'wok' in self._plugins_dict[name]['config']: > + del self._plugins_dict[name]['config']['wok'] > + Usually the cherrypy configuration for a plugin can not be changed, so IMO it should not be part of plugin configuration file. If plugin code is responsible to loads its configuraiton, we don't need to merge the plugin configuration settings with cherrypy configuration and the above lines can be removed. > + def get_all_plugins_info(self): > + return copy.deepcopy(self._plugins_dict) > + > + def get_plugin_info(self, name): > + return copy.deepcopy(self._plugins_dict.get(name, {})) > + > + def get_all_plugins_names(self): > + ret = self._plugins_dict.keys() > + ret.sort() > + return ret > + > + def get_enabled_plugins(self): > + ret = [plugin for plugin in self._plugins_dict.keys() if > + self._plugins_dict[plugin]['enabled']] > + ret.sort() > + return ret > + > + def _enable_plugin_conf_file(self, f_conf, enable=True): > + try: > + # 'unrepr' makes ConfigObj read and write characters like ("'?) > + conf = ConfigObj(infile=f_conf, unrepr=True) > + conf['wok']['enable'] = enable > + with open(f_conf, 'wb') as f: > + conf.write(f) > + except Exception as e: > + wok_log.error('Error updating plugin conf file. ' + e.message) > + raise > + > + def _change_plugin_state(self, name, enable=True): > + plugin = self._plugins_dict[name] > + if plugin['enabled'] == enable: > + return > + try: > + self._enable_plugin_conf_file(plugin['conf_file'], enable) > + except: > + raise OperationFailed('WOKPLUG0002E', {'plugin': name}) > + plugin['enabled'] = enable > + > + def enable_plugin(self, plugin): > + self._change_plugin_state(plugin, True) > + > + def disable_plugin(self, plugin): > + self._change_plugin_state(plugin, False)

2 3

Re: [Kimchi-devel] [PATCH][Wok 5/5] Change plugins API documentation by pluginsmanager API
by Aline Manera 01 Jun '16

01 Jun '16

Please, also add new test cases to cover the API changes. One question below: On 05/31/2016 02:51 PM, Rodrigo Trujillo wrote: > This patch creates the documentation for pluginsmanager API > > Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> > --- > docs/API/plugins.md | 13 ---------- > docs/API/pluginsmanager.md | 61 ++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 61 insertions(+), 13 deletions(-) > delete mode 100644 docs/API/plugins.md > create mode 100644 docs/API/pluginsmanager.md > > diff --git a/docs/API/plugins.md b/docs/API/plugins.md > deleted file mode 100644 > index aaa37b5..0000000 > --- a/docs/API/plugins.md > +++ /dev/null > @@ -1,13 +0,0 @@ > -## REST API Specification for Plugins > - > -### Collection: Plugins > - > -**URI:** /plugins > - > -**Methods:** > - > -* **GET**: Retrieve a summarized list names of all UI Plugins > - > -#### Examples > -GET /plugins > -[pluginA, pluginB, pluginC] > diff --git a/docs/API/pluginsmanager.md b/docs/API/pluginsmanager.md > new file mode 100644 > index 0000000..23381d3 > --- /dev/null > +++ b/docs/API/pluginsmanager.md > @@ -0,0 +1,61 @@ > +## REST API Specification for Plugins Manager > + > +### Collection: Plugins > + > +**URI:** /pluginsmanager > + > +**Methods:** > + > +* **GET**: Retrieve a list of all Plugins configured in Wok, showing name and state. > + > +#### Examples > +GET /pluginsmanager > +[ > + { > + "enabled":true, > + "name":"gingerbase" > + }, > + { > + "enabled":true, > + "name":"kimchi" > + }, > + { > + "enabled":false, > + "name":"sample" > + } > +] > + > +### Resource: Plugin > + > +**URI:** /pluginsmanager/*:name* > + > +A plugin represents a software that will make use of infrastructure provided > +by Wok. It should be installed in a directory with its <name> in Wok directory > +'plugins' and contains an <name>.conf file. > +Example: "/usr/lib/python2.7/site-packages/wok/plugins/kimchi" > + > +**Methods:** > + > +* **GET**: Retrieve the full description of the plugin. > + * name: The plugin name > + * enabled: State of the plugin. If not enabled, Wok will not load it > +* **POST**: *See Task Actions* > + > +**Actions (POST):** > + > +* enable: enable a disabled plugin. Also changes plugin's configuration file > + > +* disable: disable a enabled plugin. Also changes plugin's configuration file > + Does that mean trying to enable a enabled plugin will raise an error? And similar to disable a disabled plugin? > +#### Examples > +GET /pluginsmanager/sample > +{ > + "enabled":false, > + "name":"sample" > +} > + > +POST /pluginsmanager/sample/enable > +{ > + "enabled":true, > + "name":"sample" > +}

2 2

[PATCH v6] [Kimchi] Storage Volume management
by sguimaraes943＠gmail.com 01 Jun '16

01 Jun '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch adds Storage Volume management functions Wipe, Clone, Resize and Delete with multiple selection. It also includes a filter input for each Storage Pool and Gallery View for Storage Volumes. v1: - HTML and CSS v2: - Delete and Wipe with multi-selection - Confirm messages with list of selected volumes when wiping or deleting volumes (requires SCSS/CSS patch sent to Wok) - Filter working - Removed "Add Volume" link from Storage Pool action button - Added "Add Volume" to Volume box action button v3: - Clone function working with multiple selection - Progress bar working for clone and create volume - Temporary volume added to the volumes when cloning - Seamless refresh on the volumes once each task is finished - Fixed issue when list wouldn't refresh when all volumes are removed from the storage pool. v4: - Prevent scroll when Drop-down in volumes list is clicked - Dropdown is not clipped from volumes list when there's only one or two items on the list - Added Media Queries for small screen resolutions v5: - Fixed black border in Firefox and IE when switching from List View to Gallery View - Allocation and % Used in the parent table are now updated when wiping/resizing/deleting/cloning volumes - Removed success messages / duplicated messages - Changed scrollbar position in Volumes area - When applying multiple actions, the checkbox is hidden/disabled and a spinner is shown while the the queue of selected items is being processed v6: - Progress-bar hidden in List View - Fixed MiB text to MB - Added "Used By" column Samuel Guimarães (1): Storage Volume management model/storagevolumes.py | 2 +- ui/css/kimchi.css | 436 ++++++++++++++++-- ui/css/src/modules/_storage.scss | 406 +++++++++++++++-- ui/js/src/kimchi.api.js | 50 ++ ui/js/src/kimchi.storage_main.js | 506 +++++++++++++++++---- ui/js/src/kimchi.storagepool_add_volume_main.js | 2 +- ui/js/src/kimchi.storagepool_resize_volume_main.js | 59 +++ ui/pages/i18n.json.tmpl | 5 + ui/pages/storagepool-resize-volume.html.tmpl | 51 +++ ui/pages/tabs/storage.html.tmpl | 157 ++++--- 10 files changed, 1413 insertions(+), 261 deletions(-) create mode 100644 ui/js/src/kimchi.storagepool_resize_volume_main.js create mode 100644 ui/pages/storagepool-resize-volume.html.tmpl -- 1.9.3

1 1

[RFC] Change guest boot order on REST API
by Daniel Henrique Barboza 01 Jun '16

01 Jun '16

-------- Forwarded Message -------- Subject: [ginger-dev-list] [RFC] Change guest boot order on REST API Date: Wed, 1 Jun 2016 13:49:41 -0300 From: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> To: ginger-dev <ginger-dev-list(a)googlegroups.com> Propose: Kimchi allow to change boot order ("fd", "hd", "cdrom" or "network") hd device can specify which disk will be booted Rest API will receive answer from /plugins/kimchi/<VM NAME>/bootorder {[{"dev": "hd"}]} or a list: {[{"dev": "hd"}, {"dev": "cdrom"}]} Doubts: How we can edit the bootloader? Like the list above or a kind of fixed list? Libvirt provides bootmenu too, which allows users to pick a device in the beginning. Must have it? -- Ramon Nunes Medeiros Kimchi Developer Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

1 0

Re: [Kimchi-devel] [PATCH][Wok 4/5] Implements control/model of new plugin API
by Aline Manera 01 Jun '16

01 Jun '16

On 05/31/2016 02:51 PM, Rodrigo Trujillo wrote: > Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> > --- > src/wok/control/plugins.py | 19 ++++++++++++++++--- > src/wok/i18n.py | 3 +++ > src/wok/model/plugins.py | 30 ++++++++++++++++++++++++------ > 3 files changed, 43 insertions(+), 9 deletions(-) > > diff --git a/src/wok/control/plugins.py b/src/wok/control/plugins.py > index 57dfa1b..c7c9554 100644 > --- a/src/wok/control/plugins.py > +++ b/src/wok/control/plugins.py > @@ -19,11 +19,24 @@ > # License along with this library; if not, write to the Free Software > # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > > -from wok.control.base import SimpleCollection > +from wok.control.base import Collection, Resource > from wok.control.utils import UrlSubNode > > > -@UrlSubNode("plugins") > -class Plugins(SimpleCollection): > +@UrlSubNode("pluginsmanager") > +class Plugins(Collection): > def __init__(self, model): > super(Plugins, self).__init__(model) > + self.resource = Plugin > + > + > +class Plugin(Resource): > + def __init__(self, model, id): > + super(Plugin, self).__init__(model, id) > + self.uri_fmt = "/pluginsmanager/%s" > + self.enable = self.generate_action_handler('enable') > + self.disable = self.generate_action_handler('disable') > + > + @property > + def data(self): > + return self.info Please, set admin_methods to avoid any user be able to change the plugin settings. And also update test_authorization.py tests to cover that. > diff --git a/src/wok/i18n.py b/src/wok/i18n.py > index 4fc21f1..bda3949 100644 > --- a/src/wok/i18n.py > +++ b/src/wok/i18n.py > @@ -60,4 +60,7 @@ messages = { > "WOKRES0001L": _("Request made on resource"), > "WOKROOT0001L": _("User '%(username)s' logged in"), > "WOKROOT0002L": _("User '%(username)s' logged out"), > + > + "WOKPLUG0001E": _("Plugin '%(plugin_name)s' not found."), > + "WOKPLUG0002E": _("Error updating configuration file of plugin '%(plugin)s'."), > } > diff --git a/src/wok/model/plugins.py b/src/wok/model/plugins.py > index 4beff44..1842dbc 100644 > --- a/src/wok/model/plugins.py > +++ b/src/wok/model/plugins.py > @@ -19,9 +19,9 @@ > # 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 cherrypy > > -from wok.utils import get_enabled_plugins > +from wok.exception import NotFoundError > +from wok.pluginsmanager import Plugins > > > class PluginsModel(object): > @@ -29,7 +29,25 @@ class PluginsModel(object): > pass > > def get_list(self): > - # 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()] > + return Plugins().get_all_plugins_names() > + > + > +class PluginModel(object): > + def __init__(self, **kargs): > + pass > + > + def lookup(self, plugin): > + info = Plugins().get_plugin_info(plugin) > + if not info: > + raise NotFoundError('WOKPLUG0001E', {'plugin_name': plugin}) > + > + return {'name': plugin, > + 'enabled': info['enabled']} > + > + def enable(self, plugin_name): > + print "Enabling %s" % plugin_name > + Plugins().enable_plugin(plugin_name) > + > + def disable(self, plugin_name): > + print "Disabling %s" % plugin_name > + Plugins().disable_plugin(plugin_name) Please, use wok_log instead of print

2 1

[PATCH] [Kimchi 2/2] Update tests to reflect new behavior
by Lucio Correia 01 Jun '16

01 Jun '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- tests/test_model.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/test_model.py b/tests/test_model.py index f4a145f..a0fe36f 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -227,14 +227,17 @@ class ModelTests(unittest.TestCase): # snapshot revert to the first created vm result = inst.vmsnapshot_revert(u'kimchi-vm-new', params['name']) - self.assertEquals(result, [u'kimchi-vm', snap['name']]) + self.assertEquals(result, [u'kimchi-vm-new', snap['name']]) - vm = inst.vm_lookup(u'kimchi-vm') + vm = inst.vm_lookup(u'kimchi-vm-new') self.assertEquals(vm['state'], snap['state']) - current_snap = inst.currentvmsnapshot_lookup(u'kimchi-vm') + current_snap = inst.currentvmsnapshot_lookup(u'kimchi-vm-new') self.assertEquals(params['name'], current_snap['name']) + # rename vm back + inst.vm_update('kimchi-vm-new', {'name': u'kimchi-vm'}) + self.assertRaises(NotFoundError, inst.vmsnapshot_delete, u'kimchi-vm', u'foobar') -- 1.9.1

1 0