- Kimchi-devel - oVirt List Archives

[PATCH] [Kimchi] New UI for adding network bridges
by peterpnns＠gmail.com 10 Feb '16

10 Feb '16

From: peterpennings <peterpnns(a)gmail.com> This patch adds Linux and OVS bridges. netinfo.py had to be updated to show OVS bridges in order to reflect the changes made in the UI. peterpennings (1): Issue #791: New UI for adding network bridges netinfo.py | 3 +- ui/js/src/kimchi.network.js | 2 + ui/js/src/kimchi.network_add_main.js | 146 ++++++++++++++++++++++------------- ui/pages/network-add.html.tmpl | 3 +- 4 files changed, 96 insertions(+), 58 deletions(-) -- 2.5.0

4 15

[PATCH] [Kimchi] New UI for adding network bridges V2.
by peterpnns＠gmail.com 10 Feb '16

10 Feb '16

From: peterpennings <peterpnns(a)gmail.com> This patch adds Linux and OVS bridges. netinfo.py had to be updated to show OVS bridges in order to reflect the changes made in the UI. V2: * Fixed error messages * Fixed function name * Form validations peterpennings (1): Issue #791: New UI for adding network bridges netinfo.py | 3 +- ui/js/src/kimchi.network.js | 2 + ui/js/src/kimchi.network_add_main.js | 159 +++++++++++++++++++++-------------- ui/pages/network-add.html.tmpl | 5 +- 4 files changed, 103 insertions(+), 66 deletions(-) -- 2.5.0

3 3

[PATCH] [Kimchi] Fix handling of VLANs in backend
by Lucio Correia 10 Feb '16

10 Feb '16

- Allow VLANs only for bridged virtual networks - Code simplification Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- i18n.py | 6 ++--- model/networks.py | 71 ++++++++++++++++++++++++++++++------------------------- 2 files changed, 42 insertions(+), 35 deletions(-) diff --git a/i18n.py b/i18n.py index 0b9fa39..bd36efa 100644 --- a/i18n.py +++ b/i18n.py @@ -248,8 +248,8 @@ messages = { "KCHNET0001E": _("Network %(name)s already exists"), "KCHNET0002E": _("Network %(name)s does not exist"), - "KCHNET0003E": _("Subnet %(subnet)s specified for network %(network)s is not valid."), - "KCHNET0004E": _("Specify a network interface to create bridged network %(name)s"), + "KCHNET0003E": _("Subnet %(subnet)s specified for network %(network)s is not valid."), + "KCHNET0004E": _("Specify a network interface to create bridged or macvtap networks."), "KCHNET0005E": _("Unable to delete active network %(name)s"), "KCHNET0006E": _("Interface %(iface)s specified for network %(network)s is already in use"), "KCHNET0007E": _("Interface should be bare NIC, bonding or bridge device."), @@ -270,8 +270,8 @@ messages = { "KCHNET0022E": _("Failed to start network %(name)s. Details: %(err)s"), "KCHNET0024E": _("Unable to redefine interface %(name)s. Details: %(err)s"), "KCHNET0025E": _("Unable to create bridge %(name)s. Details: %(err)s"), - "KCHNET0026E": _("Open VSwitch bridges can only host bridged networks."), "KCHNET0027E": _("Unable to create bridge with NetworkManager enabled. Disable it and try again."), + "KCHNET0028E": _("Interface should be bare NIC or bonding."), "KCHSR0001E": _("Storage server %(server)s was not used by Kimchi"), diff --git a/model/networks.py b/model/networks.py index fba181f..9a49634 100644 --- a/model/networks.py +++ b/model/networks.py @@ -86,21 +86,20 @@ class NetworksModel(object): if name in self.get_list(): raise InvalidOperation("KCHNET0001E", {'name': name}) + # handle connection type connection = params["connection"] - # set forward mode, isolated do not need forward if connection == 'macvtap': - params['forward'] = {'mode': 'bridge'} - elif connection != 'isolated': - params['forward'] = {'mode': connection} + self._set_network_macvtap(params) + elif connection == 'bridge': + self._set_network_bridge(params) + elif connection in ['nat', 'isolated']: + if connection == 'nat': + params['forward'] = {'mode': 'nat'} - # set subnet, bridge network do not need subnet - if connection in ["nat", 'isolated']: + # set subnet; bridge/macvtap networks do not need subnet self._set_network_subnet(params) - # only bridge network need bridge(linux bridge) or interface(macvtap) - if connection in ['bridge', 'macvtap']: - self._set_network_bridge(params) - + # create network XML params['name'] = escape(params['name']) xml = to_network_xml(**params) @@ -165,7 +164,7 @@ class NetworksModel(object): else: raise OperationFailed("KCHNET0021E", {'iface': iface}) - def _set_network_bridge(self, params): + def _check_network_interface(self, params): try: # fails if host interface is already in use by a libvirt network iface = params['interface'] @@ -175,9 +174,24 @@ class NetworksModel(object): except KeyError: raise MissingParameter("KCHNET0004E", {'name': params['name']}) - # Linux bridges cannot be the trunk device of a VLAN - if 'vlan_id' in params and \ - (netinfo.is_bridge(iface) or params['connection'] == "bridge"): + def _set_network_macvtap(self, params): + self._check_network_interface(params) + + iface = params['interface'] + if 'vlan_id' in params or not (netinfo.is_bare_nic(iface) or + netinfo.is_bonding(iface)): + raise InvalidParameter('KCHNET0028E', {'name': iface}) + + # set macvtap network + params['forward'] = {'mode': 'bridge', 'dev': iface} + + def _set_network_bridge(self, params): + self._check_network_interface(params) + params['forward'] = {'mode': 'bridge'} + + # Bridges cannot be the trunk device of a VLAN + iface = params['interface'] + if 'vlan_id' in params and netinfo.is_bridge(iface): raise InvalidParameter('KCHNET0019E', {'name': iface}) # User specified bridge interface, simply use it @@ -189,29 +203,22 @@ class NetworksModel(object): if netinfo.is_ovs_bridge(iface): params['ovs'] = True - # OVS bridges don't work with macvtap - if params['connection'] != "bridge": - raise InvalidParameter('KCHNET0026E') - - # User wants Linux bridge network, but didn't specify bridge interface - elif params['connection'] == "bridge": - - # libvirt will fail to create bridge if NetworkManager is enabled - if self.caps.nm_running: - raise InvalidParameter('KCHNET0027E') - - # create Linux bridge interface first and use it as actual iface - iface = self._create_linux_bridge(iface) - params['bridge'] = iface - # connection == macvtap and iface is not bridge elif netinfo.is_bare_nic(iface) or netinfo.is_bonding(iface): - if params.get('vlan_id') is None: - params['forward']['dev'] = iface - else: + if 'vlan_id' in params: params['bridge'] = \ self._create_vlan_tagged_bridge(str(iface), str(params['vlan_id'])) + else: + # libvirt bridge creation will fail with NetworkManager enabled + if self.caps.nm_running: + raise InvalidParameter('KCHNET0027E') + + # create Linux bridge interface and use it as actual iface + iface = self._create_linux_bridge(iface) + params['bridge'] = iface + + # unrecognized interface type: fail else: raise InvalidParameter("KCHNET0007E") -- 1.9.1

3 3

[PATCH] [Kimchi] New UI for adding network bridges V4
by peterpnns＠gmail.com 10 Feb '16

10 Feb '16

From: peterpennings <peterpnns(a)gmail.com> Fixed: * Enable VLAN is now being showed after loadinterfaces callback function. peterpennings (1): Issue #791: New UI for adding network bridges netinfo.py | 3 +- ui/js/src/kimchi.network.js | 2 + ui/js/src/kimchi.network_add_main.js | 146 ++++++++++++++++++++--------------- ui/pages/network-add.html.tmpl | 5 +- 4 files changed, 88 insertions(+), 68 deletions(-) -- 2.5.0

3 3

[PATCH v3] [Kimchi] Create new volume and attach to VM
by Socorro Stoppler 10 Feb '16

10 Feb '16

v3: Default to 'qcow2' format for new disk kimchi_isos removed from list of storage pools for new disk v2: Add ".img" to name of new volume being created v1: This is the initial checkin for creating a new volume and attaching to VM when editing a guest. Not sure of all the supported cases, but tried default pool and qcow2 format per the example provided in the back-end patch and it was successful. Known issue - which currently exists in the code already in master - code is broken when VM is running. This patch does not address that. It will get addressed separately. Socorro Stoppler (1): Create new volume and attach to VM Add ".img" to name of new volume Default to 'qcow2' for new disk and not list kimchi_isos in pool ui/js/src/kimchi.guest_storage_add.main.js | 327 ++++++++++++++++++++++++----- ui/pages/guest-storage-add.html.tmpl | 58 +++-- 2 files changed, 322 insertions(+), 63 deletions(-) -- 1.9.1

2 2

[RFC] VEPA network support
by Daniel Henrique Barboza 10 Feb '16

10 Feb '16

The first version of the feature was sent to the ML but, due to the proposed changes in the reviews, I believe a RFC is required before sending a v2. This would be the revised networks API: ### Collection: Networks **URI:** /plugins/kimchi/networks **Methods:** * **GET**: Retrieve a summarized list of all defined Networks * **POST**: Create a new Network * name: The name of the Network * connection: Specifies how this network should be connected to the other networks visible to this host. * isolated: Create a private, isolated virtual network. * nat: Outgoing traffic will be routed through the host. * macvtap: All traffic on this network will be bridged through the specified interface. * bridge: All traffic on this network will be bridged through a Linux bridged, which is created upon specified interface in case it is not already a Linux bridge. * vepa: All traffic will be forward to one or more physical devices directly connected to a VEPA-enabled switch. * subnet *(optional)*: Network segment in slash-separated format with ip address and prefix or netmask used to create nat network. * interfaces *(optional)*: An array of network interfaces on the host. For "macvtap" and "bridge" connections, the interface can be a nic, bridge or bonding device. For "vepa" connections, at least one physical device must be declared * vlan_id *(optional)*: VLAN tagging ID for the macvtap bridge network. The changes are: - a new mode called "vepa" - 'interface' parameter renamed to 'interfaces', which is now an array. This was made to prevent the creation of a separated parameter for VEPA devices. Of course, this will change all the existing APIs for all the other networks, which would now read 'interface[0]' instead of 'interface' No changes in the 'interface' API will be required. Daniel

2 2

[PATCH v2] [Kimchi 0/8] Web serial console
by Jose Ricardo Ziviani 10 Feb '16

10 Feb '16

v2: - applied code review - updated the build system This is the initial version of a web serial console for kimchi/libvirt VMs. When a VM is turned on, a new action is displayed named "Connect Serial", this will open a new tab with an interface like the existing novnc. That interface opens a websocket to kimchi webserver (nginx), then it is redirected to websockify. Websockify will proxy that connection to a local unix socket server to finally communicate with the guest console. I chose to create one server per guest because that's the way websockify was designed (it was born inside novnc), so I could reuse the token security plugin implemented in websockify. In order to avoid wasting resources I decided to user unix socket, a local/lightweight/reliable socket if compared with internet sockets, this uses files instead of ports to accept connections. When a connection is established no one else can get that console (I'm not multiplexing it but it's possible in future). The serial console will be available again if the current user does one of: - type ctrl+q - close the tab - 2 min. timeout Thanks Jose Ricardo Ziviani (8): Rename vnc.py to websocket.py Implement the web serial console server Implement the backend to support web serial console Implement the web serial console front-end Import term.js to Kimchi project Implement the Kimchi front-end for the web serial console Update the build system to make the serial console Add test case for the socket server Makefile.am | 4 +- config.py.in | 6 +- configure.ac | 2 + control/vms.py | 3 +- i18n.py | 3 + model/vms.py | 43 +- root.py | 6 +- serialconsole.py | 315 +++ tests/test_model.py | 28 +- ui/Makefile.am | 2 +- ui/js/src/kimchi.api.js | 27 + ui/js/src/kimchi.guest_main.js | 14 +- ui/pages/guest.html.tmpl | 3 +- ui/serial/Makefile.am | 23 + ui/serial/images/Makefile.am | 21 + ui/serial/images/favicon.ico | Bin 0 -> 15086 bytes ui/serial/serial.html | 99 + ui/serial/term.js | 5973 ++++++++++++++++++++++++++++++++++++++++ vnc.py | 92 - websocket.py | 122 + 20 files changed, 6677 insertions(+), 109 deletions(-) create mode 100644 serialconsole.py create mode 100644 ui/serial/Makefile.am create mode 100644 ui/serial/images/Makefile.am create mode 100644 ui/serial/images/favicon.ico create mode 100644 ui/serial/serial.html create mode 100644 ui/serial/term.js delete mode 100644 vnc.py create mode 100644 websocket.py -- 1.9.1

3 12

[PATCH] [Wok 0/6] Add script to verify IBM license header and copyright date
by Aline Manera 10 Feb '16

10 Feb '16

Aline Manera (6): Remove legacy code under ui/js/widgets Add script to verify IBM copyright date Update IBM copyright according to check-IBM-license-header.sh script Add missing license header Verify IBM license header and copyright date on make check-local Delete useless error message IBM-license-blacklist | 97 +++++ Makefile.am | 30 +- build-all.sh | 2 +- check-IBM-license-header.sh | 41 ++ check_ui_code_errors.sh | 2 +- contrib/DEBIAN/postinst | 2 +- contrib/DEBIAN/postrm | 2 +- contrib/check_i18n.py | 2 +- contrib/make-deb.sh.in | 20 + contrib/wokd-upstart.conf.debian | 2 +- contrib/wokd-upstart.conf.fedora | 2 +- contrib/wokd.sysvinit | 2 +- po/de_DE.po | 4 +- po/en_US.po | 4 +- po/es_ES.po | 4 +- po/fr_FR.po | 4 +- po/gen-pot.in | 20 + 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 +- src/nginx/wok.conf.in | 2 +- src/wok/Makefile.am | 2 +- src/wok/__init__.py | 2 +- src/wok/asynctask.py | 2 +- src/wok/auth.py | 2 +- src/wok/basemodel.py | 2 +- src/wok/cachebust.py | 2 +- src/wok/config.py.in | 2 +- src/wok/control/Makefile.am | 2 +- src/wok/control/__init__.py | 2 +- src/wok/control/base.py | 2 +- src/wok/control/config.py | 2 +- src/wok/control/plugins.py | 2 +- src/wok/control/tasks.py | 2 +- src/wok/control/utils.py | 2 +- src/wok/exception.py | 2 +- src/wok/i18n.py | 2 +- src/wok/model/Makefile.am | 2 +- src/wok/model/__init__.py | 2 +- src/wok/model/config.py | 2 +- src/wok/model/model.py | 2 +- src/wok/model/plugins.py | 2 +- src/wok/model/tasks.py | 2 +- src/wok/objectstore.py | 2 +- src/wok/plugins/Makefile.am | 2 +- src/wok/plugins/__init__.py | 2 +- src/wok/plugins/sample/Makefile.am | 2 +- src/wok/plugins/sample/__init__.py | 2 +- src/wok/plugins/sample/i18n.py | 2 +- src/wok/plugins/sample/model.py | 2 +- src/wok/plugins/sample/po/en_US.po | 6 +- src/wok/plugins/sample/po/gen-pot | 19 + src/wok/plugins/sample/po/pt_BR.po | 6 +- src/wok/plugins/sample/po/zh_CN.po | 6 +- src/wok/plugins/sample/ui/Makefile.am | 2 +- src/wok/plugins/sample/ui/config/Makefile.am | 2 +- src/wok/plugins/sample/ui/js/Makefile.am | 2 +- src/wok/plugins/sample/ui/js/util.js | 2 +- src/wok/plugins/sample/ui/pages/Makefile.am | 2 +- src/wok/plugins/sample/ui/pages/i18n.json.tmpl | 2 +- .../plugins/sample/ui/pages/sample-tab1.html.tmpl | 2 +- .../plugins/sample/ui/pages/sample-tab2.html.tmpl | 2 +- src/wok/proxy.py | 2 +- src/wok/rollbackcontext.py | 2 +- src/wok/root.py | 2 +- src/wok/server.py | 2 +- src/wok/sslcert.py | 2 +- src/wok/template.py | 2 +- src/wok/utils.py | 2 +- src/wok/xmlutils/Makefile.am | 2 +- src/wok/xmlutils/__init__.py | 2 +- src/wok/xmlutils/utils.py | 2 +- src/wokd.in | 2 +- tests/Makefile.am | 2 +- tests/__init__.py | 2 +- tests/run_tests.sh.in | 2 +- tests/test_api.py | 2 +- tests/test_config.py.in | 2 +- tests/test_exception.py | 2 +- tests/test_objectstore.py | 2 +- tests/test_plugin.py | 2 +- tests/test_rollbackcontext.py | 2 +- tests/test_server.py | 2 +- tests/test_utils.py | 2 +- tests/utils.py | 2 +- ui/Makefile.am | 2 +- ui/base64/Makefile.am | 2 +- ui/css/Makefile.am | 2 +- ui/css/bootstrap-select.custom.css | 2 +- ui/css/bootstrap.custom.css | 2 +- ui/css/fontawesome/Makefile.am | 2 +- ui/css/jquery-ui.custom.css | 2 +- ui/css/opensans/Makefile.am | 2 +- ui/css/src/bootstrap-select.custom.scss | 2 +- ui/css/src/bootstrap.custom.scss | 2 +- ui/css/src/modules/_about.scss | 2 +- ui/css/src/modules/_animation.scss | 2 +- ui/css/src/modules/_base.scss | 2 +- ui/css/src/modules/_buttons.scss | 2 +- ui/css/src/modules/_datagrid.scss | 2 +- ui/css/src/modules/_loaders.scss | 2 +- ui/css/src/modules/_login.scss | 2 +- ui/css/src/modules/_menu-flat.scss | 2 +- ui/css/src/modules/_mixins.scss | 2 +- ui/css/src/modules/_modal-flat.scss | 2 +- ui/css/src/modules/_navbar-flat.scss | 2 +- ui/css/src/modules/_tables-flat.scss | 2 +- ui/css/src/modules/_toolbar.scss | 2 +- ui/css/src/modules/_utils.scss | 2 +- ui/css/src/modules/_validation.scss | 2 +- ui/css/src/modules/_wok-confirm.scss | 2 +- ui/css/src/modules/_wok-forms.scss | 2 +- ui/css/src/modules/_wok-grid.scss | 2 +- ui/css/src/modules/_wok-variables.scss | 2 +- ui/css/src/wok.scss | 2 +- ui/css/theme-default/about.css | 2 +- ui/css/theme-default/base.css | 2 +- ui/css/theme-default/button-flat.css | 2 +- ui/css/theme-default/button.css | 2 +- ui/css/theme-default/checkbox-flat.css | 2 +- ui/css/theme-default/circleGauge.css | 2 +- ui/css/theme-default/datagrid.css | 2 +- ui/css/theme-default/dialog-flat.css | 2 +- ui/css/theme-default/error.css | 2 +- ui/css/theme-default/form.css | 2 +- ui/css/theme-default/framework.css | 2 +- ui/css/theme-default/gauge-flat.css | 2 +- ui/css/theme-default/grid.css | 2 +- ui/css/theme-default/jquery-ui.custom.css | 2 +- ui/css/theme-default/line-chart.css | 2 +- ui/css/theme-default/line.css | 2 +- ui/css/theme-default/list-flat.css | 2 +- ui/css/theme-default/login-window.css | 2 +- ui/css/theme-default/menu-flat.css | 2 +- ui/css/theme-default/message-flat.css | 2 +- ui/css/theme-default/message.css | 2 +- ui/css/theme-default/messagebar-flat.css | 2 +- ui/css/theme-default/nav-tree.css | 2 +- ui/css/theme-default/navbar.css | 2 +- ui/css/theme-default/popover.css | 2 +- ui/css/theme-default/radio-flat.css | 2 +- ui/css/theme-default/reset.css | 2 +- ui/css/theme-default/selectmenu-flat.css | 2 +- ui/css/theme-default/tabs.css | 2 +- ui/css/theme-default/textbox-flat.css | 2 +- ui/css/theme-default/theme.css | 2 +- ui/css/theme-default/tile-check.css | 2 +- ui/css/theme-default/toolbar.css | 2 +- ui/css/theme-default/topbar.css | 2 +- ui/css/theme-default/window.css | 2 +- ui/css/wok.css | 2 +- ui/images/Makefile.am | 2 +- ui/images/theme-default/Makefile.am | 2 +- ui/js/Makefile.am | 6 +- ui/js/src/wok.api.js | 2 +- ui/js/src/wok.confirm.js | 2 +- ui/js/src/wok.cookie.js | 2 +- ui/js/src/wok.datagrid.js | 2 +- ui/js/src/wok.form.js | 2 +- ui/js/src/wok.grid.js | 2 +- ui/js/src/wok.lang.js | 2 +- ui/js/src/wok.line-chart.js | 2 +- ui/js/src/wok.list.js | 2 +- ui/js/src/wok.login.js | 2 +- ui/js/src/wok.main.js | 2 +- ui/js/src/wok.message.js | 2 +- ui/js/src/wok.object.js | 2 +- ui/js/src/wok.popable.js | 2 +- ui/js/src/wok.select.js | 2 +- ui/js/src/wok.string.js | 2 +- ui/js/src/wok.substitute.js | 2 +- ui/js/src/wok.topic.js | 2 +- ui/js/src/wok.user.js | 2 +- ui/js/src/wok.utils.js | 2 +- ui/js/src/wok.window.js | 2 +- ui/js/widgets/button-dropDown.js | 37 -- ui/js/widgets/button-flat.js | 421 --------------------- ui/js/widgets/checkbox-flat.js | 88 ----- ui/js/widgets/circleGauge.js | 102 ----- ui/js/widgets/combobox.js | 129 ------- ui/js/widgets/dialog-flat.js | 122 ------ ui/js/widgets/filter-select.js | 138 ------- ui/js/widgets/gauge-flat.js | 128 ------- ui/js/widgets/line.js | 74 ---- ui/js/widgets/list-flat.js | 78 ---- ui/js/widgets/menu-flat.js | 116 ------ ui/js/widgets/message-flat.js | 99 ----- ui/js/widgets/messagebar-flat.js | 73 ---- ui/js/widgets/radio-flat.js | 88 ----- ui/js/widgets/samples/README.md | 1 - ui/js/widgets/samples/dialog.html | 53 --- ui/js/widgets/samples/gauge-flat.html | 55 --- ui/js/widgets/samples/grid.html | 82 ---- ui/js/widgets/samples/line.html | 170 --------- ui/js/widgets/samples/list.html | 48 --- .../menu-button-radio-checkbox-text-select.html | 104 ----- ui/js/widgets/samples/message.html | 51 --- ui/js/widgets/samples/messagebar-flat.html | 51 --- ui/js/widgets/samples/tabs.html | 70 ---- ui/js/widgets/select-menu.js | 86 ----- ui/js/widgets/selectmenu-flat.js | 132 ------- ui/js/widgets/textbox-flat.js | 41 -- ui/libs/Makefile.am | 2 +- ui/libs/bootstrap-editable/Makefile.am | 2 +- ui/libs/bootstrap-editable/dist/Makefile.am | 2 +- ui/libs/bootstrap-editable/dist/css/Makefile.am | 2 +- ui/libs/bootstrap-editable/dist/js/Makefile.am | 2 +- ui/libs/bootstrap-select/Makefile.am | 2 +- ui/libs/bootstrap-select/dist/Makefile.am | 2 +- ui/libs/bootstrap-select/dist/css/Makefile.am | 2 +- ui/libs/bootstrap-select/dist/js/Makefile.am | 2 +- ui/libs/bootstrap-switch/Makefile.am | 2 +- ui/libs/bootstrap-switch/dist/Makefile.am | 2 +- ui/libs/bootstrap-switch/dist/css/Makefile.am | 2 +- ui/libs/bootstrap-switch/dist/js/Makefile.am | 2 +- ui/libs/bootstrap/Makefile.am | 2 +- ui/libs/es5-shim/Makefile.am | 2 +- ui/libs/jquery-bootgrid/Makefile.am | 2 +- ui/libs/jquery-bootgrid/dist/Makefile.am | 2 +- ui/libs/jquery-bootgrid/dist/css/Makefile.am | 2 +- ui/libs/jquery-bootgrid/dist/js/Makefile.am | 2 +- ui/libs/jquery-i18n/Makefile.am | 2 +- ui/libs/jquery-ui/Makefile.am | 2 +- ui/libs/jquery-ui/themes/Makefile.am | 2 +- ui/libs/jquery-ui/themes/base/Makefile.am | 2 +- ui/libs/jquery-ui/themes/base/images/Makefile.am | 2 +- ui/libs/jquery/Makefile.am | 2 +- ui/libs/list-js/Makefile.am | 2 +- ui/libs/typeahead/Makefile.am | 2 +- ui/pages/Makefile.am | 2 +- ui/pages/error.html.tmpl | 2 +- ui/pages/i18n.json.tmpl | 3 +- ui/pages/login.html.tmpl | 2 +- ui/pages/wok-ui.html.tmpl | 2 +- 238 files changed, 437 insertions(+), 2876 deletions(-) create mode 100644 IBM-license-blacklist create mode 100755 check-IBM-license-header.sh delete mode 100644 ui/js/widgets/button-dropDown.js delete mode 100755 ui/js/widgets/button-flat.js delete mode 100644 ui/js/widgets/checkbox-flat.js delete mode 100644 ui/js/widgets/circleGauge.js delete mode 100644 ui/js/widgets/combobox.js delete mode 100644 ui/js/widgets/dialog-flat.js delete mode 100644 ui/js/widgets/filter-select.js delete mode 100755 ui/js/widgets/gauge-flat.js delete mode 100644 ui/js/widgets/line.js delete mode 100644 ui/js/widgets/list-flat.js delete mode 100644 ui/js/widgets/menu-flat.js delete mode 100644 ui/js/widgets/message-flat.js delete mode 100644 ui/js/widgets/messagebar-flat.js delete mode 100644 ui/js/widgets/radio-flat.js delete mode 100644 ui/js/widgets/samples/README.md delete mode 100644 ui/js/widgets/samples/dialog.html delete mode 100644 ui/js/widgets/samples/gauge-flat.html delete mode 100644 ui/js/widgets/samples/grid.html delete mode 100644 ui/js/widgets/samples/line.html delete mode 100644 ui/js/widgets/samples/list.html delete mode 100644 ui/js/widgets/samples/menu-button-radio-checkbox-text-select.html delete mode 100644 ui/js/widgets/samples/message.html delete mode 100644 ui/js/widgets/samples/messagebar-flat.html delete mode 100644 ui/js/widgets/samples/tabs.html delete mode 100644 ui/js/widgets/select-menu.js delete mode 100644 ui/js/widgets/selectmenu-flat.js delete mode 100644 ui/js/widgets/textbox-flat.js -- 2.5.0

2 8

[PATCH] [Wok] Make sure to use absolute path when doing a server redirection
by Aline Manera 10 Feb '16

10 Feb '16

When supporting plugins, the format URI does not correspond to the full URI path. So fix it to avoid problems when doing server redirection. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/wok/control/base.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/wok/control/base.py b/src/wok/control/base.py index e1591b5..327e494 100644 --- a/src/wok/control/base.py +++ b/src/wok/control/base.py @@ -60,18 +60,20 @@ class Resource(object): self.admin_methods = [] def _redirect(self, action_result, code=303): + uri_params = [] if isinstance(action_result, list): - uri_params = [] for arg in action_result: if arg is None: arg = '' uri_params.append(urllib2.quote(arg.encode('utf-8'), safe="")) - raise cherrypy.HTTPRedirect(self.uri_fmt % tuple(uri_params), code) elif action_result is not None and action_result != self.ident: uri_params = list(self.model_args[:-1]) uri_params += [urllib2.quote(action_result.encode('utf-8'), safe="")] - raise cherrypy.HTTPRedirect(self.uri_fmt % tuple(uri_params), code) + + if uri_params: + base_uri = cherrypy.request.app.script_name + self.uri_fmt + raise cherrypy.HTTPRedirect(base_uri % tuple(uri_params), code) def generate_action_handler(self, action_name, action_args=None, destructive=False): -- 2.5.0

2 2

[PATCH] [Kimchi] New UI for adding network bridges V3
by peterpnns＠gmail.com 08 Feb '16

08 Feb '16

From: peterpennings <peterpnns(a)gmail.com> This patch adds Linux and OVS bridges. netinfo.py had to be updated to show OVS bridges in order to reflect the changes made in the UI. V2: * Fixed error messages * Fixed function name * Form validations V3: * Fixed submit function to send the name of interface instead of type. peterpennings (1): Issue #791: New UI for adding network bridges netinfo.py | 3 +- ui/js/src/kimchi.network.js | 2 + ui/js/src/kimchi.network_add_main.js | 152 ++++++++++++++++++++--------------- ui/pages/network-add.html.tmpl | 5 +- 4 files changed, 95 insertions(+), 67 deletions(-) -- 2.5.0

2 2