August 2015 - Kimchi-devel - oVirt List Archives

Re: [Kimchi-devel] Fwd: Proposal for moving functionality from Kimchi to Ginger
by Daniel Henrique Barboza 07 Aug '15

07 Aug '15

On 08/04/2015 04:56 AM, Walter Niklaus wrote: > Hi Daniel, > > sorry for missing the thread where this topic was discussed. > > I can fully understand the point about Basic Information and System > Statistics being relevant for Virtualization management as well and I > like the idea of potentially making it part of the base framework > because they would be very usefull for other plugins, like > Container-Management as well. > The interesting question is then if some of the other functions > wouldn't make sense to be part of the basic framework as well. Debug > reports would be a classical candidate from my point of view, but > wouldn't some of the other functions be usefull in the base as well ? If we're really going in that approach (putting basic features in WoK), I agree. We would have to discuss each existing feature and evaluate if it belongs to kimchi, ginger or wok. > > Looking at the problem form a different angle: wouldn't it make sense > to package and deliver the base framework with the Ginger plugin by > default because the Host-functionality Ginger is offering would be > usefull for the other plugins like Virtualization and Containers ? > > What I missed in my previous mail is the aspect about platform > specific functionality. This functionality, like PPC firmware update > or IO-device management for Linux on z should be made available as > individual plugins. At this moment Ginger can handle multi-arch features fairly well. For example, Firmware Update does not appear when running the plug-in in an Intel computer. The feature you mentioned, IO-device management for Linux on Z, would be available only when running Ginger in a Linux for Z host. There's absolutely nothing holding you from making a brand new plug-in for the Z features instead of adding them to Ginger, but it is important to know that Ginger is designed for these scenarios. You can even create a new UI tab in Ginger, something like 'Z management' which would contain all Z related features. This tab would only appear in a Linux on Z host. From the UI perspective it looks like a brand new plug-in working together with Ginger common features in the 'Administration' tab. > > Please let me know what you think about this option. > > Thanks, > Walter. > > > On 03.08.2015 18:51, Daniel Henrique Barboza wrote: >> Hi Walter, >> >> We've had this discussion with the community a few months ago in the >> thread >> >> "[RFC] Moving some features of Host tab to Ginger" >> >> And we agreed to start it by moving only Software Update, >> Repositories and >> Debug Reports from Kimchi to Ginger. >> >> The Basic Information and System Statistics can't be taken away from >> Kimchi because there >> are relevant information for the creation of VMs there, such as >> Memory Available. But I agree >> that these information fits nicely in Ginger too. >> >> One alternative (just came in my head now) is to move these "neutral" >> functions >> to a "Basic System Info" in WoK. That way both Kimchi and Ginger >> users can access >> the information. >> >> >> Thanks, >> >> >> Daniel >> >> On 08/03/2015 12:15 PM, Walter Niklaus wrote: >>> >>> After separating out Kimchi as an indvidual plugin from the base >>> framework it would be great to have a clean separation between Host- >>> and >>> Virtualization Management functions. I'm planning to work on this topic >>> in the next few weeks and have prepared a proposal of the >>> functionsplit. >>> Plugin functionality: >>> - Ginger: >>> - Basic Information >>> - System Statistics >>> - Network (Host NICs) >>> - Storage/SAN (Host Storage) >>> - User Management >>> - Configuration Backup >>> - Software Updates >>> - Repositories >>> - Debug Reports >>> - PPC related functions: Firmware Update & Power Management >>> - Kimchi: >>> - Templates >>> - Guests >>> - Networks (virtual) >>> - Storage (Pools for VMs) >>> >>> Since there are plans to restructure the UI for one of the next >>> releases, I'm proposing to do only some minimal investments in >>> reflecting this new finctionsplit. Therefore I'm proposing to make the >>> Host tab as the one and only Tab for Ginger and move everything from >>> the >>> Administration Tab into the Host Tab. This would be just an >>> intermediate solution till we implement the new UI design. Please see >>> the attached PDF. >>> Thanks in advance for your feedback. >>> >>> Walter. >>> >>> >>> >>> >>> >>> >>> >>> >>> >>> >>> >>> _______________________________________________ >>> Kimchi-devel mailing list >>> Kimchi-devel(a)ovirt.org >>> http://lists.ovirt.org/mailman/listinfo/kimchi-devel >> >> >> >> _______________________________________________ >> Kimchi-devel mailing list >> Kimchi-devel(a)ovirt.org >> http://lists.ovirt.org/mailman/listinfo/kimchi-devel >

4 6

Re: [Kimchi-devel] [PATCH 1/1] Enabling help page for wok base. This commit supports en_US only.
by Aline Manera 07 Aug '15

07 Aug '15

On 07/08/2015 03:33, Suresh Babu14 wrote: > Hi Aline, > Current WOK page has "Help" button, which renders blank page. If you > think we don't need help page for WOK, i suggest we shouldn't have > Help button. Or going with your line ""I think it is hard to us to > point the user to any specific plugin like kimchi or ginger, as anyone > can develop a wok plugin and host anywhere" -- we can always modify > the help message to exclude what plugins can be installed. > I've just replied to other email in this thread about it. There was a logic to do not display the help when the plugin does not provide it. I am not sure it was moved to wok or not. We need to check and do the appropriated fixes.

1 0

Re: [Kimchi-devel] [PATCH 1/1] Enabling help page for wok base. This commit supports en_US only.
by Aline Manera 07 Aug '15

07 Aug '15

On 06/08/2015 16:53, Harshal Patil wrote: > If no one else is going to do that, then I don't mind implementing it. > How are you going to track who is implementing what? Usually a github > issue is used with tags like 'feature' (e.g. > https://github.com/docker/distribution/issues/200) Yeap! Please, open an issue on github and also add a comment there saying you will do the work and I will assign it to you. You will not be able to set the tag, but I can do that while assign the issue to you. > ----- Original message ----- > From: Aline Manera <alinefm(a)linux.vnet.ibm.com> > To: Harshal Patil/India/IBM@IBMIN > Cc: kimchi-devel(a)ovirt.org, sureshab(a)linux.vnet.ibm.com > Subject: Re: [Kimchi-devel] [PATCH 1/1] Enabling help page for wok > base. This commit supports en_US only. > Date: Fri, Aug 7, 2015 1:12 AM > > > On 06/08/2015 16:38, Harshal Patil wrote: >> Sounds awesome Aline! >> So we will have wok front page with just basic documentations on >> API and nothing else? > > I thought in a "Welcome to Wok" message and some information about > plugins install and what else is important. > > Are you going to implement it? If so, I suggest you to send > mockups layouts prior doing the code itself. So we can opine on > what to add, where to display, etc =) >> what about host stats or basic info? Just making sure we are on >> the same page. > > They will not be part of wok as they are not related to web server > configuration. > Probably creating an other plugin to expose the APIs we want and > reuse for Kimchi and Ginger when needed. >> >> ----- Original message ----- >> From: Aline Manera <alinefm(a)linux.vnet.ibm.com> >> <mailto:alinefm@linux.vnet.ibm.com> >> To: Harshal Patil/India/IBM@IBMIN >> Cc: kimchi-devel(a)ovirt.org <mailto:kimchi-devel@ovirt.org>, >> sureshab(a)linux.vnet.ibm.com <mailto:sureshab@linux.vnet.ibm.com> >> Subject: Re: [Kimchi-devel] [PATCH 1/1] Enabling help page >> for wok base. This commit supports en_US only. >> Date: Fri, Aug 7, 2015 12:32 AM >> >> >> On 06/08/2015 14:42, Harshal Patil wrote: >>> If you are looking at wok just as a web framework which >>> developers can use to write plugins for, then it doesn't >>> need to have any user facing webpage at all. Developers >>> would need to interact with wok's API anyway. >>> Now you can always create a marketplace for the wok plugins >>> where users can download and install plugins on them on >>> the fly and that could be the only page wok can serve on >>> it's own without any plugins. ;-) >> >> Yeap!! I have thought about it too. >> >> My idea (for future, of course) is adding to wok a >> "Configuration tab" so user can configure wok settings >> through UI. >> For example, which authentication method to use, which >> plugins to install/uninstall/enable/disable, authorization >> settings and any other setting related to the web sever config. >> >> It is the same approach we have on Jenkins. >>> But if that's not on the table then wok could only display >>> basic API usage for its plugin developers on default index >>> page, probably a button to load bare minimum sample plugin >>> as a proof of concept. >> >> Yeap! I think we should go on that way by now and on future >> we can implement the "Configuration tab" for wok. >> >> Sounds a good plan for you? >>> >>> ----- Original message ----- >>> From: Aline Manera <alinefm(a)linux.vnet.ibm.com> >>> <mailto:alinefm@linux.vnet.ibm.com> >>> Sent by: kimchi-devel-bounces(a)ovirt.org >>> <mailto:kimchi-devel-bounces@ovirt.org> >>> To: sureshab(a)linux.vnet.ibm.com >>> <mailto:sureshab@linux.vnet.ibm.com>, >>> kimchi-devel(a)ovirt.org <mailto:kimchi-devel@ovirt.org> >>> Cc: >>> Subject: Re: [Kimchi-devel] [PATCH 1/1] Enabling help >>> page for wok base. This commit supports en_US only. >>> Date: Thu, Aug 6, 2015 8:02 PM >>> I don't think we need a help page for Wok framework. >>> >>> We have a lot to discuss on that, but the initial idea >>> was to load a >>> simple page when running wok without any plugin. >>> That page would describe the wok proposal - as a web >>> server framework >>> based on plugins. >>> >>> I think it is hard to us to point the user to any >>> specific plugin like >>> kimchi or ginger, as anyone can develop a wok plugin and >>> host anywhere. >>> >>> I am more for a generic simple page and no help. >>> >>> More (and different) thoughts on it are more than >>> welcome. =) >>> >>> On 04/08/2015 10:04, sureshab(a)linux.vnet.ibm.com >>> <mailto:sureshab@linux.vnet.ibm.com> wrote: >>> > From: Suresh Babu Angadi <sureshab(a)linux.vnet.ibm.com> >>> <mailto:sureshab@linux.vnet.ibm.com> >>> > >>> > Signed-off-by: Suresh Babu Angadi >>> <sureshab(a)linux.vnet.ibm.com> >>> <mailto:sureshab@linux.vnet.ibm.com> >>> > --- >>> > configure.ac | 2 + >>> > src/wok/config.py.in | 5 + >>> > ui/js/src/wok.main.js | 9 +- >>> > ui/pages/Makefile.am | 2 +- >>> > ui/pages/help/Makefile.am | 34 +++++++ >>> > ui/pages/help/dita-help.xsl | 26 +++++ >>> > ui/pages/help/en_US/Makefile.am | 23 +++++ >>> > ui/pages/help/en_US/wokhelp.dita | 27 +++++ >>> > ui/pages/help/wok.css | 208 >>> +++++++++++++++++++++++++++++++++++++++ >>> > 9 files changed, 333 insertions(+), 3 deletions(-) >>> > create mode 100644 ui/pages/help/Makefile.am >>> > create mode 100644 ui/pages/help/dita-help.xsl >>> > create mode 100644 ui/pages/help/en_US/Makefile.am >>> > create mode 100644 ui/pages/help/en_US/wokhelp.dita >>> > create mode 100644 ui/pages/help/wok.css >>> > >>> > diff --git a/configure.ac b/configure.ac >>> > index 47c2e6c..ee4d793 100644 >>> > --- a/configure.ac >>> > +++ b/configure.ac >>> > @@ -115,6 +115,8 @@ AC_CONFIG_FILES([ >>> > ui/libs/themes/base/Makefile >>> > ui/libs/themes/base/images/Makefile >>> > ui/pages/Makefile >>> > + ui/pages/help/Makefile >>> > + ui/pages/help/en_US/Makefile >>> > ui/pages/websockify/Makefile >>> > contrib/Makefile >>> > contrib/DEBIAN/Makefile >>> > diff --git a/src/wok/config.py.in b/src/wok/config.py.in >>> > index 5ffa936..c158a75 100644 >>> > --- a/src/wok/config.py.in >>> > +++ b/src/wok/config.py.in >>> > @@ -142,6 +142,11 @@ class WokConfig(dict): >>> > '/wok-ui.html': { >>> > 'tools.wokauth.on': True >>> > }, >>> > + '/help': { >>> > + 'tools.staticdir.on': True, >>> > + 'tools.staticdir.dir': '%s/ui/pages/help' >>> % paths.prefix, >>> > + 'tools.nocache.on': True >>> > + } >>> > } >>> > >>> > def __init__(self): >>> > diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js >>> > index f4c9940..3dd76b8 100644 >>> > --- a/ui/js/src/wok.main.js >>> > +++ b/ui/js/src/wok.main.js >>> > @@ -349,7 +349,12 @@ wok.checkHelpFile = function(path) { >>> > >>> > wok.openHelp = function(e) { >>> > var tab = $('#nav-menu a.current'); >>> > - var url = >>> $(tab).parent().find("input[name='helpPath']").val(); >>> > - window.open(url, "Wok Help"); >>> > + if (tab.length == 0 ){ >>> > + window.open("help/en_US/wokhelp.html","Wok Help") >>> > + } >>> > + else { >>> > + var url = >>> $(tab).parent().find("input[name='helpPath']").val(); >>> > + window.open(url, "Wok Help"); >>> > + } >>> > e.preventDefault(); >>> > }; >>> > diff --git a/ui/pages/Makefile.am b/ui/pages/Makefile.am >>> > index 68f4c92..b3f5c2e 100644 >>> > --- a/ui/pages/Makefile.am >>> > +++ b/ui/pages/Makefile.am >>> > @@ -15,7 +15,7 @@ >>> > # See the License for the specific language >>> governing permissions and >>> > # limitations under the License. >>> > >>> > -SUBDIRS = websockify >>> > +SUBDIRS = websockify help >>> > >>> > htmldir = $(datadir)/wok/ui/pages >>> > >>> > diff --git a/ui/pages/help/Makefile.am >>> b/ui/pages/help/Makefile.am >>> > new file mode 100644 >>> > index 0000000..0dc8d9f >>> > --- /dev/null >>> > +++ b/ui/pages/help/Makefile.am >>> > @@ -0,0 +1,34 @@ >>> > +# Copyright IBM Corp, 2014 >>> > +# >>> > +# 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 >>> > + >>> > +SUBDIRS = en_US >>> > + >>> > +DITA_HTML_FILES = $(patsubst %.dita,%.html,$(wildcard >>> */*.dita)) >>> > +HTML_FILES = $(if $(DITA_HTML_FILES), >>> $(DITA_HTML_FILES), $(wildcard */*.html)) >>> > +DITA_XSL_FILE = dita-help.xsl >>> > + >>> > +EXTRA_DIST = $(DITA_XSL_FILE) >>> > + >>> > +helpdir = $(datadir)/wok/ui/pages/help >>> > + >>> > +dist_help_DATA = wok.css >>> > + >>> > +all: $(HTML_FILES) $(wildcard */*.dita) >>> > + >>> > +%.html: %.dita $(DITA_XSL_FILE) >>> > + xsltproc -o $@ $(DITA_XSL_FILE) $< >>> > + >>> > +CLEANFILES = $(HTML_FILES) >>> > \ No newline at end of file >>> > diff --git a/ui/pages/help/dita-help.xsl >>> b/ui/pages/help/dita-help.xsl >>> > new file mode 100644 >>> > index 0000000..fb49855 >>> > --- /dev/null >>> > +++ b/ui/pages/help/dita-help.xsl >>> > @@ -0,0 +1,26 @@ >>> > +<?xml version="1.0" encoding="UTF-8"?> >>> > +<xsl:stylesheet version="1.0" >>> > + >>> xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >>> <http://www.w3.org/1999/XSL/Transform> >>> > + xmlns="http://www.w3.org/1999/xhtml" >>> <http://www.w3.org/1999/xhtml>> >>> > + <xsl:output method="xml" indent="yes" >>> encoding="UTF-8" /> >>> > + >>> > + <xsl:template match="/"> >>> > + <html> >>> > + <head> >>> > + <title><xsl:value-of select="/cshelp/title" /></title> >>> > + <meta charset="UTF-8" /> >>> > + <link rel="shortcut icon" >>> href="https://mail.notes.na.collabserv.com/livemail/0/../images/logo.ico" >>> <https://mail.notes.na.collabserv.com/livemail/0/../images/logo.ico> >>> /> >>> > + <link rel="stylesheet" >>> type="text/css" >>> href="https://mail.notes.na.collabserv.com/livemail/0/wok.css" >>> <https://mail.notes.na.collabserv.com/livemail/0/wok.css> /> >>> > + </head> >>> > + <body> >>> > + <xsl:apply-templates select="//cshelp" /> >>> > + </body> >>> > + </html> >>> > + </xsl:template> >>> > + >>> > + <xsl:template match="cshelp"> >>> > + <h1><xsl:value-of select="title" /></h1> >>> > + <p class="shortdesc"><xsl:value-of >>> select="shortdesc" /></p> >>> > + <p class="csbody"><xsl:copy-of >>> select="csbody/node()" /></p> >>> > + </xsl:template> >>> > +</xsl:stylesheet> >>> > diff --git a/ui/pages/help/en_US/Makefile.am >>> b/ui/pages/help/en_US/Makefile.am >>> > new file mode 100644 >>> > index 0000000..b1e807d >>> > --- /dev/null >>> > +++ b/ui/pages/help/en_US/Makefile.am >>> > @@ -0,0 +1,23 @@ >>> > +# Copyright IBM Corp, 2014 >>> > +# >>> > +# 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 >>> > + >>> > +en_US_helpdir = $(datadir)/wok/ui/pages/help/en_US >>> > + >>> > +dist_en_US_help_DATA = $(wildcard *.html) $(NULL) >>> > + >>> > +EXTRA_DIST = $(wildcard *.dita) >>> > + >>> > +CLEANFILES = $(wildcard *.html) >>> > \ No newline at end of file >>> > diff --git a/ui/pages/help/en_US/wokhelp.dita >>> b/ui/pages/help/en_US/wokhelp.dita >>> > new file mode 100644 >>> > index 0000000..582e47b >>> > --- /dev/null >>> > +++ b/ui/pages/help/en_US/wokhelp.dita >>> > @@ -0,0 +1,27 @@ >>> > +<?xml version="1.0" encoding="UTF-8"?> >>> > + >>> > +<!DOCTYPE cshelp PUBLIC "-//IBM//DTD DITA CSHelp//EN" >>> > + "..\dtd\cshelp.dtd"> >>> > +<?Pub Sty _display FontColor="red"?> >>> > +<?Pub Inc?> >>> > + >>> > +<cshelp id="wokbase" xml:lang="en-us"> >>> > +<title>Wok (Webserver Originated from Kimchi)</title> >>> > +<shortdesc>Wok is a cherrypy-based web framework with >>> HTML5 support that is extended by plugins which expose >>> functionality through REST APIs.</shortdesc> >>> > +<csbody> >>> > +<p>Currently available plugins are Kimchi >>> (Virtualization Management) and Ginger (System >>> Administration). >>> > +Wok comes with a sample plugin for education >>> purposes.<ul> >>> > +<li><uicontrol>Download Kimchi : </uicontrol> >>> > +<a >>> href="https://github.com/kimchi-project/kimchi/tree/wok" >>> <https://github.com/kimchi-project/kimchi/tree/wok> >>> > +target="_blank" >>> >https://github.com/kimchi-project/kimchi/tree/wok</a> >>> > +</li> >>> > +<li><uicontrol>Download Ginger : </uicontrol> >>> > +<a >>> href="https://github.com/kimchi-project/ginger/tree/ginger_wok" >>> <https://github.com/kimchi-project/ginger/tree/ginger_wok> >>> > +target="_blank" >>> >https://github.com/kimchi-project/ginger/tree/ginger_wok</a> >>> > +</li> >>> > +</ul> >>> > +</p> >>> > +</csbody> >>> > +</cshelp> >>> > diff --git a/ui/pages/help/wok.css b/ui/pages/help/wok.css >>> > new file mode 100644 >>> > index 0000000..32fae4a >>> > --- /dev/null >>> > +++ b/ui/pages/help/wok.css >>> > @@ -0,0 +1,208 @@ >>> > +/* >>> > + * Project Kimchi >>> > + * >>> > + * Copyright IBM, Corp. 2014 >>> > + * >>> > + * Licensed under the Apache License, Version 2.0 >>> (the "License"); >>> > + * you may not use this file except in compliance >>> with the License. >>> > + * You may obtain a copy of the License at >>> > + * >>> > + * http://www.apache.org/licenses/LICENSE-2.0 >>> > + * >>> > + * Unless required by applicable law or agreed to in >>> writing, software >>> > + * distributed under the License is distributed on an >>> "AS IS" BASIS, >>> > + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, >>> either express or implied. >>> > + * See the License for the specific language >>> governing permissions and >>> > + * limitations under the License. >>> > + */ >>> > +BODY { >>> > + background: #FFFFFF; >>> > + margin-bottom: 1em; >>> > + margin-left: .5em; >>> > +} >>> > + >>> > +bold { >>> > + font-weight: bold; >>> > +} >>> > + >>> > +boldItalic { >>> > + font-weight: bold; >>> > + font-style: italic; >>> > +} >>> > + >>> > +italic { >>> > + font-style: italic; >>> > +} >>> > + >>> > +underlined { >>> > + text-decoration: underline; >>> > +} >>> > + >>> > +uicontrol { >>> > + font-weight: bold; >>> > +} >>> > + >>> > +filepath { >>> > + font-family: monospace, monospace; >>> > +}.option { >>> > + font-family: monospace, monospace; >>> > +} >>> > + >>> > +cmdname { >>> > + font-weight: bold; >>> > + font-family: monospace, monospace; >>> > +} >>> > + >>> > +.defparmname { >>> > + font-weight: bold; >>> > + text-decoration: underline; >>> > + font-family: monospace, monospace; >>> > +} >>> > + >>> > +.kwd { >>> > + font-weight: bold; >>> > +} >>> > + >>> > +.defkwd { >>> > + font-weight: bold; >>> > + text-decoration: underline; >>> > +} >>> > + >>> > +var { >>> > + font-style : italic; >>> > +} >>> > + >>> > +strongwintitle { >>> > + font-weight : bold; >>> > +} >>> > + >>> > +parmname { >>> > + font-weight: bold; >>> > + font-family: monospace, monospace; >>> > + white-space: nowrap; >>> > +} >>> > + >>> > +code { >>> > + font-family: monospace, monospace; >>> > +} >>> > + >>> > +pre { >>> > + font-family: monospace, monospace; >>> > +} >>> > + >>> > +CITE { >>> > + font-style: italic; >>> > +} >>> > + >>> > +EM { >>> > + font-style: italic; >>> > +} >>> > + >>> > +STRONG { >>> > + font-weight: bold; >>> > +} >>> > + >>> > +VAR { >>> > + font-style: italic; >>> > +} >>> > + >>> > +dt { >>> > + font-weight: bold; >>> > +} >>> > + >>> > >>> +/*********************************************************** >>> > + * Basic fonts >>> > + >>> ***********************************************************/ >>> > +body, >>> > +td, >>> > +th, >>> > +caption { >>> > + font-family: Verdana, Arial, Helvetica, sans-serif; >>> > + font-size: 10pt; >>> > +} >>> > + >>> > +pre, code { >>> > + font-family: MS Courier New, Courier, monospace; >>> > +} >>> > + >>> > +h1, h2, h3 { >>> > + font-size: 12pt; >>> > + font-weight: bold; >>> > + color: #336699; >>> > +} >>> > + >>> > +h4 { >>> > + font-size: 10pt; >>> > + font-weight: bold; >>> > + color: #336699; >>> > +} >>> > + >>> > >>> +/*********************************************************** >>> > + * Basic indents, padding, and margin >>> > + >>> ***********************************************************/ >>> > +body { >>> > + color: black; >>> > + background-color: white; >>> > + margin: 0; >>> > + padding-top: 0.2em; >>> > + padding-left: 0.6em; >>> > + padding-right: 0.2em; >>> > + padding-bottom: 1em; >>> > +} >>> > + >>> > +h1, >>> > +h2, >>> > +h3, >>> > +h4, >>> > +h5, >>> > +h6 { >>> > + padding: 0; >>> > + margin-top: 1em; >>> > + margin-bottom: 0.75em; >>> > + margin-left: 0; >>> > + margin-right: 0; >>> > +} >>> > + >>> > +address, >>> > +dl, >>> > +li, >>> > +p { >>> > + padding: 0; >>> > + margin-top: 0.75em; >>> > + margin-bottom: 0.75em; >>> > + margin-left: 0; >>> > + margin-right: 0; >>> > + line-height: 125%; >>> > +} >>> > + >>> > +td dl { >>> > + margin-left: 2em; >>> > +} >>> > + >>> > +pre { >>> > + padding: 0; >>> > + margin-top: 0.75em; >>> > + margin-bottom: 0.75em; >>> > + margin-left: 2em; >>> > + margin-right: 0; >>> > +} >>> > + >>> > +ol, >>> > +ul { >>> > + padding: 0; >>> > + margin-top: 0.75em; >>> > + margin-bottom: 0.75em; >>> > + margin-left: 2.00em; >>> > + margin-right: 0; >>> > +} >>> > + >>> > +dd { >>> > + margin-left: 3.00em; >>> > + margin-top: 0.75em; >>> > + margin-bottom: 0.75em; >>> > +} >>> > + >>> > +dt { >>> > + margin-left: 1.00em; >>> > + margin-top: 0.75em; >>> > +} >>> >>> _______________________________________________ >>> Kimchi-devel mailing list >>> Kimchi-devel(a)ovirt.org <mailto:Kimchi-devel@ovirt.org> >>> http://lists.ovirt.org/mailman/listinfo/kimchi-devel >>> >

4 6

Re: [Kimchi-devel] [PATCH 1/1] Enabling help page for wok base. This commit supports en_US only.
by Aline Manera 07 Aug '15

07 Aug '15

Thanks, Harshal! To get an issue assigned to you, you need to be part of the Collaborators group in the kimchi-project organization on Github. Once you get there I will assign it to you. On 07/08/2015 00:28, Harshal Patil wrote: > Here it is, https://github.com/kimchi-project/kimchi/issues/718 > > ----- Original message ----- > From: Aline Manera <alinefm(a)linux.vnet.ibm.com> > To: Harshal Patil/India/IBM@IBMIN > Cc: kimchi-devel(a)ovirt.org, sureshab(a)linux.vnet.ibm.com > Subject: Re: [Kimchi-devel] [PATCH 1/1] Enabling help page for wok > base. This commit supports en_US only. > Date: Fri, Aug 7, 2015 1:30 AM > > > On 06/08/2015 16:53, Harshal Patil wrote: >> If no one else is going to do that, then I don't mind >> implementing it. How are you going to track who is implementing >> what? Usually a github issue is used with tags like 'feature' >> (e.g. https://github.com/docker/distribution/issues/200) > > Yeap! Please, open an issue on github and also add a comment there > saying you will do the work and I will assign it to you. > > You will not be able to set the tag, but I can do that while > assign the issue to you. >> >> ----- Original message ----- >> From: Aline Manera <alinefm(a)linux.vnet.ibm.com> >> <mailto:alinefm@linux.vnet.ibm.com> >> To: Harshal Patil/India/IBM@IBMIN >> Cc: kimchi-devel(a)ovirt.org <mailto:kimchi-devel@ovirt.org>, >> sureshab(a)linux.vnet.ibm.com <mailto:sureshab@linux.vnet.ibm.com> >> Subject: Re: [Kimchi-devel] [PATCH 1/1] Enabling help page >> for wok base. This commit supports en_US only. >> Date: Fri, Aug 7, 2015 1:12 AM >> >> >> On 06/08/2015 16:38, Harshal Patil wrote: >>> Sounds awesome Aline! >>> So we will have wok front page with just basic >>> documentations on API and nothing else? >> >> I thought in a "Welcome to Wok" message and some information >> about plugins install and what else is important. >> >> Are you going to implement it? If so, I suggest you to send >> mockups layouts prior doing the code itself. So we can opine >> on what to add, where to display, etc =) >>> what about host stats or basic info? Just making sure we are >>> on the same page. >> >> They will not be part of wok as they are not related to web >> server configuration. >> Probably creating an other plugin to expose the APIs we want >> and reuse for Kimchi and Ginger when needed. >>> >>> ----- Original message ----- >>> From: Aline Manera <alinefm(a)linux.vnet.ibm.com> >>> <mailto:alinefm@linux.vnet.ibm.com> >>> To: Harshal Patil/India/IBM@IBMIN >>> Cc: kimchi-devel(a)ovirt.org >>> <mailto:kimchi-devel@ovirt.org>, >>> sureshab(a)linux.vnet.ibm.com >>> <mailto:sureshab@linux.vnet.ibm.com> >>> Subject: Re: [Kimchi-devel] [PATCH 1/1] Enabling help >>> page for wok base. This commit supports en_US only. >>> Date: Fri, Aug 7, 2015 12:32 AM >>> >>> >>> On 06/08/2015 14:42, Harshal Patil wrote: >>>> If you are looking at wok just as a web framework which >>>> developers can use to write plugins for, then it >>>> doesn't need to have any user facing webpage at all. >>>> Developers would need to interact with wok's API anyway. >>>> Now you can always create a marketplace for the wok >>>> plugins where users can download and install plugins on >>>> them on the fly and that could be the only page wok can >>>> serve on it's own without any plugins. ;-) >>> >>> Yeap!! I have thought about it too. >>> >>> My idea (for future, of course) is adding to wok a >>> "Configuration tab" so user can configure wok settings >>> through UI. >>> For example, which authentication method to use, which >>> plugins to install/uninstall/enable/disable, >>> authorization settings and any other setting related to >>> the web sever config. >>> >>> It is the same approach we have on Jenkins. >>>> But if that's not on the table then wok could only >>>> display basic API usage for its plugin developers >>>> on default index page, probably a button to load bare >>>> minimum sample plugin as a proof of concept. >>> >>> Yeap! I think we should go on that way by now and on >>> future we can implement the "Configuration tab" for wok. >>> >>> Sounds a good plan for you? >>>> >>>> ----- Original message ----- >>>> From: Aline Manera <alinefm(a)linux.vnet.ibm.com> >>>> <mailto:alinefm@linux.vnet.ibm.com> >>>> Sent by: kimchi-devel-bounces(a)ovirt.org >>>> <mailto:kimchi-devel-bounces@ovirt.org> >>>> To: sureshab(a)linux.vnet.ibm.com >>>> <mailto:sureshab@linux.vnet.ibm.com>, >>>> kimchi-devel(a)ovirt.org <mailto:kimchi-devel@ovirt.org> >>>> Cc: >>>> Subject: Re: [Kimchi-devel] [PATCH 1/1] Enabling >>>> help page for wok base. This commit supports en_US >>>> only. >>>> Date: Thu, Aug 6, 2015 8:02 PM >>>> I don't think we need a help page for Wok framework. >>>> >>>> We have a lot to discuss on that, but the initial >>>> idea was to load a >>>> simple page when running wok without any plugin. >>>> That page would describe the wok proposal - as a >>>> web server framework >>>> based on plugins. >>>> >>>> I think it is hard to us to point the user to any >>>> specific plugin like >>>> kimchi or ginger, as anyone can develop a wok >>>> plugin and host anywhere. >>>> >>>> I am more for a generic simple page and no help. >>>> >>>> More (and different) thoughts on it are more than >>>> welcome. =) >>>> >>>> On 04/08/2015 10:04, sureshab(a)linux.vnet.ibm.com >>>> <mailto:sureshab@linux.vnet.ibm.com> wrote: >>>> > From: Suresh Babu Angadi >>>> <sureshab(a)linux.vnet.ibm.com> >>>> <mailto:sureshab@linux.vnet.ibm.com> >>>> > >>>> > Signed-off-by: Suresh Babu Angadi >>>> <sureshab(a)linux.vnet.ibm.com> >>>> <mailto:sureshab@linux.vnet.ibm.com> >>>> > --- >>>> > configure.ac | 2 + >>>> > src/wok/config.py.in | 5 + >>>> > ui/js/src/wok.main.js | 9 +- >>>> > ui/pages/Makefile.am | 2 +- >>>> > ui/pages/help/Makefile.am | 34 +++++++ >>>> > ui/pages/help/dita-help.xsl | 26 +++++ >>>> > ui/pages/help/en_US/Makefile.am | 23 +++++ >>>> > ui/pages/help/en_US/wokhelp.dita | 27 +++++ >>>> > ui/pages/help/wok.css | 208 >>>> +++++++++++++++++++++++++++++++++++++++ >>>> > 9 files changed, 333 insertions(+), 3 deletions(-) >>>> > create mode 100644 ui/pages/help/Makefile.am >>>> > create mode 100644 ui/pages/help/dita-help.xsl >>>> > create mode 100644 ui/pages/help/en_US/Makefile.am >>>> > create mode 100644 ui/pages/help/en_US/wokhelp.dita >>>> > create mode 100644 ui/pages/help/wok.css >>>> > >>>> > diff --git a/configure.ac b/configure.ac >>>> > index 47c2e6c..ee4d793 100644 >>>> > --- a/configure.ac >>>> > +++ b/configure.ac >>>> > @@ -115,6 +115,8 @@ AC_CONFIG_FILES([ >>>> > ui/libs/themes/base/Makefile >>>> > ui/libs/themes/base/images/Makefile >>>> > ui/pages/Makefile >>>> > + ui/pages/help/Makefile >>>> > + ui/pages/help/en_US/Makefile >>>> > ui/pages/websockify/Makefile >>>> > contrib/Makefile >>>> > contrib/DEBIAN/Makefile >>>> > diff --git a/src/wok/config.py.in >>>> b/src/wok/config.py.in >>>> > index 5ffa936..c158a75 100644 >>>> > --- a/src/wok/config.py.in >>>> > +++ b/src/wok/config.py.in >>>> > @@ -142,6 +142,11 @@ class WokConfig(dict): >>>> > '/wok-ui.html': { >>>> > 'tools.wokauth.on': True >>>> > }, >>>> > + '/help': { >>>> > + 'tools.staticdir.on': True, >>>> > + 'tools.staticdir.dir': '%s/ui/pages/help' % >>>> paths.prefix, >>>> > + 'tools.nocache.on': True >>>> > + } >>>> > } >>>> > >>>> > def __init__(self): >>>> > diff --git a/ui/js/src/wok.main.js >>>> b/ui/js/src/wok.main.js >>>> > index f4c9940..3dd76b8 100644 >>>> > --- a/ui/js/src/wok.main.js >>>> > +++ b/ui/js/src/wok.main.js >>>> > @@ -349,7 +349,12 @@ wok.checkHelpFile = >>>> function(path) { >>>> > >>>> > wok.openHelp = function(e) { >>>> > var tab = $('#nav-menu a.current'); >>>> > - var url = >>>> $(tab).parent().find("input[name='helpPath']").val(); >>>> > - window.open(url, "Wok Help"); >>>> > + if (tab.length == 0 ){ >>>> > + window.open("help/en_US/wokhelp.html","Wok Help") >>>> > + } >>>> > + else { >>>> > + var url = >>>> $(tab).parent().find("input[name='helpPath']").val(); >>>> > + window.open(url, "Wok Help"); >>>> > + } >>>> > e.preventDefault(); >>>> > }; >>>> > diff --git a/ui/pages/Makefile.am >>>> b/ui/pages/Makefile.am >>>> > index 68f4c92..b3f5c2e 100644 >>>> > --- a/ui/pages/Makefile.am >>>> > +++ b/ui/pages/Makefile.am >>>> > @@ -15,7 +15,7 @@ >>>> > # See the License for the specific language >>>> governing permissions and >>>> > # limitations under the License. >>>> > >>>> > -SUBDIRS = websockify >>>> > +SUBDIRS = websockify help >>>> > >>>> > htmldir = $(datadir)/wok/ui/pages >>>> > >>>> > diff --git a/ui/pages/help/Makefile.am >>>> b/ui/pages/help/Makefile.am >>>> > new file mode 100644 >>>> > index 0000000..0dc8d9f >>>> > --- /dev/null >>>> > +++ b/ui/pages/help/Makefile.am >>>> > @@ -0,0 +1,34 @@ >>>> > +# Copyright IBM Corp, 2014 >>>> > +# >>>> > +# 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 >>>> > + >>>> > +SUBDIRS = en_US >>>> > + >>>> > +DITA_HTML_FILES = $(patsubst >>>> %.dita,%.html,$(wildcard */*.dita)) >>>> > +HTML_FILES = $(if $(DITA_HTML_FILES), >>>> $(DITA_HTML_FILES), $(wildcard */*.html)) >>>> > +DITA_XSL_FILE = dita-help.xsl >>>> > + >>>> > +EXTRA_DIST = $(DITA_XSL_FILE) >>>> > + >>>> > +helpdir = $(datadir)/wok/ui/pages/help >>>> > + >>>> > +dist_help_DATA = wok.css >>>> > + >>>> > +all: $(HTML_FILES) $(wildcard */*.dita) >>>> > + >>>> > +%.html: %.dita $(DITA_XSL_FILE) >>>> > + xsltproc -o $@ $(DITA_XSL_FILE) $< >>>> > + >>>> > +CLEANFILES = $(HTML_FILES) >>>> > \ No newline at end of file >>>> > diff --git a/ui/pages/help/dita-help.xsl >>>> b/ui/pages/help/dita-help.xsl >>>> > new file mode 100644 >>>> > index 0000000..fb49855 >>>> > --- /dev/null >>>> > +++ b/ui/pages/help/dita-help.xsl >>>> > @@ -0,0 +1,26 @@ >>>> > +<?xml version="1.0" encoding="UTF-8"?> >>>> > +<xsl:stylesheet version="1.0" >>>> > + >>>> xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >>>> <http://www.w3.org/1999/XSL/Transform> >>>> > + xmlns="http://www.w3.org/1999/xhtml" >>>> <http://www.w3.org/1999/xhtml>> >>>> > + <xsl:output method="xml" indent="yes" >>>> encoding="UTF-8" /> >>>> > + >>>> > + <xsl:template match="/"> >>>> > + <html> >>>> > + <head> >>>> > + <title><xsl:value-of select="/cshelp/title" >>>> /></title> >>>> > + <meta charset="UTF-8" /> >>>> > + <link rel="shortcut icon" >>>> href="https://mail.notes.na.collabserv.com/livemail/0/../images/logo.ico" >>>> <https://mail.notes.na.collabserv.com/livemail/0/../images/logo.ico> >>>> /> >>>> > + <link rel="stylesheet" >>>> type="text/css" >>>> href="https://mail.notes.na.collabserv.com/livemail/0/wok.css" >>>> <https://mail.notes.na.collabserv.com/livemail/0/wok.css> >>>> /> >>>> > + </head> >>>> > + <body> >>>> > + <xsl:apply-templates select="//cshelp" /> >>>> > + </body> >>>> > + </html> >>>> > + </xsl:template> >>>> > + >>>> > + <xsl:template match="cshelp"> >>>> > + <h1><xsl:value-of select="title" /></h1> >>>> > + <p class="shortdesc"><xsl:value-of >>>> select="shortdesc" /></p> >>>> > + <p class="csbody"><xsl:copy-of >>>> select="csbody/node()" /></p> >>>> > + </xsl:template> >>>> > +</xsl:stylesheet> >>>> > diff --git a/ui/pages/help/en_US/Makefile.am >>>> b/ui/pages/help/en_US/Makefile.am >>>> > new file mode 100644 >>>> > index 0000000..b1e807d >>>> > --- /dev/null >>>> > +++ b/ui/pages/help/en_US/Makefile.am >>>> > @@ -0,0 +1,23 @@ >>>> > +# Copyright IBM Corp, 2014 >>>> > +# >>>> > +# 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 >>>> > + >>>> > +en_US_helpdir = $(datadir)/wok/ui/pages/help/en_US >>>> > + >>>> > +dist_en_US_help_DATA = $(wildcard *.html) $(NULL) >>>> > + >>>> > +EXTRA_DIST = $(wildcard *.dita) >>>> > + >>>> > +CLEANFILES = $(wildcard *.html) >>>> > \ No newline at end of file >>>> > diff --git a/ui/pages/help/en_US/wokhelp.dita >>>> b/ui/pages/help/en_US/wokhelp.dita >>>> > new file mode 100644 >>>> > index 0000000..582e47b >>>> > --- /dev/null >>>> > +++ b/ui/pages/help/en_US/wokhelp.dita >>>> > @@ -0,0 +1,27 @@ >>>> > +<?xml version="1.0" encoding="UTF-8"?> >>>> > + >>>> > +<!DOCTYPE cshelp PUBLIC "-//IBM//DTD DITA >>>> CSHelp//EN" >>>> > + "..\dtd\cshelp.dtd"> >>>> > +<?Pub Sty _display FontColor="red"?> >>>> > +<?Pub Inc?> >>>> > + >>>> > +<cshelp id="wokbase" xml:lang="en-us"> >>>> > +<title>Wok (Webserver Originated from >>>> Kimchi)</title> >>>> > +<shortdesc>Wok is a cherrypy-based web framework >>>> with HTML5 support that is extended by plugins >>>> which expose functionality through REST >>>> APIs.</shortdesc> >>>> > +<csbody> >>>> > +<p>Currently available plugins are Kimchi >>>> (Virtualization Management) and Ginger (System >>>> Administration). >>>> > +Wok comes with a sample plugin for education >>>> purposes.<ul> >>>> > +<li><uicontrol>Download Kimchi : </uicontrol> >>>> > +<a >>>> href="https://github.com/kimchi-project/kimchi/tree/wok" >>>> <https://github.com/kimchi-project/kimchi/tree/wok> >>>> > +target="_blank" >>>> >https://github.com/kimchi-project/kimchi/tree/wok</a> >>>> > +</li> >>>> > +<li><uicontrol>Download Ginger : </uicontrol> >>>> > +<a >>>> href="https://github.com/kimchi-project/ginger/tree/ginger_wok" >>>> <https://github.com/kimchi-project/ginger/tree/ginger_wok> >>>> > +target="_blank" >>>> >https://github.com/kimchi-project/ginger/tree/ginger_wok</a> >>>> > +</li> >>>> > +</ul> >>>> > +</p> >>>> > +</csbody> >>>> > +</cshelp> >>>> > diff --git a/ui/pages/help/wok.css >>>> b/ui/pages/help/wok.css >>>> > new file mode 100644 >>>> > index 0000000..32fae4a >>>> > --- /dev/null >>>> > +++ b/ui/pages/help/wok.css >>>> > @@ -0,0 +1,208 @@ >>>> > +/* >>>> > + * Project Kimchi >>>> > + * >>>> > + * Copyright IBM, Corp. 2014 >>>> > + * >>>> > + * Licensed under the Apache License, Version >>>> 2.0 (the "License"); >>>> > + * you may not use this file except in >>>> compliance with the License. >>>> > + * You may obtain a copy of the License at >>>> > + * >>>> > + * http://www.apache.org/licenses/LICENSE-2.0 >>>> > + * >>>> > + * Unless required by applicable law or agreed >>>> to in writing, software >>>> > + * distributed under the License is distributed >>>> on an "AS IS" BASIS, >>>> > + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, >>>> either express or implied. >>>> > + * See the License for the specific language >>>> governing permissions and >>>> > + * limitations under the License. >>>> > + */ >>>> > +BODY { >>>> > + background: #FFFFFF; >>>> > + margin-bottom: 1em; >>>> > + margin-left: .5em; >>>> > +} >>>> > + >>>> > +bold { >>>> > + font-weight: bold; >>>> > +} >>>> > + >>>> > +boldItalic { >>>> > + font-weight: bold; >>>> > + font-style: italic; >>>> > +} >>>> > + >>>> > +italic { >>>> > + font-style: italic; >>>> > +} >>>> > + >>>> > +underlined { >>>> > + text-decoration: underline; >>>> > +} >>>> > + >>>> > +uicontrol { >>>> > + font-weight: bold; >>>> > +} >>>> > + >>>> > +filepath { >>>> > + font-family: monospace, monospace; >>>> > +}.option { >>>> > + font-family: monospace, monospace; >>>> > +} >>>> > + >>>> > +cmdname { >>>> > + font-weight: bold; >>>> > + font-family: monospace, monospace; >>>> > +} >>>> > + >>>> > +.defparmname { >>>> > + font-weight: bold; >>>> > + text-decoration: underline; >>>> > + font-family: monospace, monospace; >>>> > +} >>>> > + >>>> > +.kwd { >>>> > + font-weight: bold; >>>> > +} >>>> > + >>>> > +.defkwd { >>>> > + font-weight: bold; >>>> > + text-decoration: underline; >>>> > +} >>>> > + >>>> > +var { >>>> > + font-style : italic; >>>> > +} >>>> > + >>>> > +strongwintitle { >>>> > + font-weight : bold; >>>> > +} >>>> > + >>>> > +parmname { >>>> > + font-weight: bold; >>>> > + font-family: monospace, monospace; >>>> > + white-space: nowrap; >>>> > +} >>>> > + >>>> > +code { >>>> > + font-family: monospace, monospace; >>>> > +} >>>> > + >>>> > +pre { >>>> > + font-family: monospace, monospace; >>>> > +} >>>> > + >>>> > +CITE { >>>> > + font-style: italic; >>>> > +} >>>> > + >>>> > +EM { >>>> > + font-style: italic; >>>> > +} >>>> > + >>>> > +STRONG { >>>> > + font-weight: bold; >>>> > +} >>>> > + >>>> > +VAR { >>>> > + font-style: italic; >>>> > +} >>>> > + >>>> > +dt { >>>> > + font-weight: bold; >>>> > +} >>>> > + >>>> > >>>> +/*********************************************************** >>>> > + * Basic fonts >>>> > + >>>> ***********************************************************/ >>>> > +body, >>>> > +td, >>>> > +th, >>>> > +caption { >>>> > + font-family: Verdana, Arial, Helvetica, >>>> sans-serif; >>>> > + font-size: 10pt; >>>> > +} >>>> > + >>>> > +pre, code { >>>> > + font-family: MS Courier New, Courier, monospace; >>>> > +} >>>> > + >>>> > +h1, h2, h3 { >>>> > + font-size: 12pt; >>>> > + font-weight: bold; >>>> > + color: #336699; >>>> > +} >>>> > + >>>> > +h4 { >>>> > + font-size: 10pt; >>>> > + font-weight: bold; >>>> > + color: #336699; >>>> > +} >>>> > + >>>> > >>>> +/*********************************************************** >>>> > + * Basic indents, padding, and margin >>>> > + >>>> ***********************************************************/ >>>> > +body { >>>> > + color: black; >>>> > + background-color: white; >>>> > + margin: 0; >>>> > + padding-top: 0.2em; >>>> > + padding-left: 0.6em; >>>> > + padding-right: 0.2em; >>>> > + padding-bottom: 1em; >>>> > +} >>>> > + >>>> > +h1, >>>> > +h2, >>>> > +h3, >>>> > +h4, >>>> > +h5, >>>> > +h6 { >>>> > + padding: 0; >>>> > + margin-top: 1em; >>>> > + margin-bottom: 0.75em; >>>> > + margin-left: 0; >>>> > + margin-right: 0; >>>> > +} >>>> > + >>>> > +address, >>>> > +dl, >>>> > +li, >>>> > +p { >>>> > + padding: 0; >>>> > + margin-top: 0.75em; >>>> > + margin-bottom: 0.75em; >>>> > + margin-left: 0; >>>> > + margin-right: 0; >>>> > + line-height: 125%; >>>> > +} >>>> > + >>>> > +td dl { >>>> > + margin-left: 2em; >>>> > +} >>>> > + >>>> > +pre { >>>> > + padding: 0; >>>> > + margin-top: 0.75em; >>>> > + margin-bottom: 0.75em; >>>> > + margin-left: 2em; >>>> > + margin-right: 0; >>>> > +} >>>> > + >>>> > +ol, >>>> > +ul { >>>> > + padding: 0; >>>> > + margin-top: 0.75em; >>>> > + margin-bottom: 0.75em; >>>> > + margin-left: 2.00em; >>>> > + margin-right: 0; >>>> > +} >>>> > + >>>> > +dd { >>>> > + margin-left: 3.00em; >>>> > + margin-top: 0.75em; >>>> > + margin-bottom: 0.75em; >>>> > +} >>>> > + >>>> > +dt { >>>> > + margin-left: 1.00em; >>>> > + margin-top: 0.75em; >>>> > +} >>>> >>>> _______________________________________________ >>>> Kimchi-devel mailing list >>>> Kimchi-devel(a)ovirt.org <mailto:Kimchi-devel@ovirt.org> >>>> http://lists.ovirt.org/mailman/listinfo/kimchi-devel >>>> >

1 0

Re: [Kimchi-devel] Should wok be a fork of kimchi?
by Aline Manera 07 Aug '15

07 Aug '15

On 06/08/2015 17:49, Harshal Patil wrote: > Cool, my question is when do you think we should have a git repo for > 'wok' (in kimchi-project org)? When we get it wok and Kimchi as plugin stable enough to be officially released. The idea is to have it by end of Sept, ie, 2 months from now on. And then the new repository and all proper configuration to make Kimchi and Ginger as submodules will be done and announced. > IMHO, we should have it right now and then start working on that repo > instead of current one. > > ----- Original message ----- > From: Aline Manera <alinefm(a)linux.vnet.ibm.com> > To: Harshal Patil/India/IBM@IBMIN, kimchi-devel(a)ovirt.org > Cc: > Subject: Re: [Kimchi-devel] Should wok be a fork of kimchi? > Date: Fri, Aug 7, 2015 1:25 AM > > > Hi Harshal, > > As long as we complete the transition to wok framework, ie, make > wok framework and Kimchi as plugin stable, 'wok' will be a new git > repository into kimchi-project organization on github. And Kimchi > and Ginger will be loaded as submodules. > > Regards, > Aline Manera > On 06/08/2015 16:46, Harshal Patil wrote: >> Hi, >> We are seeing lately how wok is positioned so differently than >> kimchi is in many aspects. There are talks about changing UI >> frameworks (bootstrap), and then having separate plugins (kimchi, >> ginger). Wok is not going to be anything like the way kimchi is >> today. It even has different name ('wok' instead of kimchi <next >> version>) >> Considering that should have wok development in a forked (from >> existing kimchi) repo, having it as a branch of kimchi master >> fails to make any sense to me. >> >> _______________________________________________ >> Kimchi-devel mailing list >> Kimchi-devel(a)ovirt.org <mailto:Kimchi-devel@ovirt.org> >> http://lists.ovirt.org/mailman/listinfo/kimchi-devel > >

1 0

Should wok be a fork of kimchi?
by Harshal Patil 06 Aug '15

06 Aug '15

2 2

Why not to use github pull requests?
by Harshal Patil 06 Aug '15

06 Aug '15

2 2

Google hangouts for scrum instead of IRC?
by Harshal Patil 06 Aug '15

06 Aug '15

1 0

Re: [Kimchi-devel] [PATCH 1/1] Enabling help page for wok base. This commit supports en_US only.
by Aline Manera 06 Aug '15

06 Aug '15

On 06/08/2015 16:38, Harshal Patil wrote: > Sounds awesome Aline! > So we will have wok front page with just basic documentations on API > and nothing else? I thought in a "Welcome to Wok" message and some information about plugins install and what else is important. Are you going to implement it? If so, I suggest you to send mockups layouts prior doing the code itself. So we can opine on what to add, where to display, etc =) > what about host stats or basic info? Just making sure we are on the > same page. They will not be part of wok as they are not related to web server configuration. Probably creating an other plugin to expose the APIs we want and reuse for Kimchi and Ginger when needed. > ----- Original message ----- > From: Aline Manera <alinefm(a)linux.vnet.ibm.com> > To: Harshal Patil/India/IBM@IBMIN > Cc: kimchi-devel(a)ovirt.org, sureshab(a)linux.vnet.ibm.com > Subject: Re: [Kimchi-devel] [PATCH 1/1] Enabling help page for wok > base. This commit supports en_US only. > Date: Fri, Aug 7, 2015 12:32 AM > > > On 06/08/2015 14:42, Harshal Patil wrote: >> If you are looking at wok just as a web framework which >> developers can use to write plugins for, then it doesn't need to >> have any user facing webpage at all. Developers would need to >> interact with wok's API anyway. >> Now you can always create a marketplace for the wok plugins where >> users can download and install plugins on them on the fly and >> that could be the only page wok can serve on it's own without any >> plugins. ;-) > > Yeap!! I have thought about it too. > > My idea (for future, of course) is adding to wok a "Configuration > tab" so user can configure wok settings through UI. > For example, which authentication method to use, which plugins to > install/uninstall/enable/disable, authorization settings and any > other setting related to the web sever config. > > It is the same approach we have on Jenkins. >> But if that's not on the table then wok could only display basic >> API usage for its plugin developers on default index page, >> probably a button to load bare minimum sample plugin as a proof >> of concept. > > Yeap! I think we should go on that way by now and on future we can > implement the "Configuration tab" for wok. > > Sounds a good plan for you? >> >> ----- Original message ----- >> From: Aline Manera <alinefm(a)linux.vnet.ibm.com> >> <mailto:alinefm@linux.vnet.ibm.com> >> Sent by: kimchi-devel-bounces(a)ovirt.org >> <mailto:kimchi-devel-bounces@ovirt.org> >> To: sureshab(a)linux.vnet.ibm.com >> <mailto:sureshab@linux.vnet.ibm.com>, kimchi-devel(a)ovirt.org >> <mailto:kimchi-devel@ovirt.org> >> Cc: >> Subject: Re: [Kimchi-devel] [PATCH 1/1] Enabling help page >> for wok base. This commit supports en_US only. >> Date: Thu, Aug 6, 2015 8:02 PM >> I don't think we need a help page for Wok framework. >> >> We have a lot to discuss on that, but the initial idea was to >> load a >> simple page when running wok without any plugin. >> That page would describe the wok proposal - as a web server >> framework >> based on plugins. >> >> I think it is hard to us to point the user to any specific >> plugin like >> kimchi or ginger, as anyone can develop a wok plugin and host >> anywhere. >> >> I am more for a generic simple page and no help. >> >> More (and different) thoughts on it are more than welcome. =) >> >> On 04/08/2015 10:04, sureshab(a)linux.vnet.ibm.com >> <mailto:sureshab@linux.vnet.ibm.com> wrote: >> > From: Suresh Babu Angadi <sureshab(a)linux.vnet.ibm.com> >> <mailto:sureshab@linux.vnet.ibm.com> >> > >> > Signed-off-by: Suresh Babu Angadi >> <sureshab(a)linux.vnet.ibm.com> >> <mailto:sureshab@linux.vnet.ibm.com> >> > --- >> > configure.ac | 2 + >> > src/wok/config.py.in | 5 + >> > ui/js/src/wok.main.js | 9 +- >> > ui/pages/Makefile.am | 2 +- >> > ui/pages/help/Makefile.am | 34 +++++++ >> > ui/pages/help/dita-help.xsl | 26 +++++ >> > ui/pages/help/en_US/Makefile.am | 23 +++++ >> > ui/pages/help/en_US/wokhelp.dita | 27 +++++ >> > ui/pages/help/wok.css | 208 >> +++++++++++++++++++++++++++++++++++++++ >> > 9 files changed, 333 insertions(+), 3 deletions(-) >> > create mode 100644 ui/pages/help/Makefile.am >> > create mode 100644 ui/pages/help/dita-help.xsl >> > create mode 100644 ui/pages/help/en_US/Makefile.am >> > create mode 100644 ui/pages/help/en_US/wokhelp.dita >> > create mode 100644 ui/pages/help/wok.css >> > >> > diff --git a/configure.ac b/configure.ac >> > index 47c2e6c..ee4d793 100644 >> > --- a/configure.ac >> > +++ b/configure.ac >> > @@ -115,6 +115,8 @@ AC_CONFIG_FILES([ >> > ui/libs/themes/base/Makefile >> > ui/libs/themes/base/images/Makefile >> > ui/pages/Makefile >> > + ui/pages/help/Makefile >> > + ui/pages/help/en_US/Makefile >> > ui/pages/websockify/Makefile >> > contrib/Makefile >> > contrib/DEBIAN/Makefile >> > diff --git a/src/wok/config.py.in b/src/wok/config.py.in >> > index 5ffa936..c158a75 100644 >> > --- a/src/wok/config.py.in >> > +++ b/src/wok/config.py.in >> > @@ -142,6 +142,11 @@ class WokConfig(dict): >> > '/wok-ui.html': { >> > 'tools.wokauth.on': True >> > }, >> > + '/help': { >> > + 'tools.staticdir.on': True, >> > + 'tools.staticdir.dir': '%s/ui/pages/help' % >> paths.prefix, >> > + 'tools.nocache.on': True >> > + } >> > } >> > >> > def __init__(self): >> > diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js >> > index f4c9940..3dd76b8 100644 >> > --- a/ui/js/src/wok.main.js >> > +++ b/ui/js/src/wok.main.js >> > @@ -349,7 +349,12 @@ wok.checkHelpFile = function(path) { >> > >> > wok.openHelp = function(e) { >> > var tab = $('#nav-menu a.current'); >> > - var url = >> $(tab).parent().find("input[name='helpPath']").val(); >> > - window.open(url, "Wok Help"); >> > + if (tab.length == 0 ){ >> > + window.open("help/en_US/wokhelp.html","Wok Help") >> > + } >> > + else { >> > + var url = >> $(tab).parent().find("input[name='helpPath']").val(); >> > + window.open(url, "Wok Help"); >> > + } >> > e.preventDefault(); >> > }; >> > diff --git a/ui/pages/Makefile.am b/ui/pages/Makefile.am >> > index 68f4c92..b3f5c2e 100644 >> > --- a/ui/pages/Makefile.am >> > +++ b/ui/pages/Makefile.am >> > @@ -15,7 +15,7 @@ >> > # See the License for the specific language governing >> permissions and >> > # limitations under the License. >> > >> > -SUBDIRS = websockify >> > +SUBDIRS = websockify help >> > >> > htmldir = $(datadir)/wok/ui/pages >> > >> > diff --git a/ui/pages/help/Makefile.am >> b/ui/pages/help/Makefile.am >> > new file mode 100644 >> > index 0000000..0dc8d9f >> > --- /dev/null >> > +++ b/ui/pages/help/Makefile.am >> > @@ -0,0 +1,34 @@ >> > +# Copyright IBM Corp, 2014 >> > +# >> > +# 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 >> > + >> > +SUBDIRS = en_US >> > + >> > +DITA_HTML_FILES = $(patsubst %.dita,%.html,$(wildcard >> */*.dita)) >> > +HTML_FILES = $(if $(DITA_HTML_FILES), $(DITA_HTML_FILES), >> $(wildcard */*.html)) >> > +DITA_XSL_FILE = dita-help.xsl >> > + >> > +EXTRA_DIST = $(DITA_XSL_FILE) >> > + >> > +helpdir = $(datadir)/wok/ui/pages/help >> > + >> > +dist_help_DATA = wok.css >> > + >> > +all: $(HTML_FILES) $(wildcard */*.dita) >> > + >> > +%.html: %.dita $(DITA_XSL_FILE) >> > + xsltproc -o $@ $(DITA_XSL_FILE) $< >> > + >> > +CLEANFILES = $(HTML_FILES) >> > \ No newline at end of file >> > diff --git a/ui/pages/help/dita-help.xsl >> b/ui/pages/help/dita-help.xsl >> > new file mode 100644 >> > index 0000000..fb49855 >> > --- /dev/null >> > +++ b/ui/pages/help/dita-help.xsl >> > @@ -0,0 +1,26 @@ >> > +<?xml version="1.0" encoding="UTF-8"?> >> > +<xsl:stylesheet version="1.0" >> > + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >> <http://www.w3.org/1999/XSL/Transform> >> > + xmlns="http://www.w3.org/1999/xhtml" >> <http://www.w3.org/1999/xhtml>> >> > + <xsl:output method="xml" indent="yes" encoding="UTF-8" /> >> > + >> > + <xsl:template match="/"> >> > + <html> >> > + <head> >> > + <title><xsl:value-of select="/cshelp/title" /></title> >> > + <meta charset="UTF-8" /> >> > + <link rel="shortcut icon" >> href="https://mail.notes.na.collabserv.com/livemail/0/../images/logo.ico" >> <https://mail.notes.na.collabserv.com/livemail/0/../images/logo.ico> >> /> >> > + <link rel="stylesheet" type="text/css" >> href="https://mail.notes.na.collabserv.com/livemail/0/wok.css" <https://mail.notes.na.collabserv.com/livemail/0/wok.css> >> /> >> > + </head> >> > + <body> >> > + <xsl:apply-templates select="//cshelp" /> >> > + </body> >> > + </html> >> > + </xsl:template> >> > + >> > + <xsl:template match="cshelp"> >> > + <h1><xsl:value-of select="title" /></h1> >> > + <p class="shortdesc"><xsl:value-of >> select="shortdesc" /></p> >> > + <p class="csbody"><xsl:copy-of >> select="csbody/node()" /></p> >> > + </xsl:template> >> > +</xsl:stylesheet> >> > diff --git a/ui/pages/help/en_US/Makefile.am >> b/ui/pages/help/en_US/Makefile.am >> > new file mode 100644 >> > index 0000000..b1e807d >> > --- /dev/null >> > +++ b/ui/pages/help/en_US/Makefile.am >> > @@ -0,0 +1,23 @@ >> > +# Copyright IBM Corp, 2014 >> > +# >> > +# 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 >> > + >> > +en_US_helpdir = $(datadir)/wok/ui/pages/help/en_US >> > + >> > +dist_en_US_help_DATA = $(wildcard *.html) $(NULL) >> > + >> > +EXTRA_DIST = $(wildcard *.dita) >> > + >> > +CLEANFILES = $(wildcard *.html) >> > \ No newline at end of file >> > diff --git a/ui/pages/help/en_US/wokhelp.dita >> b/ui/pages/help/en_US/wokhelp.dita >> > new file mode 100644 >> > index 0000000..582e47b >> > --- /dev/null >> > +++ b/ui/pages/help/en_US/wokhelp.dita >> > @@ -0,0 +1,27 @@ >> > +<?xml version="1.0" encoding="UTF-8"?> >> > + >> > +<!DOCTYPE cshelp PUBLIC "-//IBM//DTD DITA CSHelp//EN" >> > + "..\dtd\cshelp.dtd"> >> > +<?Pub Sty _display FontColor="red"?> >> > +<?Pub Inc?> >> > + >> > +<cshelp id="wokbase" xml:lang="en-us"> >> > +<title>Wok (Webserver Originated from Kimchi)</title> >> > +<shortdesc>Wok is a cherrypy-based web framework with >> HTML5 support that is extended by plugins which expose >> functionality through REST APIs.</shortdesc> >> > +<csbody> >> > +<p>Currently available plugins are Kimchi (Virtualization >> Management) and Ginger (System Administration). >> > +Wok comes with a sample plugin for education purposes.<ul> >> > +<li><uicontrol>Download Kimchi : </uicontrol> >> > +<a >> href="https://github.com/kimchi-project/kimchi/tree/wok" >> <https://github.com/kimchi-project/kimchi/tree/wok> >> > +target="_blank" >> >https://github.com/kimchi-project/kimchi/tree/wok</a> >> > +</li> >> > +<li><uicontrol>Download Ginger : </uicontrol> >> > +<a >> href="https://github.com/kimchi-project/ginger/tree/ginger_wok" >> <https://github.com/kimchi-project/ginger/tree/ginger_wok> >> > +target="_blank" >> >https://github.com/kimchi-project/ginger/tree/ginger_wok</a> >> > +</li> >> > +</ul> >> > +</p> >> > +</csbody> >> > +</cshelp> >> > diff --git a/ui/pages/help/wok.css b/ui/pages/help/wok.css >> > new file mode 100644 >> > index 0000000..32fae4a >> > --- /dev/null >> > +++ b/ui/pages/help/wok.css >> > @@ -0,0 +1,208 @@ >> > +/* >> > + * Project Kimchi >> > + * >> > + * Copyright IBM, Corp. 2014 >> > + * >> > + * Licensed under the Apache License, Version 2.0 (the >> "License"); >> > + * you may not use this file except in compliance with the >> License. >> > + * You may obtain a copy of the License at >> > + * >> > + * http://www.apache.org/licenses/LICENSE-2.0 >> > + * >> > + * Unless required by applicable law or agreed to in >> writing, software >> > + * distributed under the License is distributed on an "AS >> IS" BASIS, >> > + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either >> express or implied. >> > + * See the License for the specific language governing >> permissions and >> > + * limitations under the License. >> > + */ >> > +BODY { >> > + background: #FFFFFF; >> > + margin-bottom: 1em; >> > + margin-left: .5em; >> > +} >> > + >> > +bold { >> > + font-weight: bold; >> > +} >> > + >> > +boldItalic { >> > + font-weight: bold; >> > + font-style: italic; >> > +} >> > + >> > +italic { >> > + font-style: italic; >> > +} >> > + >> > +underlined { >> > + text-decoration: underline; >> > +} >> > + >> > +uicontrol { >> > + font-weight: bold; >> > +} >> > + >> > +filepath { >> > + font-family: monospace, monospace; >> > +}.option { >> > + font-family: monospace, monospace; >> > +} >> > + >> > +cmdname { >> > + font-weight: bold; >> > + font-family: monospace, monospace; >> > +} >> > + >> > +.defparmname { >> > + font-weight: bold; >> > + text-decoration: underline; >> > + font-family: monospace, monospace; >> > +} >> > + >> > +.kwd { >> > + font-weight: bold; >> > +} >> > + >> > +.defkwd { >> > + font-weight: bold; >> > + text-decoration: underline; >> > +} >> > + >> > +var { >> > + font-style : italic; >> > +} >> > + >> > +strongwintitle { >> > + font-weight : bold; >> > +} >> > + >> > +parmname { >> > + font-weight: bold; >> > + font-family: monospace, monospace; >> > + white-space: nowrap; >> > +} >> > + >> > +code { >> > + font-family: monospace, monospace; >> > +} >> > + >> > +pre { >> > + font-family: monospace, monospace; >> > +} >> > + >> > +CITE { >> > + font-style: italic; >> > +} >> > + >> > +EM { >> > + font-style: italic; >> > +} >> > + >> > +STRONG { >> > + font-weight: bold; >> > +} >> > + >> > +VAR { >> > + font-style: italic; >> > +} >> > + >> > +dt { >> > + font-weight: bold; >> > +} >> > + >> > +/*********************************************************** >> > + * Basic fonts >> > + ***********************************************************/ >> > +body, >> > +td, >> > +th, >> > +caption { >> > + font-family: Verdana, Arial, Helvetica, sans-serif; >> > + font-size: 10pt; >> > +} >> > + >> > +pre, code { >> > + font-family: MS Courier New, Courier, monospace; >> > +} >> > + >> > +h1, h2, h3 { >> > + font-size: 12pt; >> > + font-weight: bold; >> > + color: #336699; >> > +} >> > + >> > +h4 { >> > + font-size: 10pt; >> > + font-weight: bold; >> > + color: #336699; >> > +} >> > + >> > +/*********************************************************** >> > + * Basic indents, padding, and margin >> > + ***********************************************************/ >> > +body { >> > + color: black; >> > + background-color: white; >> > + margin: 0; >> > + padding-top: 0.2em; >> > + padding-left: 0.6em; >> > + padding-right: 0.2em; >> > + padding-bottom: 1em; >> > +} >> > + >> > +h1, >> > +h2, >> > +h3, >> > +h4, >> > +h5, >> > +h6 { >> > + padding: 0; >> > + margin-top: 1em; >> > + margin-bottom: 0.75em; >> > + margin-left: 0; >> > + margin-right: 0; >> > +} >> > + >> > +address, >> > +dl, >> > +li, >> > +p { >> > + padding: 0; >> > + margin-top: 0.75em; >> > + margin-bottom: 0.75em; >> > + margin-left: 0; >> > + margin-right: 0; >> > + line-height: 125%; >> > +} >> > + >> > +td dl { >> > + margin-left: 2em; >> > +} >> > + >> > +pre { >> > + padding: 0; >> > + margin-top: 0.75em; >> > + margin-bottom: 0.75em; >> > + margin-left: 2em; >> > + margin-right: 0; >> > +} >> > + >> > +ol, >> > +ul { >> > + padding: 0; >> > + margin-top: 0.75em; >> > + margin-bottom: 0.75em; >> > + margin-left: 2.00em; >> > + margin-right: 0; >> > +} >> > + >> > +dd { >> > + margin-left: 3.00em; >> > + margin-top: 0.75em; >> > + margin-bottom: 0.75em; >> > +} >> > + >> > +dt { >> > + margin-left: 1.00em; >> > + margin-top: 0.75em; >> > +} >> >> _______________________________________________ >> Kimchi-devel mailing list >> Kimchi-devel(a)ovirt.org <mailto:Kimchi-devel@ovirt.org> >> http://lists.ovirt.org/mailman/listinfo/kimchi-devel >> >

2 1

Re: [Kimchi-devel] [PATCH 1/1] Enabling help page for wok base. This commit supports en_US only.
by Aline Manera 06 Aug '15

06 Aug '15

On 06/08/2015 14:42, Harshal Patil wrote: > If you are looking at wok just as a web framework which developers can > use to write plugins for, then it doesn't need to have any user facing > webpage at all. Developers would need to interact with wok's API anyway. > Now you can always create a marketplace for the wok plugins where > users can download and install plugins on them on the fly and that > could be the only page wok can serve on it's own without any plugins. ;-) Yeap!! I have thought about it too. My idea (for future, of course) is adding to wok a "Configuration tab" so user can configure wok settings through UI. For example, which authentication method to use, which plugins to install/uninstall/enable/disable, authorization settings and any other setting related to the web sever config. It is the same approach we have on Jenkins. > But if that's not on the table then wok could only display basic API > usage for its plugin developers on default index page, probably a > button to load bare minimum sample plugin as a proof of concept. Yeap! I think we should go on that way by now and on future we can implement the "Configuration tab" for wok. Sounds a good plan for you? > ----- Original message ----- > From: Aline Manera <alinefm(a)linux.vnet.ibm.com> > Sent by: kimchi-devel-bounces(a)ovirt.org > To: sureshab(a)linux.vnet.ibm.com, kimchi-devel(a)ovirt.org > Cc: > Subject: Re: [Kimchi-devel] [PATCH 1/1] Enabling help page for wok > base. This commit supports en_US only. > Date: Thu, Aug 6, 2015 8:02 PM > I don't think we need a help page for Wok framework. > > We have a lot to discuss on that, but the initial idea was to load a > simple page when running wok without any plugin. > That page would describe the wok proposal - as a web server framework > based on plugins. > > I think it is hard to us to point the user to any specific plugin like > kimchi or ginger, as anyone can develop a wok plugin and host > anywhere. > > I am more for a generic simple page and no help. > > More (and different) thoughts on it are more than welcome. =) > > On 04/08/2015 10:04, sureshab(a)linux.vnet.ibm.com wrote: > > From: Suresh Babu Angadi <sureshab(a)linux.vnet.ibm.com> > > > > Signed-off-by: Suresh Babu Angadi <sureshab(a)linux.vnet.ibm.com> > > --- > > configure.ac | 2 + > > src/wok/config.py.in | 5 + > > ui/js/src/wok.main.js | 9 +- > > ui/pages/Makefile.am | 2 +- > > ui/pages/help/Makefile.am | 34 +++++++ > > ui/pages/help/dita-help.xsl | 26 +++++ > > ui/pages/help/en_US/Makefile.am | 23 +++++ > > ui/pages/help/en_US/wokhelp.dita | 27 +++++ > > ui/pages/help/wok.css | 208 > +++++++++++++++++++++++++++++++++++++++ > > 9 files changed, 333 insertions(+), 3 deletions(-) > > create mode 100644 ui/pages/help/Makefile.am > > create mode 100644 ui/pages/help/dita-help.xsl > > create mode 100644 ui/pages/help/en_US/Makefile.am > > create mode 100644 ui/pages/help/en_US/wokhelp.dita > > create mode 100644 ui/pages/help/wok.css > > > > diff --git a/configure.ac b/configure.ac > > index 47c2e6c..ee4d793 100644 > > --- a/configure.ac > > +++ b/configure.ac > > @@ -115,6 +115,8 @@ AC_CONFIG_FILES([ > > ui/libs/themes/base/Makefile > > ui/libs/themes/base/images/Makefile > > ui/pages/Makefile > > + ui/pages/help/Makefile > > + ui/pages/help/en_US/Makefile > > ui/pages/websockify/Makefile > > contrib/Makefile > > contrib/DEBIAN/Makefile > > diff --git a/src/wok/config.py.in b/src/wok/config.py.in > > index 5ffa936..c158a75 100644 > > --- a/src/wok/config.py.in > > +++ b/src/wok/config.py.in > > @@ -142,6 +142,11 @@ class WokConfig(dict): > > '/wok-ui.html': { > > 'tools.wokauth.on': True > > }, > > + '/help': { > > + 'tools.staticdir.on': True, > > + 'tools.staticdir.dir': '%s/ui/pages/help' % > paths.prefix, > > + 'tools.nocache.on': True > > + } > > } > > > > def __init__(self): > > diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js > > index f4c9940..3dd76b8 100644 > > --- a/ui/js/src/wok.main.js > > +++ b/ui/js/src/wok.main.js > > @@ -349,7 +349,12 @@ wok.checkHelpFile = function(path) { > > > > wok.openHelp = function(e) { > > var tab = $('#nav-menu a.current'); > > - var url = $(tab).parent().find("input[name='helpPath']").val(); > > - window.open(url, "Wok Help"); > > + if (tab.length == 0 ){ > > + window.open("help/en_US/wokhelp.html","Wok Help") > > + } > > + else { > > + var url = > $(tab).parent().find("input[name='helpPath']").val(); > > + window.open(url, "Wok Help"); > > + } > > e.preventDefault(); > > }; > > diff --git a/ui/pages/Makefile.am b/ui/pages/Makefile.am > > index 68f4c92..b3f5c2e 100644 > > --- a/ui/pages/Makefile.am > > +++ b/ui/pages/Makefile.am > > @@ -15,7 +15,7 @@ > > # See the License for the specific language governing > permissions and > > # limitations under the License. > > > > -SUBDIRS = websockify > > +SUBDIRS = websockify help > > > > htmldir = $(datadir)/wok/ui/pages > > > > diff --git a/ui/pages/help/Makefile.am b/ui/pages/help/Makefile.am > > new file mode 100644 > > index 0000000..0dc8d9f > > --- /dev/null > > +++ b/ui/pages/help/Makefile.am > > @@ -0,0 +1,34 @@ > > +# Copyright IBM Corp, 2014 > > +# > > +# 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 > > + > > +SUBDIRS = en_US > > + > > +DITA_HTML_FILES = $(patsubst %.dita,%.html,$(wildcard */*.dita)) > > +HTML_FILES = $(if $(DITA_HTML_FILES), $(DITA_HTML_FILES), > $(wildcard */*.html)) > > +DITA_XSL_FILE = dita-help.xsl > > + > > +EXTRA_DIST = $(DITA_XSL_FILE) > > + > > +helpdir = $(datadir)/wok/ui/pages/help > > + > > +dist_help_DATA = wok.css > > + > > +all: $(HTML_FILES) $(wildcard */*.dita) > > + > > +%.html: %.dita $(DITA_XSL_FILE) > > + xsltproc -o $@ $(DITA_XSL_FILE) $< > > + > > +CLEANFILES = $(HTML_FILES) > > \ No newline at end of file > > diff --git a/ui/pages/help/dita-help.xsl > b/ui/pages/help/dita-help.xsl > > new file mode 100644 > > index 0000000..fb49855 > > --- /dev/null > > +++ b/ui/pages/help/dita-help.xsl > > @@ -0,0 +1,26 @@ > > +<?xml version="1.0" encoding="UTF-8"?> > > +<xsl:stylesheet version="1.0" > > + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" > > + xmlns="http://www.w3.org/1999/xhtml"> > > + <xsl:output method="xml" indent="yes" encoding="UTF-8" /> > > + > > + <xsl:template match="/"> > > + <html> > > + <head> > > + <title><xsl:value-of select="/cshelp/title" > /></title> > > + <meta charset="UTF-8" /> > > + <link rel="shortcut icon" > href="https://mail.notes.na.collabserv.com/livemail/0/../images/logo.ico" > /> > > + <link rel="stylesheet" type="text/css" > href="https://mail.notes.na.collabserv.com/livemail/0/wok.css" /> > > + </head> > > + <body> > > + <xsl:apply-templates select="//cshelp" /> > > + </body> > > + </html> > > + </xsl:template> > > + > > + <xsl:template match="cshelp"> > > + <h1><xsl:value-of select="title" /></h1> > > + <p class="shortdesc"><xsl:value-of select="shortdesc" > /></p> > > + <p class="csbody"><xsl:copy-of select="csbody/node()" > /></p> > > + </xsl:template> > > +</xsl:stylesheet> > > diff --git a/ui/pages/help/en_US/Makefile.am > b/ui/pages/help/en_US/Makefile.am > > new file mode 100644 > > index 0000000..b1e807d > > --- /dev/null > > +++ b/ui/pages/help/en_US/Makefile.am > > @@ -0,0 +1,23 @@ > > +# Copyright IBM Corp, 2014 > > +# > > +# 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 > > + > > +en_US_helpdir = $(datadir)/wok/ui/pages/help/en_US > > + > > +dist_en_US_help_DATA = $(wildcard *.html) $(NULL) > > + > > +EXTRA_DIST = $(wildcard *.dita) > > + > > +CLEANFILES = $(wildcard *.html) > > \ No newline at end of file > > diff --git a/ui/pages/help/en_US/wokhelp.dita > b/ui/pages/help/en_US/wokhelp.dita > > new file mode 100644 > > index 0000000..582e47b > > --- /dev/null > > +++ b/ui/pages/help/en_US/wokhelp.dita > > @@ -0,0 +1,27 @@ > > +<?xml version="1.0" encoding="UTF-8"?> > > + > > +<!DOCTYPE cshelp PUBLIC "-//IBM//DTD DITA CSHelp//EN" > > + "..\dtd\cshelp.dtd"> > > +<?Pub Sty _display FontColor="red"?> > > +<?Pub Inc?> > > + > > +<cshelp id="wokbase" xml:lang="en-us"> > > +<title>Wok (Webserver Originated from Kimchi)</title> > > +<shortdesc>Wok is a cherrypy-based web framework with HTML5 > support that is extended by plugins which expose functionality > through REST APIs.</shortdesc> > > +<csbody> > > +<p>Currently available plugins are Kimchi (Virtualization > Management) and Ginger (System Administration). > > +Wok comes with a sample plugin for education purposes.<ul> > > +<li><uicontrol>Download Kimchi : </uicontrol> > > +<a href="https://github.com/kimchi-project/kimchi/tree/wok" > > +target="_blank" > >https://github.com/kimchi-project/kimchi/tree/wok</a> > > +</li> > > +<li><uicontrol>Download Ginger : </uicontrol> > > +<a href="https://github.com/kimchi-project/ginger/tree/ginger_wok" > > +target="_blank" > >https://github.com/kimchi-project/ginger/tree/ginger_wok</a> > > +</li> > > +</ul> > > +</p> > > +</csbody> > > +</cshelp> > > diff --git a/ui/pages/help/wok.css b/ui/pages/help/wok.css > > new file mode 100644 > > index 0000000..32fae4a > > --- /dev/null > > +++ b/ui/pages/help/wok.css > > @@ -0,0 +1,208 @@ > > +/* > > + * Project Kimchi > > + * > > + * Copyright IBM, Corp. 2014 > > + * > > + * Licensed under the Apache License, Version 2.0 (the "License"); > > + * you may not use this file except in compliance with the License. > > + * You may obtain a copy of the License at > > + * > > + * http://www.apache.org/licenses/LICENSE-2.0 > > + * > > + * Unless required by applicable law or agreed to in writing, > software > > + * distributed under the License is distributed on an "AS IS" > BASIS, > > + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express > or implied. > > + * See the License for the specific language governing > permissions and > > + * limitations under the License. > > + */ > > +BODY { > > + background: #FFFFFF; > > + margin-bottom: 1em; > > + margin-left: .5em; > > +} > > + > > +bold { > > + font-weight: bold; > > +} > > + > > +boldItalic { > > + font-weight: bold; > > + font-style: italic; > > +} > > + > > +italic { > > + font-style: italic; > > +} > > + > > +underlined { > > + text-decoration: underline; > > +} > > + > > +uicontrol { > > + font-weight: bold; > > +} > > + > > +filepath { > > + font-family: monospace, monospace; > > +}.option { > > + font-family: monospace, monospace; > > +} > > + > > +cmdname { > > + font-weight: bold; > > + font-family: monospace, monospace; > > +} > > + > > +.defparmname { > > + font-weight: bold; > > + text-decoration: underline; > > + font-family: monospace, monospace; > > +} > > + > > +.kwd { > > + font-weight: bold; > > +} > > + > > +.defkwd { > > + font-weight: bold; > > + text-decoration: underline; > > +} > > + > > +var { > > + font-style : italic; > > +} > > + > > +strongwintitle { > > + font-weight : bold; > > +} > > + > > +parmname { > > + font-weight: bold; > > + font-family: monospace, monospace; > > + white-space: nowrap; > > +} > > + > > +code { > > + font-family: monospace, monospace; > > +} > > + > > +pre { > > + font-family: monospace, monospace; > > +} > > + > > +CITE { > > + font-style: italic; > > +} > > + > > +EM { > > + font-style: italic; > > +} > > + > > +STRONG { > > + font-weight: bold; > > +} > > + > > +VAR { > > + font-style: italic; > > +} > > + > > +dt { > > + font-weight: bold; > > +} > > + > > +/*********************************************************** > > + * Basic fonts > > + ***********************************************************/ > > +body, > > +td, > > +th, > > +caption { > > + font-family: Verdana, Arial, Helvetica, sans-serif; > > + font-size: 10pt; > > +} > > + > > +pre, code { > > + font-family: MS Courier New, Courier, monospace; > > +} > > + > > +h1, h2, h3 { > > + font-size: 12pt; > > + font-weight: bold; > > + color: #336699; > > +} > > + > > +h4 { > > + font-size: 10pt; > > + font-weight: bold; > > + color: #336699; > > +} > > + > > +/*********************************************************** > > + * Basic indents, padding, and margin > > + ***********************************************************/ > > +body { > > + color: black; > > + background-color: white; > > + margin: 0; > > + padding-top: 0.2em; > > + padding-left: 0.6em; > > + padding-right: 0.2em; > > + padding-bottom: 1em; > > +} > > + > > +h1, > > +h2, > > +h3, > > +h4, > > +h5, > > +h6 { > > + padding: 0; > > + margin-top: 1em; > > + margin-bottom: 0.75em; > > + margin-left: 0; > > + margin-right: 0; > > +} > > + > > +address, > > +dl, > > +li, > > +p { > > + padding: 0; > > + margin-top: 0.75em; > > + margin-bottom: 0.75em; > > + margin-left: 0; > > + margin-right: 0; > > + line-height: 125%; > > +} > > + > > +td dl { > > + margin-left: 2em; > > +} > > + > > +pre { > > + padding: 0; > > + margin-top: 0.75em; > > + margin-bottom: 0.75em; > > + margin-left: 2em; > > + margin-right: 0; > > +} > > + > > +ol, > > +ul { > > + padding: 0; > > + margin-top: 0.75em; > > + margin-bottom: 0.75em; > > + margin-left: 2.00em; > > + margin-right: 0; > > +} > > + > > +dd { > > + margin-left: 3.00em; > > + margin-top: 0.75em; > > + margin-bottom: 0.75em; > > +} > > + > > +dt { > > + margin-left: 1.00em; > > + margin-top: 0.75em; > > +} > > _______________________________________________ > Kimchi-devel mailing list > Kimchi-devel(a)ovirt.org > http://lists.ovirt.org/mailman/listinfo/kimchi-devel > >

2 2

Re: [Kimchi-devel] [Proposal] Introducing the version in REST API URI for kimchi/ginger plugins
by Aline Manera 06 Aug '15

06 Aug '15

On 06/08/2015 16:21, Harshal Patil wrote: > Typical use case... I write a fancy bindings for wok RESTful APIs say, > in Haskell (because yeah! ;-) ). For the given endpoint (let's say > /abc) there is a JSON response you get for the GET method. Everything > is working fine until wok developers figure out that with the changing > needs may be the JSON sent as a response by /abc GET might need to > change. At this point if our RESTful API supports versioning poor > Haskell loving engineers can still be sure that their bindings will > work properly while giving the flexibility to wok developers to change > the product with changing requirements. With version or not, if users want to update to the newer Kimchi/wok version they will need to update their application to use the new API otherwise they will keep back on old version. All that because we don't (and will not!) maintain old versions - as I said before. I understand the scenario but it only makes sense while taking track on different versions simultaneously - which is not our case. If you need to do that for other matters, you suggest to maintain one branch per version and keep tracking on which patch to apply on each branch. > ----- Original message ----- > From: Aline Manera <alinefm(a)linux.vnet.ibm.com> > Sent by: kimchi-devel-bounces(a)ovirt.org > To: Chandra Shehkhar Reddy Potula <chandra(a)linux.vnet.ibm.com>, > kimchi-devel(a)ovirt.org > Cc: > Subject: Re: [Kimchi-devel] [Proposal] Introducing the version in > REST API URI for kimchi/ginger plugins > Date: Fri, Aug 7, 2015 12:03 AM > > > On 06/08/2015 07:41, Chandra Shehkhar Reddy Potula wrote: >> Hi Aline, >> >> No need to mention explicitly, but this is very useful in case >> where end users are exploiting functionality via REST API >> directly and not UI way. > > I suppose end users know which version he/she is using, right? =) >> >> Regards >> Chandra >> On 08/06/2015 01:52 PM, Chandra Shehkhar Reddy Potula wrote: >>> Hi Aline, >>> >>> Versioning helps you iterate faster and prevents invalid >>> requests from hitting updated endpoints. It also helps smooth >>> transitions over any major API version as you can continue to >>> offer old API versions for a period of time. Definitely >>> supporting the old version of API period of time while offering >>> new functionality with newer version always give benefits and >>> extra time for end user to adjust to new one. >>> >>> I see lot of products in the market are adapting versioning (see >>> below link) >>> http://www.lexicalscope.com/blog/2012/03/12/how-are-rest-apis-versioned/ >>> >>> I do understand the concern of maintaining the version of the >>> API endpoints , below are some of the links from Openstack, >>> which talks about it. >>> http://developer.openstack.org/api-ref.html >>> https://wiki.openstack.org/wiki/VersionDiscovery >>> >>> Hope it make senses to you. >>> >>> Regards >>> Chandra >>> On 08/06/2015 12:04 AM, Aline Manera wrote: >>>> >>>> Hi Chandra, >>>> >>>> I don't see any benefit in adding the version in the URL. >>>> Instead of that, it scares me on how we will maintain it. >>>> >>>> Once we move to wok and Kimchi as plugin, all the APIs will be >>>> automatically updated so everything will be in the same page. >>>> >>>> Regards, >>>> Aline Manera >>>> On 17/07/2015 09:47, Chandra Sr Potula wrote: >>>>> >>>>> Hi Kimchi/Ginger Devel-Team, >>>>> >>>>> Thank you for creating WOK branch to separate the kimchi >>>>> plugin from the base frame work. It is a great idea. >>>>> >>>>> Along with the separation of kimchi plugin looks like there is >>>>> a transformation of REST API URIs as well. So thinking in >>>>> those lines will it be good idea even to introduce version to >>>>> the REST API URIs ? >>>>> >>>>> Let me take one REST API URI to convey clear on what I am >>>>> talking about. >>>>> >>>>> To retrieve the host repository information, current URI is: >>>>> "/plugins/kimchi/host/repositories". >>>>> >>>>> *Recommendation*: >>>>> New host repository URI can look like : >>>>> *"**/plugins/kimchi/v<version>/host/repositories" , *so that >>>>> it is easy to maintain REST API future enhancements at the >>>>> same time do not brake some body who is using the existing URI. >>>>> >>>>> Note* Adding version in the URI above is just an example and >>>>> we could place the version in the URI best possible way. >>>>> >>>>> Thanks and Regards, >>>>> *Chandra Shekhar Reddy Potula* >>>>> Staff System Software Engineer >>>>> IBM Systems & Technology Group, Systems Software Development >>>>> System z Firmware Development >>>>> >>>>> ------------------------------------------------------------------------ >>>>> *Phone:* 91-080-4066-0786 | *Mobile:* 91-973-1122-221 >>>>> *E-mail:*_chandra.shekhar@in.ibm.com_ >>>>> <mailto:chandra.shekhar@in.ibm.com> >>>>> IBM >>>>> >>>>> ORR, Manyatha MD3 1F B247 >>>>> Bengaluru, Karnataka 560045 >>>>> India >>>>> >>>>> _______________________________________________ >>>>> Kimchi-devel mailing list >>>>> Kimchi-devel(a)ovirt.org <mailto:Kimchi-devel@ovirt.org> >>>>> http://lists.ovirt.org/mailman/listinfo/kimchi-devel >>>> >>>> _______________________________________________ >>>> Kimchi-devel mailing list >>>> Kimchi-devel(a)ovirt.org <mailto:Kimchi-devel@ovirt.org> >>>> http://lists.ovirt.org/mailman/listinfo/kimchi-devel >>> >>> _______________________________________________ >>> Kimchi-devel mailing list >>> Kimchi-devel(a)ovirt.org <mailto:Kimchi-devel@ovirt.org> >>> http://lists.ovirt.org/mailman/listinfo/kimchi-devel > _______________________________________________ > Kimchi-devel mailing list > Kimchi-devel(a)ovirt.org > http://lists.ovirt.org/mailman/listinfo/kimchi-devel > >

1 1

Re: [Kimchi-devel] Fwd: Proposal for moving functionality from Kimchi to Ginger
by Aline Manera 06 Aug '15

06 Aug '15

On 06/08/2015 14:49, Harshal Patil wrote: > About 2) Basic info and 3)host stats below, do you think wok should > actually display that info in tab or should it be just available only > through API so that plugin developers can decide to display it in > whichever way they prefer? I have thought about it initially, but I don't agree any more as it would break the idea of having on wok only what is needed to provide a web server based on plugins. Because that I proposed the common-host plugin to expose the APIs. > ----- Original message ----- > From: Aline Manera <alinefm(a)linux.vnet.ibm.com> > Sent by: kimchi-devel-bounces(a)ovirt.org > To: Walter Niklaus <niklaus(a)linux.vnet.ibm.com>, Daniel Henrique > Barboza <danielhb(a)linux.vnet.ibm.com>, Kimchi Devel > <kimchi-devel(a)ovirt.org> > Cc: > Subject: Re: [Kimchi-devel] Fwd: Proposal for moving functionality > from Kimchi to Ginger > Date: Thu, Aug 6, 2015 9:01 PM > > > Thanks, Walter, to send the scrum meeting summary here! > > Here are my thoughts on all that. > > First, let me clarify the proposal of each piece of cake! =) > > A) Wok is a *generic web server framework based on plugins*. > By generic, I mean it should only expose APIs and > functionalities required for a web server. Login, logout, plugins > support, i18n support, message error handling and much more. > > B) Kimchi is a wok plugin for virtual machine management. > And it is independent system platform: x86, Power or Z. > > C) Ginger is a wok plugin for host management. > And it is independent system platform: x86, Power or Z. > > By now, it is all we have. So I'd like to concentrate our effort > on it. > > Now thinking about which features from Kimchi Host tab can be > moved to Ginger. > Let do it item by item. The Host Tab is composed by: > > 1) Restart, Shutdown, Connect operations > I don't see those functionalities close related to virtual > machines management. So for me, it is fine and good to move them > to Ginger. > > 2) Basic Information > The kind of information may be very useful to user while > manage virtual machine. Specially by the amount of memory and > number of CPUs. > With that information the user can properly balance his/her > virtual machines configuration to have better system performance. > > 3) Host statistics > The same I described on item 2. > > 4) Software Update > I don't see this functionality close related to virtual > machines management. So for me, it is fine and good to move them > to Ginger. > > 5) Repository management > I don't see this functionality close related to virtual > machines management. So for me, it is fine and good to move them > to Ginger. > > 6) Debug reports > This functionality may be interesting for virtual machine > management when some of them represents a problem or bad performance. > So user can easily grab the system logs to check what is going > wrong. > > So if no one opposes, we can start moving 1, 4 and 5 to Ginger. > As we have 2 different open source communities we need to > coordinate that work. Initially the patch for Kimchi will be for > removing those features and to Ginger to add them. > The Kimchi patch must be simpler but it will require more work on > Ginger side. > > About 2, 3 and 6: I really understand how those information are > important for virtual machine management and also for host > management, i.e, Kimchi and Ginger. > (And I hope you all do the same :-) ) > > So in my mind, we are discussing a solution to expose those > information on both, Kimchi and Ginger, without making it > duplicated somehow to user. > > As per discussion (see item A), wok is a generic framework and > should not handle those kind of APIs. (Agree?) > And also it should not have any default plugin (otherwise, we > could continue having Kimchi as default without the need to have > the wok framework) > While loading wok without any plugin, it should display a simple > page "Welcome to wok" or something like that but without any > functionality. > > So my proposal is to create a new and simple plugin (let's call it > as common-host plugin) that expose those APIs without any UI. > > Kimchi and Ginger will have a dependency on this common-host > plugin and will provide the proper UI for it. > > To do not duplicate information while loading Kimchi and Ginger > together, I propose to add a smart logic for it: > > - Kimchi will always load the Host tab with the common-host plugin > (as it is today). > - Ginger will load the common-host plugin *only and if only* it is > running standalone. > > What do you think about it? > > Regards, > Aline Manera > On 06/08/2015 11:15, Walter Niklaus wrote: >> Picking up the discussion from the Scrum meeting about where >> (which plugin) certain functionalities should be. >> >> To make sure we don't miss this aspect, I'm re-iterating on the >> high level use cases. >> Currently I see the following major usecases now and in the near >> future (next year): >> 1. A user wants to perform base Linux management only. >> - here he needs all the generic Host-Management >> functionality + the platform specific stuff like: >> Power-FW code update, Energy Management on Power or >> IO-Device Management on System z >> 2. A user wants to manage KVM Virtual Machines. >> - his primary scope are VMs. How much of the Host and >> Platform specific Management functionality is required here ? >> 3. A user wants to manage Containers. >> - his primary scope are Container. How much of the Host >> and Platform specific Management functionality is required here ? >> 4. A user wants to manage Containers and KVM Virtual Machines . >> - his primary scope are Container and VMs. How much of the >> Host and Platform specific Management functionality is required >> here ? >> >> Our current discussion now is for the usecases 2,3 and 4: How >> much of the Host and Platform specific Management functionality >> is required and what's the best way to organize and package it. >> One possibility could be to have all Host-Management >> functionality looked at being part of the default/basic >> functionset and delivery and have the Platform specifc >> functionality as optional plugins. The disadvantage of this >> approach would be that all the following functionality: >> Basic Information, System Statistics, Network (Host NICs,DNS >> ...), Storage/SAN (Host Storage), User Management, Configuration >> Backup, Software Updates, Repositories, Debug Reports would be >> present in the Container and VM usecases by default. >> Do we know what a user really needs and wants in the usecases 2,3 >> and 4 ? I guess this depends to a large degree of the toolset >> she/he is using beside Kimchi and Ginger. If there is no other >> tooling available she/he may be happy about the shipped >> functionset, but for sure there are other situation where she/he >> may not be interested in some of the functionality. >> >> What could be the reasons a user would want to pick selectively ? >> a. functionality not required or maybe even conflicting with >> some other tooling: for example Software Updates >> are managed from some central instance >> b. installing a reduced functionset could reduce the external >> package dependencies and could reduce the amount of updates >> c. simplification on the UI by eliminating unrequired stuff >> >> Ideally the user could choose on an individual functionality base >> and configure the tool based on his needs. >> I guess satisfying the reasons a. and c. from above could be >> implemented via UI customisation even on an individual >> Kimchi/Ginger user base. >> Reason b. can be probably achieved only by segregating the set of >> fuctionality in separate plugins. >> >> >> On 04.08.2015 17:26, Walter Niklaus wrote: >>> ... Daniel sorry for the duplicate send, I missed to reply to >>> all so the mail didn't go to the mailing list. >>> On 04.08.2015 14:39, Daniel Henrique Barboza wrote: >>>> >>>> On 08/04/2015 04:56 AM, Walter Niklaus wrote: >>>>> Hi Daniel, >>>>> >>>>> sorry for missing the thread where this topic was discussed. >>>>> >>>>> I can fully understand the point about Basic Information and >>>>> System Statistics being relevant for Virtualization management >>>>> as well and I like the idea of potentially making it part of >>>>> the base framework because they would be very usefull for >>>>> other plugins, like Container-Management as well. >>>>> The interesting question is then if some of the other >>>>> functions wouldn't make sense to be part of the basic >>>>> framework as well. Debug reports would be a classical >>>>> candidate from my point of view, but wouldn't some of the >>>>> other functions be usefull in the base as well ? >>>> >>>> If we're really going in that approach (putting basic features >>>> in WoK), I agree. We would have to >>>> discuss each existing feature and evaluate if it belongs to >>>> kimchi, ginger or wok. >>> >>> I guess we really need to have a discussion on the individual >>> features but I would like to start this one from a user >>> requirements point of view. >>> Currently I see the following major usecases now and in the near >>> feature: >>> 1. A user wants to perform base Linux management only. >>> 2. A user wants to manage KVM Virtual Machines. >>> 3. A user wants to manage Containers. >>> 4. A user wants to manage Containers and KVM Virtual Machines . >>> >>> For the usecases 2, 3 and 4 the user needs usecase 1 as well in >>> order to prepare and manage the Host machine. >>> >>> I'm not proposing to make the Linux Host Management part of the >>> base framework because we just separated out Kimchi of it, but I >>> think it makes a lot of sense to deliver the Host Management >>> plugin by default with the base framework. >>>>> >>>>> Looking at the problem form a different angle: wouldn't it >>>>> make sense to package and deliver the base framework with the >>>>> Ginger plugin by default because the Host-functionality Ginger >>>>> is offering would be usefull for the other plugins like >>>>> Virtualization and Containers ? >>>>> >>>>> What I missed in my previous mail is the aspect about platform >>>>> specific functionality. This functionality, like PPC firmware >>>>> update or IO-device management for Linux on z should be made >>>>> available as individual plugins. >>>> >>>> At this moment Ginger can handle multi-arch features fairly >>>> well. For example, Firmware >>>> Update does not appear when running the plug-in in an Intel >>>> computer. The feature you mentioned, >>>> IO-device management for Linux on Z, would be available only >>>> when running Ginger in a Linux >>>> for Z host. >>>> >>>> There's absolutely nothing holding you from making a brand new >>>> plug-in for the Z features instead >>>> of adding them to Ginger, but it is important to know that >>>> Ginger is designed for these scenarios. >>>> You can even create a new UI tab in Ginger, something like 'Z >>>> management' which would contain all Z related features. This >>>> tab would only appear in a Linux on Z host. From the UI >>>> perspective it looks >>>> like a brand new plug-in working together with Ginger common >>>> features in the 'Administration' tab. >>>>> >>>>> Please let me know what you think about this option. >>>>> >>>>> Thanks, >>>>> Walter. >>>>> >>>>> On 03.08.2015 18:51, Daniel Henrique Barboza wrote: >>>>>> Hi Walter, >>>>>> >>>>>> We've had this discussion with the community a few months ago >>>>>> in the thread >>>>>> >>>>>> "[RFC] Moving some features of Host tab to Ginger" >>>>>> >>>>>> And we agreed to start it by moving only Software Update, >>>>>> Repositories and >>>>>> Debug Reports from Kimchi to Ginger. >>>>>> >>>>>> The Basic Information and System Statistics can't be taken >>>>>> away from Kimchi because there >>>>>> are relevant information for the creation of VMs there, such >>>>>> as Memory Available. But I agree >>>>>> that these information fits nicely in Ginger too. >>>>>> >>>>>> One alternative (just came in my head now) is to move these >>>>>> "neutral" functions >>>>>> to a "Basic System Info" in WoK. That way both Kimchi and >>>>>> Ginger users can access >>>>>> the information. >>>>>> >>>>>> >>>>>> Thanks, >>>>>> >>>>>> >>>>>> Daniel >>>>>> On 08/03/2015 12:15 PM, Walter Niklaus wrote: >>>>>>> >>>>>>> After separating out Kimchi as an indvidual plugin from the base >>>>>>> framework it would be great to have a clean separation >>>>>>> between Host- and >>>>>>> Virtualization Management functions. I'm planning to work on >>>>>>> this topic >>>>>>> in the next few weeks and have prepared a proposal of the >>>>>>> functionsplit. >>>>>>> Plugin functionality: >>>>>>> - Ginger: >>>>>>> - Basic Information >>>>>>> - System Statistics >>>>>>> - Network (Host NICs) >>>>>>> - Storage/SAN (Host Storage) >>>>>>> - User Management >>>>>>> - Configuration Backup >>>>>>> - Software Updates >>>>>>> - Repositories >>>>>>> - Debug Reports >>>>>>> - PPC related functions: Firmware Update & Power >>>>>>> Management >>>>>>> - Kimchi: >>>>>>> - Templates >>>>>>> - Guests >>>>>>> - Networks (virtual) >>>>>>> - Storage (Pools for VMs) >>>>>>> >>>>>>> Since there are plans to restructure the UI for one of the next >>>>>>> releases, I'm proposing to do only some minimal investments in >>>>>>> reflecting this new finctionsplit. Therefore I'm proposing >>>>>>> to make the >>>>>>> Host tab as the one and only Tab for Ginger and move >>>>>>> everything from the >>>>>>> Administration Tab into the Host Tab. This would be just an >>>>>>> intermediate solution till we implement the new UI design. >>>>>>> Please see >>>>>>> the attached PDF. >>>>>>> Thanks in advance for your feedback. >>>>>>> >>>>>>> Walter. >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>>> _______________________________________________ >>>>>>> Kimchi-devel mailing list >>>>>>> Kimchi-devel(a)ovirt.org <mailto:Kimchi-devel@ovirt.org> >>>>>>> http://lists.ovirt.org/mailman/listinfo/kimchi-devel >>>>>> >>>>>> _______________________________________________ >>>>>> Kimchi-devel mailing list >>>>>> Kimchi-devel(a)ovirt.org <mailto:Kimchi-devel@ovirt.org> >>>>>> http://lists.ovirt.org/mailman/listinfo/kimchi-devel >> >> _______________________________________________ >> Kimchi-devel mailing list >> Kimchi-devel(a)ovirt.org <mailto:Kimchi-devel@ovirt.org> >> http://lists.ovirt.org/mailman/listinfo/kimchi-devel > _______________________________________________ > Kimchi-devel mailing list > Kimchi-devel(a)ovirt.org > http://lists.ovirt.org/mailman/listinfo/kimchi-devel > >

1 0

Re: [Kimchi-devel] adding '/auth' for authentication
by Aline Manera 06 Aug '15

06 Aug '15

On 06/08/2015 14:27, Harshal Patil wrote: > This is all cool. So when you talk about wok being the base web > framework where it provides basic services like login, logout, plugin > support, i18n etc. to plugin developers do you think adding 'auth' as > another service provided by wok to plugin developers makes any sense? > Like you mentioned on IRC during scrum meeting, someone might even > write a wok plugin for makeup tips and you are totally fine with it. > Do you think if we provide an easy way for that developer to > authenticate his/her plugin's users quickly and easily? Something > other python web frameworks like flask already provide > (http://flask.pocoo.org/snippets/category/authentication/) or even > cherrypy for that matter > (http://tools.cherrypy.org/wiki/AuthenticationAndAccessRestrictions) > They provide nice decorators which plugin developers can use in their > handlers (exposed in the language of cherrypy) methods. > We could provide a nice wrapper around those ideas for authentication > using say, PAM, NIS+, LDAP etc. > What do you say? Wait! Wait! We are talking on different topics. Wok already supports PAM and LDAP authentication. You can properly configure which method to use in your wok.conf file. To do the authentication on server side we have the APIs /login and /logout - to initialize and finalize a web server session to an user. If we are talking about authentication methods, the API already exists. What I and Lucio were talking is how to check user has a valid session for each AJAX request - for that you should add the 'wok'-robot' header to your AJAX calls. > ----- Original message ----- > From: Aline Manera <alinefm(a)linux.vnet.ibm.com> > To: luciojhc(a)linux.vnet.ibm.com, Harshal Patil/India/IBM@IBMIN, > kimchi-devel(a)ovirt.org > Cc: > Subject: Re: [Kimchi-devel] adding '/auth' for authentication > Date: Thu, Aug 6, 2015 6:27 PM > > On 05/08/2015 18:02, Lucio Correia wrote: > > On 08/05/2015 04:27 PM, Aline Manera wrote: > >> > >> > >> On 05/08/2015 14:56, Lucio Correia wrote: > >>> Hi Harshal, > >>> > >>> On 08/02/2015 01:45 PM, Harshal Patil wrote: > >>>> Hi, > >>>> In the 'wok' branch there isn't anything to detect if the > session has > >>>> timed out on the browser side. On the other hand, on master > (kimchi) > >>>> there is '/vms' endpoint called every 5 seconds which kinda > takes care > >>>> of making sure the user is indeed logged in. > >>>> So I was wondering, if no one is already working on it, to > introduce a > >>>> '/auth' endpoint which we can poll every 5 seconds using ajax and > >>>> based > >>>> on the response status code we can either redirect to login > page or > >>>> just > >>>> stay on the same page. This is useful in 'wok' because there > isn't any > >>>> '/vms' endpoint which existed in master (kimchi) by default. > >>>> I can submit a patch for review if this sounds good so far. > Also, if > >>>> there is a better way of doing it, I would love to hear about it. > >>>> Harshal > >>>> > >>>> > >>> > >>> The 10-minutes time out is still working with wok branch. But > it is > >>> only verified if you leave it in "Host" or "Guests" tab. Other > tabs' > >>> APIs don't send "wok-robot" in headers. > >>> > >>> Your proposal is good, you will need to send "wok-robot" in > '/auth' > >>> headers, and remove the "wok-robot" from kimchi plugin's Host and > >>> Guests API headers. > >> > >> Why do you need a API /auth to check the user is logged? > Shouldn't the > >> "wok-robot" header be enough to do that? > >> Otherwise, we will increase significantly the number of the > requests, as > >> the real request would be send after a /auth request. > >> > > > > Good point Aline, we really don't need /auth. If we want timeout > > checked for every request, I see two alternatives: > > * drop wok-robot verification from check_auth_session() in > > src/wok/auth.py. > > * add wok-robot headers to requestJSON() in wok.api.js. > > I prefer the second alternative. The 'wok-robot' header was created to > distinguish AJAX requests from user requests. > > > > > But I don't know why currently only hosts and guests tab use > wok-robot. > > > > Because only those tabs have logic to pool the request every X > seconds. > In fact, we need to add this to every tab to keep consistence and > automatically logout user when session expires. > >

1 0

[PATCH 1/1] Enabling help page for wok base. This commit supports en_US only.
by sureshab＠linux.vnet.ibm.com 06 Aug '15

06 Aug '15

From: Suresh Babu Angadi <sureshab(a)linux.vnet.ibm.com> Signed-off-by: Suresh Babu Angadi <sureshab(a)linux.vnet.ibm.com> --- configure.ac | 2 + src/wok/config.py.in | 5 + ui/js/src/wok.main.js | 9 +- ui/pages/Makefile.am | 2 +- ui/pages/help/Makefile.am | 34 +++++++ ui/pages/help/dita-help.xsl | 26 +++++ ui/pages/help/en_US/Makefile.am | 23 +++++ ui/pages/help/en_US/wokhelp.dita | 27 +++++ ui/pages/help/wok.css | 208 +++++++++++++++++++++++++++++++++++++++ 9 files changed, 333 insertions(+), 3 deletions(-) create mode 100644 ui/pages/help/Makefile.am create mode 100644 ui/pages/help/dita-help.xsl create mode 100644 ui/pages/help/en_US/Makefile.am create mode 100644 ui/pages/help/en_US/wokhelp.dita create mode 100644 ui/pages/help/wok.css diff --git a/configure.ac b/configure.ac index 47c2e6c..ee4d793 100644 --- a/configure.ac +++ b/configure.ac @@ -115,6 +115,8 @@ AC_CONFIG_FILES([ ui/libs/themes/base/Makefile ui/libs/themes/base/images/Makefile ui/pages/Makefile + ui/pages/help/Makefile + ui/pages/help/en_US/Makefile ui/pages/websockify/Makefile contrib/Makefile contrib/DEBIAN/Makefile diff --git a/src/wok/config.py.in b/src/wok/config.py.in index 5ffa936..c158a75 100644 --- a/src/wok/config.py.in +++ b/src/wok/config.py.in @@ -142,6 +142,11 @@ class WokConfig(dict): '/wok-ui.html': { 'tools.wokauth.on': True }, + '/help': { + 'tools.staticdir.on': True, + 'tools.staticdir.dir': '%s/ui/pages/help' % paths.prefix, + 'tools.nocache.on': True + } } def __init__(self): diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js index f4c9940..3dd76b8 100644 --- a/ui/js/src/wok.main.js +++ b/ui/js/src/wok.main.js @@ -349,7 +349,12 @@ wok.checkHelpFile = function(path) { wok.openHelp = function(e) { var tab = $('#nav-menu a.current'); - var url = $(tab).parent().find("input[name='helpPath']").val(); - window.open(url, "Wok Help"); + if (tab.length == 0 ){ + window.open("help/en_US/wokhelp.html","Wok Help") + } + else { + var url = $(tab).parent().find("input[name='helpPath']").val(); + window.open(url, "Wok Help"); + } e.preventDefault(); }; diff --git a/ui/pages/Makefile.am b/ui/pages/Makefile.am index 68f4c92..b3f5c2e 100644 --- a/ui/pages/Makefile.am +++ b/ui/pages/Makefile.am @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -SUBDIRS = websockify +SUBDIRS = websockify help htmldir = $(datadir)/wok/ui/pages diff --git a/ui/pages/help/Makefile.am b/ui/pages/help/Makefile.am new file mode 100644 index 0000000..0dc8d9f --- /dev/null +++ b/ui/pages/help/Makefile.am @@ -0,0 +1,34 @@ +# Copyright IBM Corp, 2014 +# +# 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 + +SUBDIRS = en_US + +DITA_HTML_FILES = $(patsubst %.dita,%.html,$(wildcard */*.dita)) +HTML_FILES = $(if $(DITA_HTML_FILES), $(DITA_HTML_FILES), $(wildcard */*.html)) +DITA_XSL_FILE = dita-help.xsl + +EXTRA_DIST = $(DITA_XSL_FILE) + +helpdir = $(datadir)/wok/ui/pages/help + +dist_help_DATA = wok.css + +all: $(HTML_FILES) $(wildcard */*.dita) + +%.html: %.dita $(DITA_XSL_FILE) + xsltproc -o $@ $(DITA_XSL_FILE) $< + +CLEANFILES = $(HTML_FILES) \ No newline at end of file diff --git a/ui/pages/help/dita-help.xsl b/ui/pages/help/dita-help.xsl new file mode 100644 index 0000000..fb49855 --- /dev/null +++ b/ui/pages/help/dita-help.xsl @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsl:stylesheet version="1.0" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns="http://www.w3.org/1999/xhtml"> + <xsl:output method="xml" indent="yes" encoding="UTF-8" /> + + <xsl:template match="/"> + <html> + <head> + <title><xsl:value-of select="/cshelp/title" /></title> + <meta charset="UTF-8" /> + <link rel="shortcut icon" href="../../images/logo.ico" /> + <link rel="stylesheet" type="text/css" href="../wok.css" /> + </head> + <body> + <xsl:apply-templates select="//cshelp" /> + </body> + </html> + </xsl:template> + + <xsl:template match="cshelp"> + <h1><xsl:value-of select="title" /></h1> + <p class="shortdesc"><xsl:value-of select="shortdesc" /></p> + <p class="csbody"><xsl:copy-of select="csbody/node()" /></p> + </xsl:template> +</xsl:stylesheet> diff --git a/ui/pages/help/en_US/Makefile.am b/ui/pages/help/en_US/Makefile.am new file mode 100644 index 0000000..b1e807d --- /dev/null +++ b/ui/pages/help/en_US/Makefile.am @@ -0,0 +1,23 @@ +# Copyright IBM Corp, 2014 +# +# 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 + +en_US_helpdir = $(datadir)/wok/ui/pages/help/en_US + +dist_en_US_help_DATA = $(wildcard *.html) $(NULL) + +EXTRA_DIST = $(wildcard *.dita) + +CLEANFILES = $(wildcard *.html) \ No newline at end of file diff --git a/ui/pages/help/en_US/wokhelp.dita b/ui/pages/help/en_US/wokhelp.dita new file mode 100644 index 0000000..582e47b --- /dev/null +++ b/ui/pages/help/en_US/wokhelp.dita @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE cshelp PUBLIC "-//IBM//DTD DITA CSHelp//EN" + "..\dtd\cshelp.dtd"> +<?Pub Sty _display FontColor="red"?> +<?Pub Inc?> + +<cshelp id="wokbase" xml:lang="en-us"> +<title>Wok (Webserver Originated from Kimchi)</title> +<shortdesc>Wok is a cherrypy-based web framework with HTML5 support that is extended by plugins which expose functionality through REST APIs.</shortdesc> +<csbody> +<p>Currently available plugins are Kimchi (Virtualization Management) and Ginger (System Administration). +Wok comes with a sample plugin for education purposes.<ul> +<li><uicontrol>Download Kimchi : </uicontrol> +<a href="https://github.com/kimchi-project/kimchi/tree/wok" +target="_blank" >https://github.com/kimchi-project/kimchi/tree/wok</a> +</li> +<li><uicontrol>Download Ginger : </uicontrol> +<a href="https://github.com/kimchi-project/ginger/tree/ginger_wok" +target="_blank" >https://github.com/kimchi-project/ginger/tree/ginger_wok</a> +</li> +</ul> +</p> +</csbody> +</cshelp> diff --git a/ui/pages/help/wok.css b/ui/pages/help/wok.css new file mode 100644 index 0000000..32fae4a --- /dev/null +++ b/ui/pages/help/wok.css @@ -0,0 +1,208 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2014 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +BODY { + background: #FFFFFF; + margin-bottom: 1em; + margin-left: .5em; +} + +bold { + font-weight: bold; +} + +boldItalic { + font-weight: bold; + font-style: italic; +} + +italic { + font-style: italic; +} + +underlined { + text-decoration: underline; +} + +uicontrol { + font-weight: bold; +} + +filepath { + font-family: monospace, monospace; +}.option { + font-family: monospace, monospace; +} + +cmdname { + font-weight: bold; + font-family: monospace, monospace; +} + +.defparmname { + font-weight: bold; + text-decoration: underline; + font-family: monospace, monospace; +} + +.kwd { + font-weight: bold; +} + +.defkwd { + font-weight: bold; + text-decoration: underline; +} + +var { + font-style : italic; +} + +strongwintitle { + font-weight : bold; +} + +parmname { + font-weight: bold; + font-family: monospace, monospace; + white-space: nowrap; +} + +code { + font-family: monospace, monospace; +} + +pre { + font-family: monospace, monospace; +} + +CITE { + font-style: italic; +} + +EM { + font-style: italic; +} + +STRONG { + font-weight: bold; +} + +VAR { + font-style: italic; +} + +dt { + font-weight: bold; +} + +/*********************************************************** + * Basic fonts + ***********************************************************/ +body, +td, +th, +caption { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 10pt; +} + +pre, code { + font-family: MS Courier New, Courier, monospace; +} + +h1, h2, h3 { + font-size: 12pt; + font-weight: bold; + color: #336699; +} + +h4 { + font-size: 10pt; + font-weight: bold; + color: #336699; +} + +/*********************************************************** + * Basic indents, padding, and margin + ***********************************************************/ +body { + color: black; + background-color: white; + margin: 0; + padding-top: 0.2em; + padding-left: 0.6em; + padding-right: 0.2em; + padding-bottom: 1em; +} + +h1, +h2, +h3, +h4, +h5, +h6 { + padding: 0; + margin-top: 1em; + margin-bottom: 0.75em; + margin-left: 0; + margin-right: 0; +} + +address, +dl, +li, +p { + padding: 0; + margin-top: 0.75em; + margin-bottom: 0.75em; + margin-left: 0; + margin-right: 0; + line-height: 125%; +} + +td dl { + margin-left: 2em; +} + +pre { + padding: 0; + margin-top: 0.75em; + margin-bottom: 0.75em; + margin-left: 2em; + margin-right: 0; +} + +ol, +ul { + padding: 0; + margin-top: 0.75em; + margin-bottom: 0.75em; + margin-left: 2.00em; + margin-right: 0; +} + +dd { + margin-left: 3.00em; + margin-top: 0.75em; + margin-bottom: 0.75em; +} + +dt { + margin-left: 1.00em; + margin-top: 0.75em; +} -- 2.1.0

3 3

[PATCH v2] Set default VM template memory to 2048 in Power
by dhbarboza82＠gmail.com 06 Aug '15

06 Aug '15

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> There are no official Kimchi support for VMs running with under 2048Mb of RAM in Power systems. This patch set the default memory of templates created in Power hosts to 2048, instead of 1280. This patch also adds the default memory for x86_64 arch to the template_specs dict of osinfo.py instead of hardcoding the value in the _get_tmpl_defaults() function. Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> --- src/kimchi/osinfo.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 78eb828..f8ab7da 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -35,37 +35,39 @@ SUPPORTED_ARCHS = {'x86': ('i386', 'i686', 'x86_64'), template_specs = {'x86': {'old': dict(disk_bus='ide', - nic_model='e1000', sound_model='ich6'), + nic_model='e1000', sound_model='ich6', + memory=1024), 'modern': dict(disk_bus='virtio', nic_model='virtio', - sound_model='ich6')}, + sound_model='ich6', + memory=1024)}, 'power': {'old': dict(disk_bus='scsi', nic_model='spapr-vlan', cdrom_bus='scsi', kbd_type="kbd", kbd_bus='usb', mouse_bus='usb', - tablet_bus='usb', memory=1280), + tablet_bus='usb', memory=2048), 'modern': dict(disk_bus='virtio', nic_model='virtio', cdrom_bus='scsi', kbd_bus='usb', kbd_type="kbd", mouse_bus='usb', tablet_bus='usb', - memory=1280)}, + memory=2048)}, 'ppc64le': {'old': dict(disk_bus='virtio', nic_model='virtio', cdrom_bus='scsi', kbd_bus='usb', kbd_type="keyboard", mouse_bus='usb', tablet_bus='usb', - memory=1280), + memory=2048), 'modern': dict(disk_bus='virtio', nic_model='virtio', cdrom_bus='scsi', kbd_bus='usb', kbd_type="keyboard", mouse_bus='usb', tablet_bus='usb', - memory=1280)}} + memory=2048)}} custom_specs = {'fedora': {'22': dict(video_model='qxl')}} @@ -107,7 +109,6 @@ def _get_tmpl_defaults(): # Create dict with default values tmpl_defaults = defaultdict(dict) tmpl_defaults['main']['networks'] = ['default'] - tmpl_defaults['main']['memory'] = 1024 tmpl_defaults['storage']['pool'] = 'default' tmpl_defaults['storage']['disk.0'] = {'size': 10, 'format': 'qcow2'} tmpl_defaults['processor']['cpus'] = 1 -- 2.4.3

1 0

adding '/auth' for authentication
by Harshal Patil 06 Aug '15

06 Aug '15

3 5

[PATCH] Setting default memory of PPC to 2048
by dhbarboza82＠gmail.com 06 Aug '15

06 Aug '15

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> At this moment Kimchi for Power systems does not support guests created with less that 2Gb of RAM. This patch set the default Power template to reflect it. Any user defined setting in template.conf will overwrite this default. This is intended. The user must have the final word in the customization of his/her VM templates. Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> --- src/kimchi/osinfo.py | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 78eb828..6506f2d 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -44,28 +44,28 @@ template_specs = {'x86': {'old': dict(disk_bus='ide', cdrom_bus='scsi', kbd_type="kbd", kbd_bus='usb', mouse_bus='usb', - tablet_bus='usb', memory=1280), + tablet_bus='usb', memory=2048), 'modern': dict(disk_bus='virtio', nic_model='virtio', cdrom_bus='scsi', kbd_bus='usb', kbd_type="kbd", mouse_bus='usb', tablet_bus='usb', - memory=1280)}, + memory=2048)}, 'ppc64le': {'old': dict(disk_bus='virtio', nic_model='virtio', cdrom_bus='scsi', kbd_bus='usb', kbd_type="keyboard", mouse_bus='usb', tablet_bus='usb', - memory=1280), + memory=2048), 'modern': dict(disk_bus='virtio', nic_model='virtio', cdrom_bus='scsi', kbd_bus='usb', kbd_type="keyboard", mouse_bus='usb', tablet_bus='usb', - memory=1280)}} + memory=2048)}} custom_specs = {'fedora': {'22': dict(video_model='qxl')}} @@ -89,6 +89,16 @@ icon_available_distros = [icon[5:-4] for icon in glob.glob1('%s/images/' % paths.ui_dir, 'icon-*.png')] +def _get_arch(): + for arch, sub_archs in SUPPORTED_ARCHS.iteritems(): + if os.uname()[4] in sub_archs: + return arch + + +def _get_default_template_mem(host_arch): + return template_specs[host_arch]['modern'].get('memory', 1024) + + def _get_tmpl_defaults(): """ ConfigObj returns a dict like below when no changes were made in the @@ -107,7 +117,7 @@ def _get_tmpl_defaults(): # Create dict with default values tmpl_defaults = defaultdict(dict) tmpl_defaults['main']['networks'] = ['default'] - tmpl_defaults['main']['memory'] = 1024 + tmpl_defaults['main']['memory'] = _get_default_template_mem(_get_arch()) tmpl_defaults['storage']['pool'] = 'default' tmpl_defaults['storage']['disk.0'] = {'size': 10, 'format': 'qcow2'} tmpl_defaults['processor']['cpus'] = 1 @@ -157,12 +167,6 @@ def _get_tmpl_defaults(): defaults = _get_tmpl_defaults() -def _get_arch(): - for arch, sub_archs in SUPPORTED_ARCHS.iteritems(): - if os.uname()[4] in sub_archs: - return arch - - def get_template_default(template_type, field): host_arch = _get_arch() # Assuming 'power' = 'ppc64le' because lookup() does the same, -- 2.4.3

3 2

Problems using Kimchi inside a VNC session
by Ramon Medeiros 05 Aug '15

05 Aug '15

Hi, did anyone hit an issue using kimchi inside a VNC session? I tried to use Kimchi inside it, and i can't type on the novnc console. -- Ramon Nunes Medeiros Kimchi Developer Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

3 3

[Clarification] WOK branch UI development
by Chandra Sr Potula 05 Aug '15

05 Aug '15

Hi Kimchi Devel-team, There was good amount of discussion on using of bootstrap or foundation 5 for the new-ui development for WOK branch in the IRC (on 2015-07-08). Question I have on this topic: 1. Are we experimenting with bootstrap and decide in the near future on technology for new-ui development or bootstrap is the way to go for UI ? 2. Also are we applying the design thinking as well when it comes to new-ui development for kimchi? 3. Do we have time line to accomplish this transformation ? We have seen few UI issues in the WOK branch after separation of kimchi plugin from base frame work (Issues #704-709). I see all of them labeled as 'wok' now. So for short time is it worth while to fix these issues ? If so, is there a way assign these to my team members or some body help us in fixing these issues ? Thanks in advance, Regards Chandra

3 3

[DOUBT] How to use setTimeout correctly
by Ramon Medeiros 05 Aug '15

05 Aug '15

Hi team, i was trying to cache 2 objects, but they came from a HTTP request, and took some time to download it. I was unable to use the function setTimeout while calling this function: kimchi.getPCIDeviceCompanions(kimchi.hostPCIs[i].name, setTimeout(function(result) { kimchi.deviceCompanions[kimchi.hostPCIs[i].name] = result; },5000)); } The function kimchi.getPCIDeviceCompanions usually takes 2s to finish. -- Ramon Nunes Medeiros Kimchi Developer Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

3 5

[PATCH V3 00/34] Split code into Wok server and Kimchi plugin
by Lucio Correia 05 Aug '15

05 Aug '15

v3 changes: * Rebased with new-ui * Reorganized UI files and removed unnecessary duplicated ones * Added patch 01 to fix new-ui branch * Added patch 33 to split error messages * Added patch 34 to move small specific css code to plugin Github branch URL: https://github.com/lcorreia/kimchi/tree/lcorreia/wok-v3 This patchset splits code into web server framework (Wok) and virtualization layer functionality (Kimchi, made a plugin). Wok stands for Webserver Originated from Kimchi. It's now stable and working. Despite the size of patchset, the review will be straightforward. The biggest patches have only repetitive changes, like file/variable renames or URI changes. Patches organization: * 02 to 04: just renames, no code changes. * 05: just duplications of files * 06 to 14: initial changes - mostly repetitive stuff like renames * 15 and 16: core changes - a good summary of reorganization done to the code * 17 to 29: small fixes necessary for the reorganization to work * 30 to 34: additional fixes Patches 02 to 29 should be applied as a single commit in order to not break functionality. They are separated here to easy the reviewers work. Thanks, Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> Signed-off-by: Gustavo Y. Ribeiro <gyr(a)linux.vnet.ibm.com> Lucio Correia (34): Add makefiles for fontello Create kimchi plugin Rename src/kimchi to src/wok Rename kimchi-named files to wok Duplicate some files Update wok docs Update kimchi plugin docs Update wok build files Update kimchi plugin makefiles Update wok daemon and specs Update kimchi plugin rpm specs Adapt imports to the new plugin structure Update server references to wok Use plugin relative URLs Setup wok Setup kimchi plugin Use InternalRedirect for all plugin redirects Dynamically add authed URLs to plugin conf Do not use tabs dir for kimchi plugin html templates Refer to kimchi plugin specific js/css in htmls Do not generate help index Fix import_module Make render_cheetah_file() plugin-aware Make cachebust's href() plugin-aware Default to first tab of first plugin Fix storage pool URI split Correctly join help pathes for plugins case Install plugin .mo files to default locale dir Adapt automated tests to the new plugin structure Use pool_uri to avoid case pool_name is not defined Fix Fedora RPM build issue Organize imports in all .py files Split error messages between wok and kimchi plugin Move kimchi-specific CSS to plugin .gitignore | 18 +- COPYING | 8 +- Makefile.am | 91 +- config/Makefile.am | 18 - config/ui/Makefile.am | 22 - config/ui/tabs.xml | 38 - configure.ac | 41 +- contrib/DEBIAN/control.in | 15 +- contrib/DEBIAN/postrm | 4 +- contrib/Makefile.am | 12 +- contrib/kimchi.spec.fedora.in | 189 -- contrib/kimchi.spec.suse.in | 150 - contrib/kimchid-upstart.conf.debian | 34 - contrib/kimchid-upstart.conf.fedora | 33 - contrib/kimchid.service.fedora | 13 - contrib/kimchid.sysvinit | 104 - contrib/make-deb.sh.in | 2 +- contrib/wok.spec.fedora.in | 159 + contrib/wok.spec.suse.in | 133 + contrib/wokd-upstart.conf.debian | 28 + contrib/wokd-upstart.conf.fedora | 28 + contrib/wokd.service.fedora | 13 + contrib/wokd.sysvinit | 104 + docs/API.md | 1123 +------- docs/Makefile.am | 9 +- docs/README-federation.md | 60 - docs/README.md | 202 +-- docs/{kimchid.8.in => wokd.8.in} | 0 plugins/Makefile.am | 2 +- plugins/kimchi/.gitignore | 37 + plugins/kimchi/API.json | 836 ++++++ plugins/kimchi/INSTALL | 369 +++ plugins/kimchi/Makefile.am | 159 + plugins/kimchi/README.md | 1 + plugins/kimchi/VERSION | 1 + plugins/kimchi/__init__.py | 21 + plugins/kimchi/autogen.sh | 21 + plugins/kimchi/build-aux/config.rpath | 672 +++++ plugins/kimchi/build-aux/genChangelog | 25 + plugins/kimchi/build-aux/pkg-version | 59 + plugins/kimchi/config.py.in | 139 + plugins/kimchi/config.rpath | 672 +++++ plugins/kimchi/configure.ac | 119 + plugins/kimchi/contrib/DEBIAN/Makefile.am | 17 + plugins/kimchi/contrib/DEBIAN/control.in | 36 + plugins/kimchi/contrib/Makefile.am | 34 + plugins/kimchi/contrib/check_i18n.py | 82 + plugins/kimchi/contrib/kimchi.spec.fedora.in | 124 + plugins/kimchi/contrib/kimchi.spec.suse.in | 113 + {contrib => plugins/kimchi/contrib}/make-deb.sh.in | 0 plugins/kimchi/control/Makefile.am | 27 + plugins/kimchi/control/__init__.py | 26 + plugins/kimchi/control/config.py | 57 + plugins/kimchi/control/cpuinfo.py | 37 + plugins/kimchi/control/debugreports.py | 61 + plugins/kimchi/control/groups.py | 28 + plugins/kimchi/control/host.py | 157 + plugins/kimchi/control/interfaces.py | 46 + plugins/kimchi/control/networks.py | 54 + plugins/kimchi/control/peers.py | 29 + plugins/kimchi/control/storagepools.py | 116 + plugins/kimchi/control/storageservers.py | 60 + plugins/kimchi/control/storagevolumes.py | 83 + plugins/kimchi/control/tasks.py | 37 + plugins/kimchi/control/templates.py | 58 + plugins/kimchi/control/users.py | 35 + plugins/kimchi/control/vm/Makefile.am | 26 + plugins/kimchi/control/vm/__init__.py | 26 + plugins/kimchi/control/vm/hostdevs.py | 43 + plugins/kimchi/control/vm/ifaces.py | 45 + plugins/kimchi/control/vm/snapshots.py | 58 + plugins/kimchi/control/vm/storages.py | 45 + plugins/kimchi/control/vms.py | 67 + plugins/kimchi/disks.py | 196 ++ plugins/kimchi/distroloader.py | 67 + {src => plugins/kimchi}/distros.d/Makefile.am | 0 {src => plugins/kimchi}/distros.d/debian.json | 0 {src => plugins/kimchi}/distros.d/fedora.json | 0 {src => plugins/kimchi}/distros.d/gentoo.json | 0 {src => plugins/kimchi}/distros.d/opensuse.json | 0 {src => plugins/kimchi}/distros.d/ubuntu.json | 0 plugins/kimchi/docs/API.md | 1147 +++++++ plugins/kimchi/docs/Makefile.am | 28 + plugins/kimchi/docs/README-federation.md | 60 + plugins/kimchi/docs/README.md | 247 ++ {docs => plugins/kimchi/docs}/kimchi-guest.png | Bin 192281 -> 192281 bytes {docs => plugins/kimchi/docs}/kimchi-login.png | Bin 318041 -> 318041 bytes {docs => plugins/kimchi/docs}/kimchi-templates.png | Bin 329678 -> 329678 bytes plugins/kimchi/i18n.py | 336 +++ plugins/kimchi/imageinfo.py | 72 + plugins/kimchi/iscsi.py | 88 + plugins/kimchi/isoinfo.py | 506 ++++ plugins/kimchi/kimchi.conf | 45 + plugins/kimchi/kvmusertests.py | 79 + plugins/kimchi/m4/ac_python_module.m4 | 30 + plugins/kimchi/m4/gettext.m4 | 383 +++ plugins/kimchi/m4/iconv.m4 | 214 ++ plugins/kimchi/m4/intlmacosx.m4 | 51 + plugins/kimchi/m4/lib-ld.m4 | 110 + plugins/kimchi/m4/lib-link.m4 | 774 +++++ plugins/kimchi/m4/lib-prefix.m4 | 224 ++ plugins/kimchi/m4/nls.m4 | 32 + plugins/kimchi/m4/po.m4 | 449 +++ plugins/kimchi/m4/progtest.m4 | 92 + plugins/kimchi/mockmodel.py | 624 ++++ plugins/kimchi/model/Makefile.am | 25 + {src => plugins}/kimchi/model/__init__.py | 0 plugins/kimchi/model/config.py | 176 ++ plugins/kimchi/model/cpuinfo.py | 126 + plugins/kimchi/model/debugreports.py | 213 ++ plugins/kimchi/model/diskutils.py | 75 + plugins/kimchi/model/featuretests.py | 259 ++ plugins/kimchi/model/groups.py | 67 + plugins/kimchi/model/host.py | 476 +++ plugins/kimchi/model/hostdev.py | 324 ++ plugins/kimchi/model/interfaces.py | 44 + plugins/kimchi/model/libvirtconnection.py | 136 + plugins/kimchi/model/libvirtstoragepool.py | 264 ++ plugins/kimchi/model/model.py | 52 + plugins/kimchi/model/networks.py | 381 +++ plugins/kimchi/model/peers.py | 72 + plugins/kimchi/model/storagepools.py | 491 +++ plugins/kimchi/model/storageservers.py | 81 + plugins/kimchi/model/storagetargets.py | 122 + plugins/kimchi/model/storagevolumes.py | 541 ++++ plugins/kimchi/model/tasks.py | 64 + plugins/kimchi/model/templates.py | 303 ++ plugins/kimchi/model/users.py | 90 + plugins/kimchi/model/utils.py | 161 + plugins/kimchi/model/vmhostdevs.py | 336 +++ plugins/kimchi/model/vmifaces.py | 186 ++ plugins/kimchi/model/vms.py | 1303 ++++++++ plugins/kimchi/model/vmsnapshots.py | 204 ++ plugins/kimchi/model/vmstorages.py | 252 ++ plugins/kimchi/osinfo.py | 214 ++ plugins/kimchi/po/LINGUAS | 11 + plugins/kimchi/po/Makefile.in.in | 398 +++ {po => plugins/kimchi/po}/Makevars | 0 plugins/kimchi/po/POTFILES.in | 3 + plugins/kimchi/po/de_DE.po | 2288 ++++++++++++++ plugins/kimchi/po/en_US.po | 2075 +++++++++++++ plugins/kimchi/po/es_ES.po | 2305 ++++++++++++++ plugins/kimchi/po/fr_FR.po | 2338 +++++++++++++++ {po => plugins/kimchi/po}/gen-pot.in | 0 plugins/kimchi/po/it_IT.po | 2274 ++++++++++++++ plugins/kimchi/po/ja_JP.po | 2269 ++++++++++++++ plugins/kimchi/po/kimchi.pot | 2074 +++++++++++++ plugins/kimchi/po/ko_KR.po | 2197 ++++++++++++++ plugins/kimchi/po/pt_BR.po | 2369 +++++++++++++++ plugins/kimchi/po/ru_RU.po | 2198 ++++++++++++++ plugins/kimchi/po/zh_CN.po | 2186 ++++++++++++++ plugins/kimchi/po/zh_TW.po | 2138 +++++++++++++ plugins/kimchi/repositories.py | 529 ++++ plugins/kimchi/root.py | 70 + plugins/kimchi/scan.py | 89 + plugins/kimchi/screenshot.py | 184 ++ plugins/kimchi/swupdate.py | 263 ++ {src => plugins/kimchi}/template.conf | 0 plugins/kimchi/tests/Makefile.am | 50 + plugins/kimchi/tests/iso_gen.py | 212 ++ plugins/kimchi/tests/run_tests.sh.in | 55 + plugins/kimchi/tests/test_authorization.py | 166 + plugins/kimchi/tests/test_config.py.in | 195 ++ plugins/kimchi/tests/test_exception.py | 113 + plugins/kimchi/tests/test_host.py | 200 ++ plugins/kimchi/tests/test_mock_network.py | 71 + plugins/kimchi/tests/test_mock_storagepool.py | 141 + plugins/kimchi/tests/test_mock_storagevolume.py | 94 + plugins/kimchi/tests/test_mockmodel.py | 139 + plugins/kimchi/tests/test_model.py | 1240 ++++++++ plugins/kimchi/tests/test_model_network.py | 145 + plugins/kimchi/tests/test_model_storagepool.py | 115 + plugins/kimchi/tests/test_model_storagevolume.py | 272 ++ plugins/kimchi/tests/test_networkxml.py | 172 ++ plugins/kimchi/tests/test_objectstore.py | 97 + plugins/kimchi/tests/test_osinfo.py | 69 + plugins/kimchi/tests/test_plugin.py | 127 + plugins/kimchi/tests/test_rest.py | 1221 ++++++++ plugins/kimchi/tests/test_rollbackcontext.py | 99 + plugins/kimchi/tests/test_server.py | 289 ++ plugins/kimchi/tests/test_storagepoolxml.py | 171 ++ plugins/kimchi/tests/test_template.py | 362 +++ plugins/kimchi/tests/test_utils.py | 69 + plugins/kimchi/tests/test_vmtemplate.py | 116 + plugins/kimchi/tests/test_yumparser.py | 162 + plugins/kimchi/tests/utils.py | 260 ++ plugins/kimchi/ui/Makefile.am | 20 + plugins/kimchi/ui/config/Makefile.am | 22 + plugins/kimchi/ui/config/tab-ext.xml | 38 + plugins/kimchi/ui/css/Makefile.am | 26 + plugins/kimchi/ui/css/theme-default/guest-edit.css | 424 +++ .../ui}/css/theme-default/guest-storage-add.css | 0 plugins/kimchi/ui/css/theme-default/host.css | 287 ++ plugins/kimchi/ui/css/theme-default/icon.css | 106 + plugins/kimchi/ui/css/theme-default/list.css | 326 ++ plugins/kimchi/ui/css/theme-default/network.css | 267 ++ .../kimchi/ui}/css/theme-default/report-add.css | 0 .../kimchi/ui/css/theme-default/report-rename.css | 39 + .../ui}/css/theme-default/repository-add.css | 0 .../ui}/css/theme-default/repository-edit.css | 0 plugins/kimchi/ui/css/theme-default/storage.css | 550 ++++ .../css/theme-default/storagepool-add-volume.css | 0 .../kimchi/ui}/css/theme-default/template-edit.css | 0 .../kimchi/ui}/css/theme-default/template.css | 0 .../kimchi/ui/css/theme-default/template_add.css | 317 ++ .../kimchi/ui}/css/theme-default/template_list.css | 0 plugins/kimchi/ui/images/Makefile.am | 22 + {ui => plugins/kimchi/ui}/images/icon-centos.png | Bin 4734 -> 4734 bytes {ui => plugins/kimchi/ui}/images/icon-debian.png | Bin 4239 -> 4239 bytes {ui => plugins/kimchi/ui}/images/icon-fedora.png | Bin 4449 -> 4449 bytes {ui => plugins/kimchi/ui}/images/icon-gentoo.png | Bin 15307 -> 15307 bytes {ui => plugins/kimchi/ui}/images/icon-opensuse.png | Bin 3046 -> 3046 bytes {ui => plugins/kimchi/ui}/images/icon-ubuntu.png | Bin 4818 -> 4818 bytes {ui => plugins/kimchi/ui}/images/icon-vm.png | Bin 2976 -> 2976 bytes plugins/kimchi/ui/images/logo.ico | Bin 0 -> 1214 bytes plugins/kimchi/ui/images/theme-default/Makefile.am | 20 + .../kimchi/ui}/images/theme-default/ac22_pause.png | Bin 1219 -> 1219 bytes .../ui}/images/theme-default/ac22_pause_grey.png | Bin 1175 -> 1175 bytes .../ui}/images/theme-default/ac24_resume.png | Bin 1341 -> 1341 bytes .../ui}/images/theme-default/ac24_resume_grey.png | Bin 1282 -> 1282 bytes .../ui/images/theme-default/arrow-down-black.png | Bin 0 -> 2942 bytes .../images/theme-default/arrow-down-disable.png | Bin 472 -> 472 bytes .../kimchi/ui/images/theme-default/arrow-down.png | Bin 0 -> 537 bytes .../kimchi/ui}/images/theme-default/arrow-up.png | Bin 510 -> 510 bytes .../kimchi/ui}/images/theme-default/arrow_out.png | Bin 3048 -> 3048 bytes .../kimchi/ui}/images/theme-default/group.png | Bin 1703 -> 1703 bytes .../ui}/images/theme-default/host-icon-sprite.png | Bin 1034 -> 1034 bytes .../kimchi/ui}/images/theme-default/icon-back.png | Bin 244 -> 244 bytes .../ui}/images/theme-default/icon-camera.png | Bin 4860 -> 4860 bytes .../ui}/images/theme-default/icon-design.png | Bin 4562 -> 4562 bytes .../ui}/images/theme-default/icon-detail.png | Bin 3079 -> 3079 bytes .../kimchi/ui}/images/theme-default/icon-iso.png | Bin 4188 -> 4188 bytes .../kimchi/ui}/images/theme-default/icon-list.png | Bin 2983 -> 2983 bytes .../kimchi/ui}/images/theme-default/icon-load.png | Bin 3678 -> 3678 bytes .../kimchi/ui}/images/theme-default/icon-local.png | Bin 425 -> 425 bytes .../ui}/images/theme-default/icon-power-down.png | Bin 4372 -> 4372 bytes .../ui}/images/theme-default/icon-power-up.png | Bin 4367 -> 4367 bytes .../kimchi/ui}/images/theme-default/icon-qcow2.png | Bin 4684 -> 4684 bytes .../kimchi/ui}/images/theme-default/icon-raw.png | Bin 4679 -> 4679 bytes .../ui}/images/theme-default/icon-remote.png | Bin 1005 -> 1005 bytes .../kimchi/ui}/images/theme-default/icon-reset.png | Bin 4576 -> 4576 bytes .../ui}/images/theme-default/icon-search.png | Bin 4197 -> 4197 bytes .../kimchi/ui}/images/theme-default/icon-sort.png | Bin 3421 -> 3421 bytes .../kimchi/ui}/images/theme-default/icon-tree.png | Bin 3526 -> 3526 bytes .../kimchi/ui}/images/theme-default/icon-user.png | Bin 5366 -> 5366 bytes .../images/theme-default/icon-volume-default.png | Bin 4265 -> 4265 bytes .../images/theme-default/kimchi-loading15x15.gif | Bin 1653 -> 1653 bytes .../kimchi/ui}/images/theme-default/loading.gif | Bin 2190 -> 2190 bytes .../kimchi/ui}/images/theme-default/user.png | Bin 1322 -> 1322 bytes plugins/kimchi/ui/js/Makefile.am | 27 + plugins/kimchi/ui/js/src/kimchi.api.js | 1355 +++++++++ plugins/kimchi/ui/js/src/kimchi.guest_add_main.js | 86 + plugins/kimchi/ui/js/src/kimchi.guest_edit_main.js | 759 +++++ plugins/kimchi/ui/js/src/kimchi.guest_main.js | 511 ++++ .../kimchi/ui/js/src/kimchi.guest_media_main.js | 56 + .../ui/js/src/kimchi.guest_storage_add.main.js | 199 ++ plugins/kimchi/ui/js/src/kimchi.host.js | 858 ++++++ plugins/kimchi/ui/js/src/kimchi.main.js | 26 + plugins/kimchi/ui/js/src/kimchi.network.js | 442 +++ plugins/kimchi/ui/js/src/kimchi.report_add_main.js | 72 + .../kimchi/ui/js/src/kimchi.report_rename_main.js | 66 + .../kimchi/ui/js/src/kimchi.repository_add_main.js | 96 + .../ui/js/src/kimchi.repository_edit_main.js | 74 + plugins/kimchi/ui/js/src/kimchi.storage_main.js | 428 +++ .../ui/js/src/kimchi.storagepool_add_main.js | 414 +++ .../js/src/kimchi.storagepool_add_volume_main.js | 179 ++ .../kimchi/ui/js/src/kimchi.template_add_main.js | 441 +++ .../kimchi/ui/js/src/kimchi.template_edit_main.js | 343 +++ plugins/kimchi/ui/js/src/kimchi.template_main.js | 111 + plugins/kimchi/ui/pages/Makefile.am | 22 + plugins/kimchi/ui/pages/guest-add.html.tmpl | 98 + .../kimchi/ui}/pages/guest-edit.html.tmpl | 0 .../kimchi/ui/pages/guest-storage-add.html.tmpl | 103 + plugins/kimchi/ui/pages/guest.html.tmpl | 77 + plugins/kimchi/ui/pages/guests.html.tmpl | 65 + plugins/kimchi/ui/pages/help/Makefile.am | 34 + plugins/kimchi/ui/pages/help/de_DE/Makefile.am | 23 + .../kimchi/ui}/pages/help/de_DE/guests.dita | 0 .../kimchi/ui}/pages/help/de_DE/host.dita | 0 .../kimchi/ui}/pages/help/de_DE/network.dita | 0 .../kimchi/ui}/pages/help/de_DE/storage.dita | 0 .../kimchi/ui}/pages/help/de_DE/templates.dita | 0 {ui => plugins/kimchi/ui}/pages/help/dita-help.xsl | 0 plugins/kimchi/ui/pages/help/en_US/Makefile.am | 23 + .../kimchi/ui}/pages/help/en_US/guests.dita | 0 .../kimchi/ui}/pages/help/en_US/host.dita | 0 .../kimchi/ui}/pages/help/en_US/network.dita | 0 .../kimchi/ui}/pages/help/en_US/storage.dita | 0 .../kimchi/ui}/pages/help/en_US/templates.dita | 0 plugins/kimchi/ui/pages/help/es_ES/Makefile.am | 23 + .../kimchi/ui}/pages/help/es_ES/guests.dita | 0 .../kimchi/ui}/pages/help/es_ES/host.dita | 0 .../kimchi/ui}/pages/help/es_ES/network.dita | 0 .../kimchi/ui}/pages/help/es_ES/storage.dita | 0 .../kimchi/ui}/pages/help/es_ES/templates.dita | 0 plugins/kimchi/ui/pages/help/fr_FR/Makefile.am | 23 + .../kimchi/ui}/pages/help/fr_FR/guests.dita | 0 .../kimchi/ui}/pages/help/fr_FR/host.dita | 0 .../kimchi/ui}/pages/help/fr_FR/network.dita | 0 .../kimchi/ui}/pages/help/fr_FR/storage.dita | 0 .../kimchi/ui}/pages/help/fr_FR/templates.dita | 0 plugins/kimchi/ui/pages/help/it_IT/Makefile.am | 23 + .../kimchi/ui}/pages/help/it_IT/guests.dita | 0 .../kimchi/ui}/pages/help/it_IT/host.dita | 0 .../kimchi/ui}/pages/help/it_IT/network.dita | 0 .../kimchi/ui}/pages/help/it_IT/storage.dita | 0 .../kimchi/ui}/pages/help/it_IT/templates.dita | 0 plugins/kimchi/ui/pages/help/ja_JP/Makefile.am | 23 + .../kimchi/ui}/pages/help/ja_JP/guests.dita | 0 .../kimchi/ui}/pages/help/ja_JP/host.dita | 0 .../kimchi/ui}/pages/help/ja_JP/network.dita | 0 .../kimchi/ui}/pages/help/ja_JP/storage.dita | 0 .../kimchi/ui}/pages/help/ja_JP/templates.dita | 0 {ui => plugins/kimchi/ui}/pages/help/kimchi.css | 0 plugins/kimchi/ui/pages/help/ko_KR/Makefile.am | 23 + .../kimchi/ui}/pages/help/ko_KR/guests.dita | 0 .../kimchi/ui}/pages/help/ko_KR/host.dita | 0 .../kimchi/ui}/pages/help/ko_KR/network.dita | 0 .../kimchi/ui}/pages/help/ko_KR/storage.dita | 0 .../kimchi/ui}/pages/help/ko_KR/templates.dita | 0 plugins/kimchi/ui/pages/help/pt_BR/Makefile.am | 23 + .../kimchi/ui}/pages/help/pt_BR/guests.dita | 0 .../kimchi/ui}/pages/help/pt_BR/host.dita | 0 .../kimchi/ui}/pages/help/pt_BR/network.dita | 0 .../kimchi/ui}/pages/help/pt_BR/storage.dita | 0 .../kimchi/ui}/pages/help/pt_BR/templates.dita | 0 plugins/kimchi/ui/pages/help/ru_RU/Makefile.am | 23 + .../kimchi/ui}/pages/help/ru_RU/guests.dita | 0 .../kimchi/ui}/pages/help/ru_RU/host.dita | 0 .../kimchi/ui}/pages/help/ru_RU/network.dita | 0 .../kimchi/ui}/pages/help/ru_RU/storage.dita | 0 .../kimchi/ui}/pages/help/ru_RU/templates.dita | 0 plugins/kimchi/ui/pages/help/zh_CN/Makefile.am | 23 + .../kimchi/ui}/pages/help/zh_CN/guests.dita | 0 .../kimchi/ui}/pages/help/zh_CN/host.dita | 0 .../kimchi/ui}/pages/help/zh_CN/network.dita | 0 .../kimchi/ui}/pages/help/zh_CN/storage.dita | 0 .../kimchi/ui}/pages/help/zh_CN/templates.dita | 0 plugins/kimchi/ui/pages/help/zh_TW/Makefile.am | 23 + .../kimchi/ui}/pages/help/zh_TW/guests.dita | 0 .../kimchi/ui}/pages/help/zh_TW/host.dita | 0 .../kimchi/ui}/pages/help/zh_TW/network.dita | 0 .../kimchi/ui}/pages/help/zh_TW/storage.dita | 0 .../kimchi/ui}/pages/help/zh_TW/templates.dita | 0 plugins/kimchi/ui/pages/host.html.tmpl | 177 ++ plugins/kimchi/ui/pages/i18n.json.tmpl | 187 ++ plugins/kimchi/ui/pages/network.html.tmpl | 133 + plugins/kimchi/ui/pages/report-add.html.tmpl | 56 + plugins/kimchi/ui/pages/report-rename.html.tmpl | 56 + plugins/kimchi/ui/pages/repository-add.html.tmpl | 113 + plugins/kimchi/ui/pages/repository-edit.html.tmpl | 117 + plugins/kimchi/ui/pages/storage.html.tmpl | 143 + .../ui/pages/storagepool-add-volume.html.tmpl | 79 + plugins/kimchi/ui/pages/storagepool-add.html.tmpl | 186 ++ plugins/kimchi/ui/pages/template-add.html.tmpl | 233 ++ plugins/kimchi/ui/pages/template-edit.html.tmpl | 193 ++ plugins/kimchi/ui/pages/templates.html.tmpl | 77 + plugins/kimchi/ui/robots.txt | 2 + plugins/kimchi/ui/spice-html5/Makefile.am | 25 + .../kimchi/ui}/spice-html5/atKeynames.js | 0 {ui => plugins/kimchi/ui}/spice-html5/bitmap.js | 0 plugins/kimchi/ui/spice-html5/css/Makefile.am | 20 + .../kimchi/ui}/spice-html5/css/spice.css | 0 {ui => plugins/kimchi/ui}/spice-html5/cursor.js | 0 {ui => plugins/kimchi/ui}/spice-html5/display.js | 0 {ui => plugins/kimchi/ui}/spice-html5/enums.js | 0 {ui => plugins/kimchi/ui}/spice-html5/inputs.js | 0 {ui => plugins/kimchi/ui}/spice-html5/lz.js | 0 {ui => plugins/kimchi/ui}/spice-html5/main.js | 0 plugins/kimchi/ui/spice-html5/pages/Makefile.am | 20 + .../kimchi/ui/spice-html5/pages/spice_auto.html | 200 ++ {ui => plugins/kimchi/ui}/spice-html5/playback.js | 0 {ui => plugins/kimchi/ui}/spice-html5/png.js | 0 {ui => plugins/kimchi/ui}/spice-html5/quic.js | 0 {ui => plugins/kimchi/ui}/spice-html5/resize.js | 0 .../kimchi/ui}/spice-html5/simulatecursor.js | 0 .../kimchi/ui}/spice-html5/spicearraybuffer.js | 0 {ui => plugins/kimchi/ui}/spice-html5/spiceconn.js | 0 .../kimchi/ui}/spice-html5/spicedataview.js | 0 {ui => plugins/kimchi/ui}/spice-html5/spicemsg.js | 0 {ui => plugins/kimchi/ui}/spice-html5/spicetype.js | 0 .../kimchi/ui/spice-html5/thirdparty/Makefile.am | 20 + .../kimchi/ui}/spice-html5/thirdparty/jsbn.js | 0 .../kimchi/ui}/spice-html5/thirdparty/prng4.js | 0 .../kimchi/ui}/spice-html5/thirdparty/rng.js | 0 .../kimchi/ui}/spice-html5/thirdparty/rsa.js | 0 .../kimchi/ui}/spice-html5/thirdparty/sha1.js | 0 {ui => plugins/kimchi/ui}/spice-html5/ticket.js | 0 {ui => plugins/kimchi/ui}/spice-html5/utils.js | 0 {ui => plugins/kimchi/ui}/spice-html5/webm.js | 0 {ui => plugins/kimchi/ui}/spice-html5/wire.js | 0 plugins/kimchi/utils.py | 40 + plugins/kimchi/vmtemplate.py | 431 +++ plugins/kimchi/xmlutils/Makefile.am | 25 + {src => plugins}/kimchi/xmlutils/__init__.py | 0 {src => plugins}/kimchi/xmlutils/cpu.py | 0 plugins/kimchi/xmlutils/disk.py | 164 + plugins/kimchi/xmlutils/graphics.py | 45 + plugins/kimchi/xmlutils/interface.py | 61 + plugins/kimchi/xmlutils/network.py | 122 + {src => plugins}/kimchi/xmlutils/qemucmdline.py | 0 plugins/kimchi/yumparser.py | 283 ++ plugins/sample/API.json | 2 +- plugins/sample/__init__.py | 14 +- plugins/sample/model.py | 4 +- plugins/sample/sample.conf.in | 12 +- plugins/sample/ui/js/util.js | 6 +- .../sample/ui/pages/help/en_US/sample-tab1.html | 2 +- .../sample/ui/pages/help/en_US/sample-tab2.html | 2 +- plugins/sample/ui/pages/i18n.json.tmpl | 2 +- po/Makevars | 2 +- po/POTFILES.in | 3 +- po/de_DE.po | 2737 +++++++----------- po/en_US.po | 1686 +---------- po/es_ES.po | 2763 +++++++----------- po/fr_FR.po | 2997 ++++++++----------- po/gen-pot.in | 2 +- po/it_IT.po | 2706 +++++++----------- po/ja_JP.po | 2694 +++++++----------- po/kimchi.pot | 2162 -------------- po/ko_KR.po | 2558 ++++++---------- po/pt_BR.po | 3140 +++++++++----------- po/ru_RU.po | 2558 ++++++---------- po/wok.pot | 553 ++++ po/zh_CN.po | 2816 ++++++++---------- po/zh_TW.po | 2442 ++++++---------- src/Makefile.am | 24 +- src/firewalld.xml | 4 +- src/kimchi.conf.in | 65 - src/kimchi/API.json | 836 ------ src/kimchi/Makefile.am | 61 - src/kimchi/asynctask.py | 74 - src/kimchi/auth.py | 352 --- src/kimchi/cachebust.py | 30 - src/kimchi/config.py.in | 324 -- src/kimchi/control/Makefile.am | 27 - src/kimchi/control/__init__.py | 26 - src/kimchi/control/base.py | 381 --- src/kimchi/control/config.py | 57 - src/kimchi/control/cpuinfo.py | 37 - src/kimchi/control/debugreports.py | 61 - src/kimchi/control/groups.py | 28 - src/kimchi/control/host.py | 156 - src/kimchi/control/interfaces.py | 46 - src/kimchi/control/networks.py | 54 - src/kimchi/control/peers.py | 29 - src/kimchi/control/plugins.py | 27 - src/kimchi/control/storagepools.py | 115 - src/kimchi/control/storageservers.py | 60 - src/kimchi/control/storagevolumes.py | 83 - src/kimchi/control/tasks.py | 37 - src/kimchi/control/templates.py | 58 - src/kimchi/control/users.py | 35 - src/kimchi/control/utils.py | 149 - src/kimchi/control/vm/Makefile.am | 26 - src/kimchi/control/vm/__init__.py | 26 - src/kimchi/control/vm/hostdevs.py | 43 - src/kimchi/control/vm/ifaces.py | 45 - src/kimchi/control/vm/snapshots.py | 58 - src/kimchi/control/vm/storages.py | 45 - src/kimchi/control/vms.py | 66 - src/kimchi/disks.py | 197 -- src/kimchi/distroloader.py | 66 - src/kimchi/exception.py | 102 - src/kimchi/i18n.py | 354 --- src/kimchi/imageinfo.py | 72 - src/kimchi/iscsi.py | 88 - src/kimchi/isoinfo.py | 506 ---- src/kimchi/kvmusertests.py | 79 - src/kimchi/mockmodel.py | 625 ---- src/kimchi/model/Makefile.am | 25 - src/kimchi/model/config.py | 175 -- src/kimchi/model/cpuinfo.py | 126 - src/kimchi/model/debugreports.py | 211 -- src/kimchi/model/diskutils.py | 75 - src/kimchi/model/featuretests.py | 259 -- src/kimchi/model/groups.py | 67 - src/kimchi/model/host.py | 476 --- src/kimchi/model/hostdev.py | 323 -- src/kimchi/model/interfaces.py | 43 - src/kimchi/model/libvirtconnection.py | 137 - src/kimchi/model/libvirtstoragepool.py | 264 -- src/kimchi/model/model.py | 51 - src/kimchi/model/networks.py | 382 --- src/kimchi/model/peers.py | 72 - src/kimchi/model/plugins.py | 28 - src/kimchi/model/storagepools.py | 489 --- src/kimchi/model/storageservers.py | 80 - src/kimchi/model/storagetargets.py | 121 - src/kimchi/model/storagevolumes.py | 541 ---- src/kimchi/model/tasks.py | 64 - src/kimchi/model/templates.py | 303 -- src/kimchi/model/users.py | 90 - src/kimchi/model/utils.py | 160 - src/kimchi/model/vmhostdevs.py | 336 --- src/kimchi/model/vmifaces.py | 186 -- src/kimchi/model/vms.py | 1300 -------- src/kimchi/model/vmsnapshots.py | 204 -- src/kimchi/model/vmstorages.py | 251 -- src/kimchi/objectstore.py | 133 - src/kimchi/osinfo.py | 213 -- src/kimchi/proxy.py | 105 - src/kimchi/repositories.py | 529 ---- src/kimchi/root.py | 149 - src/kimchi/scan.py | 89 - src/kimchi/screenshot.py | 184 -- src/kimchi/server.py | 188 -- src/kimchi/sslcert.py | 91 - src/kimchi/swupdate.py | 262 -- src/kimchi/template.py | 111 - src/kimchi/utils.py | 549 ---- src/kimchi/vmtemplate.py | 430 --- src/kimchi/vnc.py | 78 - src/kimchi/xmlutils/Makefile.am | 25 - src/kimchi/xmlutils/disk.py | 164 - src/kimchi/xmlutils/graphics.py | 46 - src/kimchi/xmlutils/interface.py | 62 - src/kimchi/xmlutils/network.py | 123 - src/kimchi/yumparser.py | 283 -- src/kimchid.in | 99 - src/nginx/Makefile.am | 6 +- src/nginx/kimchi.conf.in | 78 - src/nginx/wok.conf.in | 78 + src/wok.conf.in | 65 + src/wok/API.json | 6 + src/wok/Makefile.am | 61 + src/{kimchi => wok}/__init__.py | 0 src/wok/asynctask.py | 74 + src/wok/auth.py | 352 +++ src/{kimchi => wok}/basemodel.py | 0 src/wok/cachebust.py | 35 + src/wok/config.py.in | 202 ++ src/wok/control/Makefile.am | 25 + src/wok/control/__init__.py | 26 + src/wok/control/base.py | 381 +++ src/wok/control/plugins.py | 27 + src/wok/control/utils.py | 147 + src/wok/exception.py | 102 + src/wok/i18n.py | 47 + src/wok/model/Makefile.am | 25 + src/{kimchi => wok}/model/__init__.py | 0 src/wok/model/model.py | 49 + src/wok/model/plugins.py | 28 + src/{kimchi => wok}/netinfo.py | 0 src/{kimchi => wok}/network.py | 0 src/wok/objectstore.py | 132 + src/wok/proxy.py | 105 + src/{kimchi => wok}/rollbackcontext.py | 0 src/wok/root.py | 148 + src/wok/server.py | 203 ++ src/wok/sslcert.py | 89 + src/wok/template.py | 112 + src/wok/utils.py | 533 ++++ src/wok/vnc.py | 77 + src/wok/xmlutils/Makefile.am | 25 + src/{kimchi/model => wok/xmlutils}/__init__.py | 0 src/{kimchi => wok}/xmlutils/utils.py | 0 src/wokd.in | 99 + tests/Makefile.am | 50 - tests/iso_gen.py | 211 -- tests/run_tests.sh.in | 55 - tests/test_authorization.py | 166 - tests/test_config.py.in | 196 -- tests/test_exception.py | 112 - tests/test_host.py | 192 -- tests/test_mock_network.py | 71 - tests/test_mock_storagepool.py | 141 - tests/test_mock_storagevolume.py | 94 - tests/test_mockmodel.py | 138 - tests/test_model.py | 1228 -------- tests/test_model_network.py | 144 - tests/test_model_storagepool.py | 114 - tests/test_model_storagevolume.py | 269 -- tests/test_networkxml.py | 171 -- tests/test_objectstore.py | 96 - tests/test_osinfo.py | 70 - tests/test_plugin.py | 128 - tests/test_rest.py | 1208 -------- tests/test_rollbackcontext.py | 99 - tests/test_server.py | 287 -- tests/test_storagepoolxml.py | 171 -- tests/test_template.py | 362 --- tests/test_utils.py | 69 - tests/test_vmtemplate.py | 116 - tests/test_yumparser.py | 161 - tests/utils.py | 260 -- ui/Makefile.am | 4 +- ui/css/Makefile.am | 2 +- ui/css/theme-default/button.css | 85 - ui/css/theme-default/grid.css | 2 +- ui/css/theme-default/guest-edit.css | 424 --- ui/css/theme-default/host.css | 287 -- ui/css/theme-default/list.css | 326 -- ui/css/theme-default/network.css | 267 -- ui/css/theme-default/report-rename.css | 39 - ui/css/theme-default/storage.css | 554 ---- ui/css/theme-default/template_add.css | 317 -- ui/css/theme-default/topbar.css | 4 + ui/fontello/Makefile.am | 22 + ui/fontello/css/Makefile.am | 20 + ui/fontello/font/Makefile.am | 20 + ui/images/Makefile.am | 4 +- ui/images/theme-default/Makefile.am | 2 +- .../{kimchi-loading.gif => wok-loading.gif} | Bin 6181 -> 6181 bytes ui/js/Makefile.am | 8 +- ui/js/src/kimchi.api.js | 1411 --------- ui/js/src/kimchi.cookie.js | 40 - ui/js/src/kimchi.grid.js | 528 ---- ui/js/src/kimchi.guest_add_main.js | 86 - ui/js/src/kimchi.guest_edit_main.js | 759 ----- ui/js/src/kimchi.guest_main.js | 511 ---- ui/js/src/kimchi.guest_media_main.js | 56 - ui/js/src/kimchi.guest_storage_add.main.js | 199 -- ui/js/src/kimchi.host.js | 856 ------ ui/js/src/kimchi.lang.js | 50 - ui/js/src/kimchi.line-chart.js | 202 -- ui/js/src/kimchi.login.js | 72 - ui/js/src/kimchi.main.js | 366 --- ui/js/src/kimchi.message.js | 116 - ui/js/src/kimchi.network.js | 442 --- ui/js/src/kimchi.popable.js | 34 - ui/js/src/kimchi.report_add_main.js | 72 - ui/js/src/kimchi.report_rename_main.js | 66 - ui/js/src/kimchi.repository_add_main.js | 96 - ui/js/src/kimchi.repository_edit_main.js | 74 - ui/js/src/kimchi.select.js | 50 - ui/js/src/kimchi.storage_main.js | 428 --- ui/js/src/kimchi.storagepool_add_main.js | 414 --- ui/js/src/kimchi.storagepool_add_volume_main.js | 179 -- ui/js/src/kimchi.substitute.js | 45 - ui/js/src/kimchi.template_add_main.js | 441 --- ui/js/src/kimchi.template_edit_main.js | 343 --- ui/js/src/kimchi.template_main.js | 111 - ui/js/src/kimchi.topic.js | 48 - ui/js/src/kimchi.user.js | 43 - ui/js/src/kimchi.utils.js | 193 -- ui/js/src/kimchi.window.js | 70 - ui/js/src/wok.api.js | 91 + ui/js/src/wok.cookie.js | 40 + ui/js/src/{kimchi.form.js => wok.form.js} | 0 ui/js/src/wok.grid.js | 528 ++++ ui/js/src/wok.lang.js | 50 + ui/js/src/wok.line-chart.js | 202 ++ ui/js/src/wok.login.js | 72 + ui/js/src/wok.main.js | 355 +++ ui/js/src/wok.message.js | 116 + ui/js/src/{kimchi.object.js => wok.object.js} | 0 ui/js/src/wok.popable.js | 34 + ui/js/src/wok.select.js | 50 + ui/js/src/{kimchi.string.js => wok.string.js} | 0 ui/js/src/wok.substitute.js | 45 + ui/js/src/wok.topic.js | 48 + ui/js/src/wok.user.js | 43 + ui/js/src/wok.utils.js | 193 ++ ui/js/src/wok.window.js | 70 + ui/js/widgets/button-dropDown.js | 2 +- ui/js/widgets/button-flat.js | 2 +- ui/js/widgets/checkbox-flat.js | 4 +- ui/js/widgets/circleGauge.js | 4 +- ui/js/widgets/combobox.js | 2 +- ui/js/widgets/dialog-flat.js | 4 +- ui/js/widgets/filter-select.js | 2 +- ui/js/widgets/gauge-flat.js | 2 +- ui/js/widgets/grid.js | 2 +- ui/js/widgets/line.js | 2 +- ui/js/widgets/list-flat.js | 4 +- ui/js/widgets/menu-flat.js | 4 +- ui/js/widgets/message-flat.js | 4 +- ui/js/widgets/messagebar-flat.js | 4 +- ui/js/widgets/radio-flat.js | 4 +- ui/js/widgets/samples/grid.html | 4 +- ui/js/widgets/samples/line.html | 4 +- ui/js/widgets/samples/tabs.html | 4 +- ui/js/widgets/select-menu.js | 2 +- ui/js/widgets/selectmenu-flat.js | 4 +- ui/js/widgets/textbox-flat.js | 4 +- ui/libs/Makefile.am | 2 +- ui/libs/themes/base/Makefile.am | 2 +- ui/libs/themes/base/images/Makefile.am | 2 +- ui/pages/Makefile.am | 4 +- ui/pages/error.html.tmpl | 8 +- ui/pages/guest-add.html.tmpl | 98 - ui/pages/guest-storage-add.html.tmpl | 103 - ui/pages/guest.html.tmpl | 77 - ui/pages/help/Makefile.am | 35 - ui/pages/help/de_DE/Makefile.am | 23 - ui/pages/help/en_US/Makefile.am | 23 - ui/pages/help/es_ES/Makefile.am | 23 - ui/pages/help/fr_FR/Makefile.am | 23 - ui/pages/help/gen-index.py | 63 - ui/pages/help/it_IT/Makefile.am | 23 - ui/pages/help/ja_JP/Makefile.am | 23 - ui/pages/help/ko_KR/Makefile.am | 23 - ui/pages/help/pt_BR/Makefile.am | 23 - ui/pages/help/ru_RU/Makefile.am | 23 - ui/pages/help/zh_CN/Makefile.am | 23 - ui/pages/help/zh_TW/Makefile.am | 23 - ui/pages/i18n.json.tmpl | 2 +- ui/pages/kimchi-ui.html.tmpl | 143 - ui/pages/login.html.tmpl | 8 +- ui/pages/report-add.html.tmpl | 56 - ui/pages/report-rename.html.tmpl | 56 - ui/pages/repository-add.html.tmpl | 113 - ui/pages/repository-edit.html.tmpl | 117 - ui/pages/storagepool-add-volume.html.tmpl | 79 - ui/pages/storagepool-add.html.tmpl | 186 -- ui/pages/tabs/Makefile.am | 20 - ui/pages/tabs/guests.html.tmpl | 56 - ui/pages/tabs/host.html.tmpl | 168 -- ui/pages/tabs/network.html.tmpl | 129 - ui/pages/tabs/storage.html.tmpl | 139 - ui/pages/tabs/templates.html.tmpl | 73 - ui/pages/template-add.html.tmpl | 233 -- ui/pages/template-edit.html.tmpl | 193 -- ui/pages/websockify/Makefile.am | 2 +- ui/pages/websockify/console.html | 12 +- ui/pages/wok-ui.html.tmpl | 143 + ui/spice-html5/Makefile.am | 25 - ui/spice-html5/css/Makefile.am | 20 - ui/spice-html5/pages/Makefile.am | 20 - ui/spice-html5/pages/spice_auto.html | 200 -- ui/spice-html5/thirdparty/Makefile.am | 20 - 722 files changed, 82954 insertions(+), 58514 deletions(-) delete mode 100644 config/Makefile.am delete mode 100644 config/ui/Makefile.am delete mode 100644 config/ui/tabs.xml delete mode 100644 contrib/kimchi.spec.fedora.in delete mode 100644 contrib/kimchi.spec.suse.in delete mode 100644 contrib/kimchid-upstart.conf.debian delete mode 100644 contrib/kimchid-upstart.conf.fedora delete mode 100644 contrib/kimchid.service.fedora delete mode 100644 contrib/kimchid.sysvinit create mode 100644 contrib/wok.spec.fedora.in create mode 100644 contrib/wok.spec.suse.in create mode 100644 contrib/wokd-upstart.conf.debian create mode 100644 contrib/wokd-upstart.conf.fedora create mode 100644 contrib/wokd.service.fedora create mode 100644 contrib/wokd.sysvinit delete mode 100644 docs/README-federation.md rename docs/{kimchid.8.in => wokd.8.in} (100%) create mode 100644 plugins/kimchi/.gitignore create mode 100644 plugins/kimchi/API.json create mode 100644 plugins/kimchi/INSTALL create mode 100644 plugins/kimchi/Makefile.am create mode 120000 plugins/kimchi/README.md create mode 100644 plugins/kimchi/VERSION create mode 100644 plugins/kimchi/__init__.py create mode 100755 plugins/kimchi/autogen.sh create mode 100644 plugins/kimchi/build-aux/config.rpath create mode 100755 plugins/kimchi/build-aux/genChangelog create mode 100755 plugins/kimchi/build-aux/pkg-version create mode 100644 plugins/kimchi/config.py.in create mode 100644 plugins/kimchi/config.rpath create mode 100644 plugins/kimchi/configure.ac create mode 100644 plugins/kimchi/contrib/DEBIAN/Makefile.am create mode 100644 plugins/kimchi/contrib/DEBIAN/control.in create mode 100644 plugins/kimchi/contrib/Makefile.am create mode 100755 plugins/kimchi/contrib/check_i18n.py create mode 100644 plugins/kimchi/contrib/kimchi.spec.fedora.in create mode 100644 plugins/kimchi/contrib/kimchi.spec.suse.in copy {contrib => plugins/kimchi/contrib}/make-deb.sh.in (100%) create mode 100644 plugins/kimchi/control/Makefile.am create mode 100644 plugins/kimchi/control/__init__.py create mode 100644 plugins/kimchi/control/config.py create mode 100644 plugins/kimchi/control/cpuinfo.py create mode 100644 plugins/kimchi/control/debugreports.py create mode 100644 plugins/kimchi/control/groups.py create mode 100644 plugins/kimchi/control/host.py create mode 100644 plugins/kimchi/control/interfaces.py create mode 100644 plugins/kimchi/control/networks.py create mode 100644 plugins/kimchi/control/peers.py create mode 100644 plugins/kimchi/control/storagepools.py create mode 100644 plugins/kimchi/control/storageservers.py create mode 100644 plugins/kimchi/control/storagevolumes.py create mode 100644 plugins/kimchi/control/tasks.py create mode 100644 plugins/kimchi/control/templates.py create mode 100644 plugins/kimchi/control/users.py create mode 100644 plugins/kimchi/control/vm/Makefile.am create mode 100644 plugins/kimchi/control/vm/__init__.py create mode 100644 plugins/kimchi/control/vm/hostdevs.py create mode 100644 plugins/kimchi/control/vm/ifaces.py create mode 100644 plugins/kimchi/control/vm/snapshots.py create mode 100644 plugins/kimchi/control/vm/storages.py create mode 100644 plugins/kimchi/control/vms.py create mode 100644 plugins/kimchi/disks.py create mode 100644 plugins/kimchi/distroloader.py rename {src => plugins/kimchi}/distros.d/Makefile.am (100%) rename {src => plugins/kimchi}/distros.d/debian.json (100%) rename {src => plugins/kimchi}/distros.d/fedora.json (100%) rename {src => plugins/kimchi}/distros.d/gentoo.json (100%) rename {src => plugins/kimchi}/distros.d/opensuse.json (100%) rename {src => plugins/kimchi}/distros.d/ubuntu.json (100%) create mode 100644 plugins/kimchi/docs/API.md create mode 100644 plugins/kimchi/docs/Makefile.am create mode 100644 plugins/kimchi/docs/README-federation.md create mode 100644 plugins/kimchi/docs/README.md rename {docs => plugins/kimchi/docs}/kimchi-guest.png (100%) rename {docs => plugins/kimchi/docs}/kimchi-login.png (100%) rename {docs => plugins/kimchi/docs}/kimchi-templates.png (100%) create mode 100644 plugins/kimchi/i18n.py create mode 100644 plugins/kimchi/imageinfo.py create mode 100644 plugins/kimchi/iscsi.py create mode 100644 plugins/kimchi/isoinfo.py create mode 100644 plugins/kimchi/kimchi.conf create mode 100644 plugins/kimchi/kvmusertests.py create mode 100644 plugins/kimchi/m4/ac_python_module.m4 create mode 100644 plugins/kimchi/m4/gettext.m4 create mode 100644 plugins/kimchi/m4/iconv.m4 create mode 100644 plugins/kimchi/m4/intlmacosx.m4 create mode 100644 plugins/kimchi/m4/lib-ld.m4 create mode 100644 plugins/kimchi/m4/lib-link.m4 create mode 100644 plugins/kimchi/m4/lib-prefix.m4 create mode 100644 plugins/kimchi/m4/nls.m4 create mode 100644 plugins/kimchi/m4/po.m4 create mode 100644 plugins/kimchi/m4/progtest.m4 create mode 100644 plugins/kimchi/mockmodel.py create mode 100644 plugins/kimchi/model/Makefile.am copy {src => plugins}/kimchi/model/__init__.py (100%) create mode 100644 plugins/kimchi/model/config.py create mode 100644 plugins/kimchi/model/cpuinfo.py create mode 100644 plugins/kimchi/model/debugreports.py create mode 100644 plugins/kimchi/model/diskutils.py create mode 100644 plugins/kimchi/model/featuretests.py create mode 100644 plugins/kimchi/model/groups.py create mode 100644 plugins/kimchi/model/host.py create mode 100644 plugins/kimchi/model/hostdev.py create mode 100644 plugins/kimchi/model/interfaces.py create mode 100644 plugins/kimchi/model/libvirtconnection.py create mode 100644 plugins/kimchi/model/libvirtstoragepool.py create mode 100644 plugins/kimchi/model/model.py create mode 100644 plugins/kimchi/model/networks.py create mode 100644 plugins/kimchi/model/peers.py create mode 100644 plugins/kimchi/model/storagepools.py create mode 100644 plugins/kimchi/model/storageservers.py create mode 100644 plugins/kimchi/model/storagetargets.py create mode 100644 plugins/kimchi/model/storagevolumes.py create mode 100644 plugins/kimchi/model/tasks.py create mode 100644 plugins/kimchi/model/templates.py create mode 100644 plugins/kimchi/model/users.py create mode 100644 plugins/kimchi/model/utils.py create mode 100644 plugins/kimchi/model/vmhostdevs.py create mode 100644 plugins/kimchi/model/vmifaces.py create mode 100644 plugins/kimchi/model/vms.py create mode 100644 plugins/kimchi/model/vmsnapshots.py create mode 100644 plugins/kimchi/model/vmstorages.py create mode 100644 plugins/kimchi/osinfo.py create mode 100644 plugins/kimchi/po/LINGUAS create mode 100644 plugins/kimchi/po/Makefile.in.in copy {po => plugins/kimchi/po}/Makevars (100%) create mode 100644 plugins/kimchi/po/POTFILES.in create mode 100644 plugins/kimchi/po/de_DE.po create mode 100644 plugins/kimchi/po/en_US.po create mode 100644 plugins/kimchi/po/es_ES.po create mode 100644 plugins/kimchi/po/fr_FR.po copy {po => plugins/kimchi/po}/gen-pot.in (100%) create mode 100644 plugins/kimchi/po/it_IT.po create mode 100644 plugins/kimchi/po/ja_JP.po create mode 100755 plugins/kimchi/po/kimchi.pot create mode 100644 plugins/kimchi/po/ko_KR.po create mode 100644 plugins/kimchi/po/pt_BR.po create mode 100644 plugins/kimchi/po/ru_RU.po create mode 100644 plugins/kimchi/po/zh_CN.po create mode 100644 plugins/kimchi/po/zh_TW.po create mode 100644 plugins/kimchi/repositories.py create mode 100644 plugins/kimchi/root.py create mode 100644 plugins/kimchi/scan.py create mode 100644 plugins/kimchi/screenshot.py create mode 100644 plugins/kimchi/swupdate.py rename {src => plugins/kimchi}/template.conf (100%) create mode 100644 plugins/kimchi/tests/Makefile.am create mode 100644 plugins/kimchi/tests/iso_gen.py create mode 100644 plugins/kimchi/tests/run_tests.sh.in create mode 100644 plugins/kimchi/tests/test_authorization.py create mode 100644 plugins/kimchi/tests/test_config.py.in create mode 100644 plugins/kimchi/tests/test_exception.py create mode 100644 plugins/kimchi/tests/test_host.py create mode 100644 plugins/kimchi/tests/test_mock_network.py create mode 100644 plugins/kimchi/tests/test_mock_storagepool.py create mode 100644 plugins/kimchi/tests/test_mock_storagevolume.py create mode 100644 plugins/kimchi/tests/test_mockmodel.py create mode 100644 plugins/kimchi/tests/test_model.py create mode 100644 plugins/kimchi/tests/test_model_network.py create mode 100644 plugins/kimchi/tests/test_model_storagepool.py create mode 100644 plugins/kimchi/tests/test_model_storagevolume.py create mode 100644 plugins/kimchi/tests/test_networkxml.py create mode 100644 plugins/kimchi/tests/test_objectstore.py create mode 100644 plugins/kimchi/tests/test_osinfo.py create mode 100644 plugins/kimchi/tests/test_plugin.py create mode 100644 plugins/kimchi/tests/test_rest.py create mode 100644 plugins/kimchi/tests/test_rollbackcontext.py create mode 100644 plugins/kimchi/tests/test_server.py create mode 100644 plugins/kimchi/tests/test_storagepoolxml.py create mode 100644 plugins/kimchi/tests/test_template.py create mode 100644 plugins/kimchi/tests/test_utils.py create mode 100644 plugins/kimchi/tests/test_vmtemplate.py create mode 100644 plugins/kimchi/tests/test_yumparser.py create mode 100644 plugins/kimchi/tests/utils.py create mode 100644 plugins/kimchi/ui/Makefile.am create mode 100644 plugins/kimchi/ui/config/Makefile.am create mode 100644 plugins/kimchi/ui/config/tab-ext.xml create mode 100644 plugins/kimchi/ui/css/Makefile.am create mode 100644 plugins/kimchi/ui/css/theme-default/guest-edit.css rename {ui => plugins/kimchi/ui}/css/theme-default/guest-storage-add.css (100%) create mode 100644 plugins/kimchi/ui/css/theme-default/host.css create mode 100644 plugins/kimchi/ui/css/theme-default/icon.css create mode 100644 plugins/kimchi/ui/css/theme-default/list.css create mode 100644 plugins/kimchi/ui/css/theme-default/network.css rename {ui => plugins/kimchi/ui}/css/theme-default/report-add.css (100%) create mode 100644 plugins/kimchi/ui/css/theme-default/report-rename.css rename {ui => plugins/kimchi/ui}/css/theme-default/repository-add.css (100%) rename {ui => plugins/kimchi/ui}/css/theme-default/repository-edit.css (100%) create mode 100644 plugins/kimchi/ui/css/theme-default/storage.css rename {ui => plugins/kimchi/ui}/css/theme-default/storagepool-add-volume.css (100%) rename {ui => plugins/kimchi/ui}/css/theme-default/template-edit.css (100%) rename {ui => plugins/kimchi/ui}/css/theme-default/template.css (100%) create mode 100644 plugins/kimchi/ui/css/theme-default/template_add.css rename {ui => plugins/kimchi/ui}/css/theme-default/template_list.css (100%) create mode 100644 plugins/kimchi/ui/images/Makefile.am rename {ui => plugins/kimchi/ui}/images/icon-centos.png (100%) rename {ui => plugins/kimchi/ui}/images/icon-debian.png (100%) rename {ui => plugins/kimchi/ui}/images/icon-fedora.png (100%) rename {ui => plugins/kimchi/ui}/images/icon-gentoo.png (100%) rename {ui => plugins/kimchi/ui}/images/icon-opensuse.png (100%) rename {ui => plugins/kimchi/ui}/images/icon-ubuntu.png (100%) rename {ui => plugins/kimchi/ui}/images/icon-vm.png (100%) create mode 100644 plugins/kimchi/ui/images/logo.ico create mode 100644 plugins/kimchi/ui/images/theme-default/Makefile.am rename {ui => plugins/kimchi/ui}/images/theme-default/ac22_pause.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/ac22_pause_grey.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/ac24_resume.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/ac24_resume_grey.png (100%) create mode 100644 plugins/kimchi/ui/images/theme-default/arrow-down-black.png rename {ui => plugins/kimchi/ui}/images/theme-default/arrow-down-disable.png (100%) create mode 100644 plugins/kimchi/ui/images/theme-default/arrow-down.png rename {ui => plugins/kimchi/ui}/images/theme-default/arrow-up.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/arrow_out.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/group.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/host-icon-sprite.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/icon-back.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/icon-camera.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/icon-design.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/icon-detail.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/icon-iso.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/icon-list.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/icon-load.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/icon-local.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/icon-power-down.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/icon-power-up.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/icon-qcow2.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/icon-raw.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/icon-remote.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/icon-reset.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/icon-search.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/icon-sort.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/icon-tree.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/icon-user.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/icon-volume-default.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/kimchi-loading15x15.gif (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/loading.gif (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/user.png (100%) create mode 100644 plugins/kimchi/ui/js/Makefile.am create mode 100644 plugins/kimchi/ui/js/src/kimchi.api.js create mode 100644 plugins/kimchi/ui/js/src/kimchi.guest_add_main.js create mode 100644 plugins/kimchi/ui/js/src/kimchi.guest_edit_main.js create mode 100644 plugins/kimchi/ui/js/src/kimchi.guest_main.js create mode 100644 plugins/kimchi/ui/js/src/kimchi.guest_media_main.js create mode 100644 plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js create mode 100644 plugins/kimchi/ui/js/src/kimchi.host.js create mode 100644 plugins/kimchi/ui/js/src/kimchi.main.js create mode 100644 plugins/kimchi/ui/js/src/kimchi.network.js create mode 100644 plugins/kimchi/ui/js/src/kimchi.report_add_main.js create mode 100644 plugins/kimchi/ui/js/src/kimchi.report_rename_main.js create mode 100644 plugins/kimchi/ui/js/src/kimchi.repository_add_main.js create mode 100644 plugins/kimchi/ui/js/src/kimchi.repository_edit_main.js create mode 100644 plugins/kimchi/ui/js/src/kimchi.storage_main.js create mode 100644 plugins/kimchi/ui/js/src/kimchi.storagepool_add_main.js create mode 100644 plugins/kimchi/ui/js/src/kimchi.storagepool_add_volume_main.js create mode 100644 plugins/kimchi/ui/js/src/kimchi.template_add_main.js create mode 100644 plugins/kimchi/ui/js/src/kimchi.template_edit_main.js create mode 100644 plugins/kimchi/ui/js/src/kimchi.template_main.js create mode 100644 plugins/kimchi/ui/pages/Makefile.am create mode 100644 plugins/kimchi/ui/pages/guest-add.html.tmpl rename {ui => plugins/kimchi/ui}/pages/guest-edit.html.tmpl (100%) create mode 100644 plugins/kimchi/ui/pages/guest-storage-add.html.tmpl create mode 100644 plugins/kimchi/ui/pages/guest.html.tmpl create mode 100644 plugins/kimchi/ui/pages/guests.html.tmpl create mode 100644 plugins/kimchi/ui/pages/help/Makefile.am create mode 100644 plugins/kimchi/ui/pages/help/de_DE/Makefile.am rename {ui => plugins/kimchi/ui}/pages/help/de_DE/guests.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/de_DE/host.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/de_DE/network.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/de_DE/storage.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/de_DE/templates.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/dita-help.xsl (100%) create mode 100644 plugins/kimchi/ui/pages/help/en_US/Makefile.am rename {ui => plugins/kimchi/ui}/pages/help/en_US/guests.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/en_US/host.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/en_US/network.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/en_US/storage.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/en_US/templates.dita (100%) create mode 100644 plugins/kimchi/ui/pages/help/es_ES/Makefile.am rename {ui => plugins/kimchi/ui}/pages/help/es_ES/guests.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/es_ES/host.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/es_ES/network.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/es_ES/storage.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/es_ES/templates.dita (100%) create mode 100644 plugins/kimchi/ui/pages/help/fr_FR/Makefile.am rename {ui => plugins/kimchi/ui}/pages/help/fr_FR/guests.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/fr_FR/host.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/fr_FR/network.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/fr_FR/storage.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/fr_FR/templates.dita (100%) create mode 100644 plugins/kimchi/ui/pages/help/it_IT/Makefile.am rename {ui => plugins/kimchi/ui}/pages/help/it_IT/guests.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/it_IT/host.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/it_IT/network.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/it_IT/storage.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/it_IT/templates.dita (100%) create mode 100644 plugins/kimchi/ui/pages/help/ja_JP/Makefile.am rename {ui => plugins/kimchi/ui}/pages/help/ja_JP/guests.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/ja_JP/host.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/ja_JP/network.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/ja_JP/storage.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/ja_JP/templates.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/kimchi.css (100%) create mode 100644 plugins/kimchi/ui/pages/help/ko_KR/Makefile.am rename {ui => plugins/kimchi/ui}/pages/help/ko_KR/guests.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/ko_KR/host.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/ko_KR/network.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/ko_KR/storage.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/ko_KR/templates.dita (100%) create mode 100644 plugins/kimchi/ui/pages/help/pt_BR/Makefile.am rename {ui => plugins/kimchi/ui}/pages/help/pt_BR/guests.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/pt_BR/host.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/pt_BR/network.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/pt_BR/storage.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/pt_BR/templates.dita (100%) create mode 100644 plugins/kimchi/ui/pages/help/ru_RU/Makefile.am rename {ui => plugins/kimchi/ui}/pages/help/ru_RU/guests.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/ru_RU/host.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/ru_RU/network.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/ru_RU/storage.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/ru_RU/templates.dita (100%) create mode 100644 plugins/kimchi/ui/pages/help/zh_CN/Makefile.am rename {ui => plugins/kimchi/ui}/pages/help/zh_CN/guests.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/zh_CN/host.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/zh_CN/network.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/zh_CN/storage.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/zh_CN/templates.dita (100%) create mode 100644 plugins/kimchi/ui/pages/help/zh_TW/Makefile.am rename {ui => plugins/kimchi/ui}/pages/help/zh_TW/guests.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/zh_TW/host.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/zh_TW/network.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/zh_TW/storage.dita (100%) rename {ui => plugins/kimchi/ui}/pages/help/zh_TW/templates.dita (100%) create mode 100644 plugins/kimchi/ui/pages/host.html.tmpl create mode 100644 plugins/kimchi/ui/pages/i18n.json.tmpl create mode 100644 plugins/kimchi/ui/pages/network.html.tmpl create mode 100644 plugins/kimchi/ui/pages/report-add.html.tmpl create mode 100644 plugins/kimchi/ui/pages/report-rename.html.tmpl create mode 100644 plugins/kimchi/ui/pages/repository-add.html.tmpl create mode 100644 plugins/kimchi/ui/pages/repository-edit.html.tmpl create mode 100644 plugins/kimchi/ui/pages/storage.html.tmpl create mode 100644 plugins/kimchi/ui/pages/storagepool-add-volume.html.tmpl create mode 100644 plugins/kimchi/ui/pages/storagepool-add.html.tmpl create mode 100644 plugins/kimchi/ui/pages/template-add.html.tmpl create mode 100644 plugins/kimchi/ui/pages/template-edit.html.tmpl create mode 100644 plugins/kimchi/ui/pages/templates.html.tmpl create mode 100644 plugins/kimchi/ui/robots.txt create mode 100644 plugins/kimchi/ui/spice-html5/Makefile.am rename {ui => plugins/kimchi/ui}/spice-html5/atKeynames.js (100%) rename {ui => plugins/kimchi/ui}/spice-html5/bitmap.js (100%) create mode 100644 plugins/kimchi/ui/spice-html5/css/Makefile.am rename {ui => plugins/kimchi/ui}/spice-html5/css/spice.css (100%) rename {ui => plugins/kimchi/ui}/spice-html5/cursor.js (100%) rename {ui => plugins/kimchi/ui}/spice-html5/display.js (100%) rename {ui => plugins/kimchi/ui}/spice-html5/enums.js (100%) rename {ui => plugins/kimchi/ui}/spice-html5/inputs.js (100%) rename {ui => plugins/kimchi/ui}/spice-html5/lz.js (100%) rename {ui => plugins/kimchi/ui}/spice-html5/main.js (100%) create mode 100644 plugins/kimchi/ui/spice-html5/pages/Makefile.am create mode 100644 plugins/kimchi/ui/spice-html5/pages/spice_auto.html rename {ui => plugins/kimchi/ui}/spice-html5/playback.js (100%) rename {ui => plugins/kimchi/ui}/spice-html5/png.js (100%) rename {ui => plugins/kimchi/ui}/spice-html5/quic.js (100%) rename {ui => plugins/kimchi/ui}/spice-html5/resize.js (100%) rename {ui => plugins/kimchi/ui}/spice-html5/simulatecursor.js (100%) rename {ui => plugins/kimchi/ui}/spice-html5/spicearraybuffer.js (100%) rename {ui => plugins/kimchi/ui}/spice-html5/spiceconn.js (100%) rename {ui => plugins/kimchi/ui}/spice-html5/spicedataview.js (100%) rename {ui => plugins/kimchi/ui}/spice-html5/spicemsg.js (100%) rename {ui => plugins/kimchi/ui}/spice-html5/spicetype.js (100%) create mode 100644 plugins/kimchi/ui/spice-html5/thirdparty/Makefile.am rename {ui => plugins/kimchi/ui}/spice-html5/thirdparty/jsbn.js (100%) rename {ui => plugins/kimchi/ui}/spice-html5/thirdparty/prng4.js (100%) rename {ui => plugins/kimchi/ui}/spice-html5/thirdparty/rng.js (100%) rename {ui => plugins/kimchi/ui}/spice-html5/thirdparty/rsa.js (100%) rename {ui => plugins/kimchi/ui}/spice-html5/thirdparty/sha1.js (100%) rename {ui => plugins/kimchi/ui}/spice-html5/ticket.js (100%) rename {ui => plugins/kimchi/ui}/spice-html5/utils.js (100%) rename {ui => plugins/kimchi/ui}/spice-html5/webm.js (100%) rename {ui => plugins/kimchi/ui}/spice-html5/wire.js (100%) create mode 100644 plugins/kimchi/utils.py create mode 100644 plugins/kimchi/vmtemplate.py create mode 100644 plugins/kimchi/xmlutils/Makefile.am rename {src => plugins}/kimchi/xmlutils/__init__.py (100%) rename {src => plugins}/kimchi/xmlutils/cpu.py (100%) create mode 100644 plugins/kimchi/xmlutils/disk.py create mode 100644 plugins/kimchi/xmlutils/graphics.py create mode 100644 plugins/kimchi/xmlutils/interface.py create mode 100644 plugins/kimchi/xmlutils/network.py rename {src => plugins}/kimchi/xmlutils/qemucmdline.py (100%) create mode 100644 plugins/kimchi/yumparser.py delete mode 100755 po/kimchi.pot create mode 100755 po/wok.pot delete mode 100644 src/kimchi.conf.in delete mode 100644 src/kimchi/API.json delete mode 100644 src/kimchi/Makefile.am delete mode 100644 src/kimchi/asynctask.py delete mode 100644 src/kimchi/auth.py delete mode 100644 src/kimchi/cachebust.py delete mode 100644 src/kimchi/config.py.in delete mode 100644 src/kimchi/control/Makefile.am delete mode 100644 src/kimchi/control/__init__.py delete mode 100644 src/kimchi/control/base.py delete mode 100644 src/kimchi/control/config.py delete mode 100644 src/kimchi/control/cpuinfo.py delete mode 100644 src/kimchi/control/debugreports.py delete mode 100644 src/kimchi/control/groups.py delete mode 100644 src/kimchi/control/host.py delete mode 100644 src/kimchi/control/interfaces.py delete mode 100644 src/kimchi/control/networks.py delete mode 100644 src/kimchi/control/peers.py delete mode 100644 src/kimchi/control/plugins.py delete mode 100644 src/kimchi/control/storagepools.py delete mode 100644 src/kimchi/control/storageservers.py delete mode 100644 src/kimchi/control/storagevolumes.py delete mode 100644 src/kimchi/control/tasks.py delete mode 100644 src/kimchi/control/templates.py delete mode 100644 src/kimchi/control/users.py delete mode 100644 src/kimchi/control/utils.py delete mode 100644 src/kimchi/control/vm/Makefile.am delete mode 100644 src/kimchi/control/vm/__init__.py delete mode 100644 src/kimchi/control/vm/hostdevs.py delete mode 100644 src/kimchi/control/vm/ifaces.py delete mode 100644 src/kimchi/control/vm/snapshots.py delete mode 100644 src/kimchi/control/vm/storages.py delete mode 100644 src/kimchi/control/vms.py delete mode 100644 src/kimchi/disks.py delete mode 100644 src/kimchi/distroloader.py delete mode 100644 src/kimchi/exception.py delete mode 100644 src/kimchi/i18n.py delete mode 100644 src/kimchi/imageinfo.py delete mode 100644 src/kimchi/iscsi.py delete mode 100644 src/kimchi/isoinfo.py delete mode 100644 src/kimchi/kvmusertests.py delete mode 100644 src/kimchi/mockmodel.py delete mode 100644 src/kimchi/model/Makefile.am delete mode 100644 src/kimchi/model/config.py delete mode 100644 src/kimchi/model/cpuinfo.py delete mode 100644 src/kimchi/model/debugreports.py delete mode 100644 src/kimchi/model/diskutils.py delete mode 100644 src/kimchi/model/featuretests.py delete mode 100644 src/kimchi/model/groups.py delete mode 100644 src/kimchi/model/host.py delete mode 100644 src/kimchi/model/hostdev.py delete mode 100644 src/kimchi/model/interfaces.py delete mode 100644 src/kimchi/model/libvirtconnection.py delete mode 100644 src/kimchi/model/libvirtstoragepool.py delete mode 100644 src/kimchi/model/model.py delete mode 100644 src/kimchi/model/networks.py delete mode 100644 src/kimchi/model/peers.py delete mode 100644 src/kimchi/model/plugins.py delete mode 100644 src/kimchi/model/storagepools.py delete mode 100644 src/kimchi/model/storageservers.py delete mode 100644 src/kimchi/model/storagetargets.py delete mode 100644 src/kimchi/model/storagevolumes.py delete mode 100644 src/kimchi/model/tasks.py delete mode 100644 src/kimchi/model/templates.py delete mode 100644 src/kimchi/model/users.py delete mode 100644 src/kimchi/model/utils.py delete mode 100644 src/kimchi/model/vmhostdevs.py delete mode 100644 src/kimchi/model/vmifaces.py delete mode 100644 src/kimchi/model/vms.py delete mode 100644 src/kimchi/model/vmsnapshots.py delete mode 100644 src/kimchi/model/vmstorages.py delete mode 100644 src/kimchi/objectstore.py delete mode 100644 src/kimchi/osinfo.py delete mode 100644 src/kimchi/proxy.py delete mode 100644 src/kimchi/repositories.py delete mode 100644 src/kimchi/root.py delete mode 100644 src/kimchi/scan.py delete mode 100644 src/kimchi/screenshot.py delete mode 100644 src/kimchi/server.py delete mode 100644 src/kimchi/sslcert.py delete mode 100644 src/kimchi/swupdate.py delete mode 100644 src/kimchi/template.py delete mode 100644 src/kimchi/utils.py delete mode 100644 src/kimchi/vmtemplate.py delete mode 100644 src/kimchi/vnc.py delete mode 100644 src/kimchi/xmlutils/Makefile.am delete mode 100644 src/kimchi/xmlutils/disk.py delete mode 100644 src/kimchi/xmlutils/graphics.py delete mode 100644 src/kimchi/xmlutils/interface.py delete mode 100644 src/kimchi/xmlutils/network.py delete mode 100644 src/kimchi/yumparser.py delete mode 100644 src/kimchid.in delete mode 100644 src/nginx/kimchi.conf.in create mode 100644 src/nginx/wok.conf.in create mode 100644 src/wok.conf.in create mode 100644 src/wok/API.json create mode 100644 src/wok/Makefile.am rename src/{kimchi => wok}/__init__.py (100%) create mode 100644 src/wok/asynctask.py create mode 100644 src/wok/auth.py rename src/{kimchi => wok}/basemodel.py (100%) create mode 100644 src/wok/cachebust.py create mode 100644 src/wok/config.py.in create mode 100644 src/wok/control/Makefile.am create mode 100644 src/wok/control/__init__.py create mode 100644 src/wok/control/base.py create mode 100644 src/wok/control/plugins.py create mode 100644 src/wok/control/utils.py create mode 100644 src/wok/exception.py create mode 100644 src/wok/i18n.py create mode 100644 src/wok/model/Makefile.am copy src/{kimchi => wok}/model/__init__.py (100%) create mode 100644 src/wok/model/model.py create mode 100644 src/wok/model/plugins.py rename src/{kimchi => wok}/netinfo.py (100%) rename src/{kimchi => wok}/network.py (100%) create mode 100644 src/wok/objectstore.py create mode 100644 src/wok/proxy.py rename src/{kimchi => wok}/rollbackcontext.py (100%) create mode 100644 src/wok/root.py create mode 100644 src/wok/server.py create mode 100644 src/wok/sslcert.py create mode 100644 src/wok/template.py create mode 100644 src/wok/utils.py create mode 100644 src/wok/vnc.py create mode 100644 src/wok/xmlutils/Makefile.am rename src/{kimchi/model => wok/xmlutils}/__init__.py (100%) rename src/{kimchi => wok}/xmlutils/utils.py (100%) create mode 100644 src/wokd.in delete mode 100644 tests/Makefile.am delete mode 100644 tests/iso_gen.py delete mode 100644 tests/run_tests.sh.in delete mode 100644 tests/test_authorization.py delete mode 100644 tests/test_config.py.in delete mode 100644 tests/test_exception.py delete mode 100644 tests/test_host.py delete mode 100644 tests/test_mock_network.py delete mode 100644 tests/test_mock_storagepool.py delete mode 100644 tests/test_mock_storagevolume.py delete mode 100644 tests/test_mockmodel.py delete mode 100644 tests/test_model.py delete mode 100644 tests/test_model_network.py delete mode 100644 tests/test_model_storagepool.py delete mode 100644 tests/test_model_storagevolume.py delete mode 100644 tests/test_networkxml.py delete mode 100644 tests/test_objectstore.py delete mode 100644 tests/test_osinfo.py delete mode 100644 tests/test_plugin.py delete mode 100644 tests/test_rest.py delete mode 100644 tests/test_rollbackcontext.py delete mode 100644 tests/test_server.py delete mode 100644 tests/test_storagepoolxml.py delete mode 100644 tests/test_template.py delete mode 100644 tests/test_utils.py delete mode 100644 tests/test_vmtemplate.py delete mode 100644 tests/test_yumparser.py delete mode 100644 tests/utils.py delete mode 100644 ui/css/theme-default/guest-edit.css delete mode 100644 ui/css/theme-default/host.css delete mode 100644 ui/css/theme-default/list.css delete mode 100644 ui/css/theme-default/network.css delete mode 100644 ui/css/theme-default/report-rename.css delete mode 100644 ui/css/theme-default/storage.css delete mode 100644 ui/css/theme-default/template_add.css create mode 100644 ui/fontello/Makefile.am create mode 100644 ui/fontello/css/Makefile.am create mode 100644 ui/fontello/font/Makefile.am rename ui/images/theme-default/{kimchi-loading.gif => wok-loading.gif} (100%) delete mode 100644 ui/js/src/kimchi.api.js delete mode 100644 ui/js/src/kimchi.cookie.js delete mode 100644 ui/js/src/kimchi.grid.js delete mode 100644 ui/js/src/kimchi.guest_add_main.js delete mode 100644 ui/js/src/kimchi.guest_edit_main.js delete mode 100644 ui/js/src/kimchi.guest_main.js delete mode 100644 ui/js/src/kimchi.guest_media_main.js delete mode 100644 ui/js/src/kimchi.guest_storage_add.main.js delete mode 100644 ui/js/src/kimchi.host.js delete mode 100644 ui/js/src/kimchi.lang.js delete mode 100644 ui/js/src/kimchi.line-chart.js delete mode 100644 ui/js/src/kimchi.login.js delete mode 100644 ui/js/src/kimchi.main.js delete mode 100644 ui/js/src/kimchi.message.js delete mode 100644 ui/js/src/kimchi.network.js delete mode 100644 ui/js/src/kimchi.popable.js delete mode 100644 ui/js/src/kimchi.report_add_main.js delete mode 100644 ui/js/src/kimchi.report_rename_main.js delete mode 100644 ui/js/src/kimchi.repository_add_main.js delete mode 100644 ui/js/src/kimchi.repository_edit_main.js delete mode 100644 ui/js/src/kimchi.select.js delete mode 100644 ui/js/src/kimchi.storage_main.js delete mode 100644 ui/js/src/kimchi.storagepool_add_main.js delete mode 100644 ui/js/src/kimchi.storagepool_add_volume_main.js delete mode 100644 ui/js/src/kimchi.substitute.js delete mode 100644 ui/js/src/kimchi.template_add_main.js delete mode 100644 ui/js/src/kimchi.template_edit_main.js delete mode 100644 ui/js/src/kimchi.template_main.js delete mode 100644 ui/js/src/kimchi.topic.js delete mode 100644 ui/js/src/kimchi.user.js delete mode 100644 ui/js/src/kimchi.utils.js delete mode 100644 ui/js/src/kimchi.window.js create mode 100644 ui/js/src/wok.api.js create mode 100644 ui/js/src/wok.cookie.js rename ui/js/src/{kimchi.form.js => wok.form.js} (100%) create mode 100644 ui/js/src/wok.grid.js create mode 100644 ui/js/src/wok.lang.js create mode 100644 ui/js/src/wok.line-chart.js create mode 100644 ui/js/src/wok.login.js create mode 100644 ui/js/src/wok.main.js create mode 100644 ui/js/src/wok.message.js rename ui/js/src/{kimchi.object.js => wok.object.js} (100%) create mode 100644 ui/js/src/wok.popable.js create mode 100644 ui/js/src/wok.select.js rename ui/js/src/{kimchi.string.js => wok.string.js} (100%) create mode 100644 ui/js/src/wok.substitute.js create mode 100644 ui/js/src/wok.topic.js create mode 100644 ui/js/src/wok.user.js create mode 100644 ui/js/src/wok.utils.js create mode 100644 ui/js/src/wok.window.js delete mode 100644 ui/pages/guest-add.html.tmpl delete mode 100644 ui/pages/guest-storage-add.html.tmpl delete mode 100644 ui/pages/guest.html.tmpl delete mode 100644 ui/pages/help/Makefile.am delete mode 100644 ui/pages/help/de_DE/Makefile.am delete mode 100644 ui/pages/help/en_US/Makefile.am delete mode 100644 ui/pages/help/es_ES/Makefile.am delete mode 100644 ui/pages/help/fr_FR/Makefile.am delete mode 100755 ui/pages/help/gen-index.py delete mode 100644 ui/pages/help/it_IT/Makefile.am delete mode 100644 ui/pages/help/ja_JP/Makefile.am delete mode 100644 ui/pages/help/ko_KR/Makefile.am delete mode 100644 ui/pages/help/pt_BR/Makefile.am delete mode 100644 ui/pages/help/ru_RU/Makefile.am delete mode 100644 ui/pages/help/zh_CN/Makefile.am delete mode 100644 ui/pages/help/zh_TW/Makefile.am delete mode 100644 ui/pages/kimchi-ui.html.tmpl delete mode 100644 ui/pages/report-add.html.tmpl delete mode 100644 ui/pages/report-rename.html.tmpl delete mode 100644 ui/pages/repository-add.html.tmpl delete mode 100644 ui/pages/repository-edit.html.tmpl delete mode 100644 ui/pages/storagepool-add-volume.html.tmpl delete mode 100644 ui/pages/storagepool-add.html.tmpl delete mode 100644 ui/pages/tabs/Makefile.am delete mode 100644 ui/pages/tabs/guests.html.tmpl delete mode 100644 ui/pages/tabs/host.html.tmpl delete mode 100644 ui/pages/tabs/network.html.tmpl delete mode 100644 ui/pages/tabs/storage.html.tmpl delete mode 100644 ui/pages/tabs/templates.html.tmpl delete mode 100644 ui/pages/template-add.html.tmpl delete mode 100644 ui/pages/template-edit.html.tmpl create mode 100644 ui/pages/wok-ui.html.tmpl delete mode 100644 ui/spice-html5/Makefile.am delete mode 100644 ui/spice-html5/css/Makefile.am delete mode 100644 ui/spice-html5/pages/Makefile.am delete mode 100644 ui/spice-html5/pages/spice_auto.html delete mode 100644 ui/spice-html5/thirdparty/Makefile.am

2 36

[wok] Update copyright for all changed files
by Lucio Correia 05 Aug '15

05 Aug '15

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> Signed-off-by: Gustavo Y. Ribeiro <gyr(a)linux.vnet.ibm.com> --- Makefile.am | 2 +- configure.ac | 2 +- contrib/DEBIAN/postrm | 2 +- contrib/Makefile.am | 2 +- contrib/wokd-upstart.conf.debian | 2 +- contrib/wokd-upstart.conf.fedora | 2 +- contrib/wokd.sysvinit | 2 +- docs/Makefile.am | 2 +- plugins/Makefile.am | 2 +- plugins/kimchi/Makefile.am | 2 +- plugins/kimchi/__init__.py | 2 +- plugins/kimchi/configure.ac | 2 +- plugins/kimchi/contrib/DEBIAN/Makefile.am | 2 +- plugins/kimchi/contrib/Makefile.am | 2 +- plugins/kimchi/control/Makefile.am | 2 +- plugins/kimchi/control/__init__.py | 2 +- plugins/kimchi/control/config.py | 2 +- plugins/kimchi/control/cpuinfo.py | 2 +- plugins/kimchi/control/groups.py | 2 +- plugins/kimchi/control/interfaces.py | 2 +- plugins/kimchi/control/peers.py | 2 +- plugins/kimchi/control/storageservers.py | 2 +- plugins/kimchi/control/tasks.py | 2 +- plugins/kimchi/control/users.py | 2 +- plugins/kimchi/control/vm/Makefile.am | 2 +- plugins/kimchi/control/vm/__init__.py | 2 +- plugins/kimchi/control/vm/hostdevs.py | 2 +- plugins/kimchi/control/vm/snapshots.py | 2 +- plugins/kimchi/distros.d/Makefile.am | 2 +- plugins/kimchi/docs/Makefile.am | 2 +- plugins/kimchi/imageinfo.py | 2 +- plugins/kimchi/iscsi.py | 2 +- plugins/kimchi/model/Makefile.am | 2 +- plugins/kimchi/model/__init__.py | 2 +- plugins/kimchi/model/groups.py | 2 +- plugins/kimchi/model/hostdev.py | 2 +- plugins/kimchi/model/interfaces.py | 2 +- plugins/kimchi/model/libvirtconnection.py | 2 +- plugins/kimchi/model/libvirtstoragepool.py | 2 +- plugins/kimchi/model/storageservers.py | 2 +- plugins/kimchi/model/storagetargets.py | 2 +- plugins/kimchi/model/tasks.py | 2 +- plugins/kimchi/model/users.py | 2 +- plugins/kimchi/scan.py | 2 +- plugins/kimchi/screenshot.py | 2 +- plugins/kimchi/tests/Makefile.am | 2 +- plugins/kimchi/tests/test_exception.py | 2 +- plugins/kimchi/tests/test_networkxml.py | 2 +- plugins/kimchi/tests/test_plugin.py | 2 +- plugins/kimchi/tests/test_rollbackcontext.py | 2 +- plugins/kimchi/ui/Makefile.am | 2 +- plugins/kimchi/ui/config/Makefile.am | 2 +- plugins/kimchi/ui/css/Makefile.am | 2 +- .../ui/css/theme-default/guest-storage-add.css | 2 +- plugins/kimchi/ui/css/theme-default/host.css | 2 +- .../css/theme-default/storagepool-add-volume.css | 2 +- plugins/kimchi/ui/css/theme-default/template.css | 2 +- .../kimchi/ui/css/theme-default/template_list.css | 2 +- plugins/kimchi/ui/images/Makefile.am | 2 +- plugins/kimchi/ui/images/theme-default/Makefile.am | 2 +- plugins/kimchi/ui/js/Makefile.am | 2 +- plugins/kimchi/ui/js/src/kimchi.guest_add_main.js | 2 +- .../kimchi/ui/js/src/kimchi.guest_media_main.js | 2 +- plugins/kimchi/ui/js/src/kimchi.host.js | 2 +- plugins/kimchi/ui/js/src/kimchi.main.js | 2 +- plugins/kimchi/ui/js/src/kimchi.report_add_main.js | 2 +- .../kimchi/ui/js/src/kimchi.report_rename_main.js | 2 +- .../kimchi/ui/js/src/kimchi.repository_add_main.js | 2 +- .../ui/js/src/kimchi.repository_edit_main.js | 2 +- plugins/kimchi/ui/js/src/kimchi.template_main.js | 2 +- plugins/kimchi/ui/pages/Makefile.am | 2 +- .../kimchi/ui/pages/guest-storage-add.html.tmpl | 2 +- plugins/kimchi/ui/pages/guests.html.tmpl | 2 +- plugins/kimchi/ui/pages/help/Makefile.am | 2 +- plugins/kimchi/ui/pages/help/de_DE/Makefile.am | 2 +- plugins/kimchi/ui/pages/help/en_US/Makefile.am | 2 +- plugins/kimchi/ui/pages/help/es_ES/Makefile.am | 2 +- plugins/kimchi/ui/pages/help/fr_FR/Makefile.am | 2 +- plugins/kimchi/ui/pages/help/it_IT/Makefile.am | 2 +- plugins/kimchi/ui/pages/help/ja_JP/Makefile.am | 2 +- plugins/kimchi/ui/pages/help/kimchi.css | 2 +- plugins/kimchi/ui/pages/help/ko_KR/Makefile.am | 2 +- plugins/kimchi/ui/pages/help/pt_BR/Makefile.am | 2 +- plugins/kimchi/ui/pages/help/ru_RU/Makefile.am | 2 +- plugins/kimchi/ui/pages/help/zh_CN/Makefile.am | 2 +- plugins/kimchi/ui/pages/help/zh_TW/Makefile.am | 2 +- plugins/kimchi/ui/pages/templates.html.tmpl | 2 +- plugins/kimchi/ui/spice-html5/Makefile.am | 2 +- plugins/kimchi/ui/spice-html5/css/Makefile.am | 2 +- plugins/kimchi/ui/spice-html5/pages/Makefile.am | 2 +- .../kimchi/ui/spice-html5/thirdparty/Makefile.am | 2 +- plugins/kimchi/xmlutils/Makefile.am | 2 +- plugins/kimchi/xmlutils/__init__.py | 2 +- plugins/kimchi/xmlutils/disk.py | 2 +- plugins/kimchi/xmlutils/graphics.py | 2 +- plugins/kimchi/xmlutils/network.py | 2 +- plugins/kimchi/xmlutils/qemucmdline.py | 2 +- plugins/sample/__init__.py | 2 +- plugins/sample/model.py | 2 +- plugins/sample/ui/js/util.js | 2 +- plugins/sample/ui/pages/i18n.json.tmpl | 2 +- src/Makefile.am | 2 +- src/nginx/Makefile.am | 2 +- src/wok/Makefile.am | 2 +- src/wok/__init__.py | 2 +- src/wok/asynctask.py | 2 +- src/wok/basemodel.py | 2 +- src/wok/cachebust.py | 2 +- src/wok/control/Makefile.am | 2 +- src/wok/control/__init__.py | 2 +- src/wok/control/plugins.py | 2 +- src/wok/control/utils.py | 2 +- src/wok/exception.py | 2 +- src/wok/model/Makefile.am | 2 +- src/wok/model/__init__.py | 2 +- src/wok/model/plugins.py | 2 +- src/wok/network.py | 2 +- src/wok/objectstore.py | 2 +- src/wok/rollbackcontext.py | 2 +- src/wok/server.py | 2 +- src/wok/sslcert.py | 2 +- src/wok/template.py | 2 +- src/wok/xmlutils/Makefile.am | 2 +- src/wok/xmlutils/__init__.py | 2 +- src/wok/xmlutils/utils.py | 2 +- ui/Makefile.am | 2 +- ui/css/Makefile.am | 2 +- ui/css/theme-default/circleGauge.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/tile-check.css | 2 +- ui/css/theme-default/toolbar.css | 2 +- ui/images/Makefile.am | 2 +- ui/images/theme-default/Makefile.am | 2 +- ui/js/Makefile.am | 2 +- ui/js/src/wok.form.js | 2 +- ui/js/src/wok.line-chart.js | 2 +- ui/js/src/wok.select.js | 2 +- ui/js/widgets/button-dropDown.js | 2 +- ui/js/widgets/circleGauge.js | 2 +- ui/js/widgets/combobox.js | 2 +- ui/js/widgets/filter-select.js | 2 +- ui/js/widgets/select-menu.js | 2 +- ui/libs/Makefile.am | 2 +- ui/libs/themes/base/Makefile.am | 2 +- ui/libs/themes/base/images/Makefile.am | 2 +- ui/pages/Makefile.am | 2 +- ui/pages/error.html.tmpl | 2 +- ui/pages/websockify/Makefile.am | 2 +- 150 files changed, 150 insertions(+), 150 deletions(-) diff --git a/Makefile.am b/Makefile.am index dfc7576..b15fd2c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM Corp, 2013 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/configure.ac b/configure.ac index 47c2e6c..9eba840 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM Corp, 2013-2015 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/contrib/DEBIAN/postrm b/contrib/DEBIAN/postrm index 256a234..3d6bb5d 100755 --- a/contrib/DEBIAN/postrm +++ b/contrib/DEBIAN/postrm @@ -2,7 +2,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/contrib/Makefile.am b/contrib/Makefile.am index b537df5..1dce25d 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,4 +1,4 @@ -# Copyright IBM Corp, 2013 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/contrib/wokd-upstart.conf.debian b/contrib/wokd-upstart.conf.debian index 82e9156..9e8e77e 100644 --- a/contrib/wokd-upstart.conf.debian +++ b/contrib/wokd-upstart.conf.debian @@ -1,7 +1,7 @@ # # wokd - Wok Web Server # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/contrib/wokd-upstart.conf.fedora b/contrib/wokd-upstart.conf.fedora index f02ce34..32def4b 100644 --- a/contrib/wokd-upstart.conf.fedora +++ b/contrib/wokd-upstart.conf.fedora @@ -1,7 +1,7 @@ # # wokd - Wok Web Server # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/contrib/wokd.sysvinit b/contrib/wokd.sysvinit index 10680ee..53c0a34 100644 --- a/contrib/wokd.sysvinit +++ b/contrib/wokd.sysvinit @@ -2,7 +2,7 @@ # # wokd Wok Web Server # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 # # Author: Aline Manera <alinefm(a)br.ibm.com> # diff --git a/docs/Makefile.am b/docs/Makefile.am index db23721..3de2730 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM Corp, 2013 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 21a6ece..d2f5d3a 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM Corp, 2013 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/Makefile.am b/plugins/kimchi/Makefile.am index faef341..0425e00 100644 --- a/plugins/kimchi/Makefile.am +++ b/plugins/kimchi/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM Corp, 2013 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/__init__.py b/plugins/kimchi/__init__.py index 9330044..f89b3ff 100644 --- a/plugins/kimchi/__init__.py +++ b/plugins/kimchi/__init__.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/configure.ac b/plugins/kimchi/configure.ac index adab45b..b4cec37 100644 --- a/plugins/kimchi/configure.ac +++ b/plugins/kimchi/configure.ac @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM Corp, 2013-2015 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/contrib/DEBIAN/Makefile.am b/plugins/kimchi/contrib/DEBIAN/Makefile.am index ca89552..870f67d 100644 --- a/plugins/kimchi/contrib/DEBIAN/Makefile.am +++ b/plugins/kimchi/contrib/DEBIAN/Makefile.am @@ -1,4 +1,4 @@ -# Copyright IBM Corp, 2013 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/contrib/Makefile.am b/plugins/kimchi/contrib/Makefile.am index 5001191..e24d2a6 100644 --- a/plugins/kimchi/contrib/Makefile.am +++ b/plugins/kimchi/contrib/Makefile.am @@ -1,4 +1,4 @@ -# Copyright IBM Corp, 2013 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/control/Makefile.am b/plugins/kimchi/control/Makefile.am index 33118ca..e8aaf39 100644 --- a/plugins/kimchi/control/Makefile.am +++ b/plugins/kimchi/control/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM Corp, 2013 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/control/__init__.py b/plugins/kimchi/control/__init__.py index 4ad9459..14bfb8e 100644 --- a/plugins/kimchi/control/__init__.py +++ b/plugins/kimchi/control/__init__.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/control/config.py b/plugins/kimchi/control/config.py index 15df68f..294722f 100644 --- a/plugins/kimchi/control/config.py +++ b/plugins/kimchi/control/config.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/control/cpuinfo.py b/plugins/kimchi/control/cpuinfo.py index 31f316c..e2df5a9 100644 --- a/plugins/kimchi/control/cpuinfo.py +++ b/plugins/kimchi/control/cpuinfo.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/control/groups.py b/plugins/kimchi/control/groups.py index 649ff09..05c1d76 100644 --- a/plugins/kimchi/control/groups.py +++ b/plugins/kimchi/control/groups.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/control/interfaces.py b/plugins/kimchi/control/interfaces.py index d698b7a..220e372 100644 --- a/plugins/kimchi/control/interfaces.py +++ b/plugins/kimchi/control/interfaces.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/control/peers.py b/plugins/kimchi/control/peers.py index 21e9f13..30172e4 100644 --- a/plugins/kimchi/control/peers.py +++ b/plugins/kimchi/control/peers.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/control/storageservers.py b/plugins/kimchi/control/storageservers.py index 654ab47..07851c0 100644 --- a/plugins/kimchi/control/storageservers.py +++ b/plugins/kimchi/control/storageservers.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/control/tasks.py b/plugins/kimchi/control/tasks.py index b25d892..356afec 100644 --- a/plugins/kimchi/control/tasks.py +++ b/plugins/kimchi/control/tasks.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/control/users.py b/plugins/kimchi/control/users.py index 756a2f7..8d79739 100644 --- a/plugins/kimchi/control/users.py +++ b/plugins/kimchi/control/users.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/control/vm/Makefile.am b/plugins/kimchi/control/vm/Makefile.am index b17c68a..01bc46e 100644 --- a/plugins/kimchi/control/vm/Makefile.am +++ b/plugins/kimchi/control/vm/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM Corp, 2013 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/control/vm/__init__.py b/plugins/kimchi/control/vm/__init__.py index a311045..a58a6da 100644 --- a/plugins/kimchi/control/vm/__init__.py +++ b/plugins/kimchi/control/vm/__init__.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/control/vm/hostdevs.py b/plugins/kimchi/control/vm/hostdevs.py index a43b9d8..1beb8fd 100644 --- a/plugins/kimchi/control/vm/hostdevs.py +++ b/plugins/kimchi/control/vm/hostdevs.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/control/vm/snapshots.py b/plugins/kimchi/control/vm/snapshots.py index dd17b85..9df90ed 100644 --- a/plugins/kimchi/control/vm/snapshots.py +++ b/plugins/kimchi/control/vm/snapshots.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/distros.d/Makefile.am b/plugins/kimchi/distros.d/Makefile.am index 684fe60..b54cf68 100644 --- a/plugins/kimchi/distros.d/Makefile.am +++ b/plugins/kimchi/distros.d/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM Corp, 2013 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/docs/Makefile.am b/plugins/kimchi/docs/Makefile.am index 679aa18..515374a 100644 --- a/plugins/kimchi/docs/Makefile.am +++ b/plugins/kimchi/docs/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM Corp, 2013 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/imageinfo.py b/plugins/kimchi/imageinfo.py index 8a22495..12d26d0 100644 --- a/plugins/kimchi/imageinfo.py +++ b/plugins/kimchi/imageinfo.py @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/iscsi.py b/plugins/kimchi/iscsi.py index 02886ac..5de9f51 100644 --- a/plugins/kimchi/iscsi.py +++ b/plugins/kimchi/iscsi.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/model/Makefile.am b/plugins/kimchi/model/Makefile.am index f4f4750..ad28f29 100644 --- a/plugins/kimchi/model/Makefile.am +++ b/plugins/kimchi/model/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM Corp, 2013 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/model/__init__.py b/plugins/kimchi/model/__init__.py index ca7ede4..771bf68 100644 --- a/plugins/kimchi/model/__init__.py +++ b/plugins/kimchi/model/__init__.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/model/groups.py b/plugins/kimchi/model/groups.py index fc63d68..9d96ba7 100644 --- a/plugins/kimchi/model/groups.py +++ b/plugins/kimchi/model/groups.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/model/hostdev.py b/plugins/kimchi/model/hostdev.py index c411d0b..8f9d70b 100644 --- a/plugins/kimchi/model/hostdev.py +++ b/plugins/kimchi/model/hostdev.py @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/model/interfaces.py b/plugins/kimchi/model/interfaces.py index 81b379a..768b8be 100644 --- a/plugins/kimchi/model/interfaces.py +++ b/plugins/kimchi/model/interfaces.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/model/libvirtconnection.py b/plugins/kimchi/model/libvirtconnection.py index ef4a4ce..1d08996 100644 --- a/plugins/kimchi/model/libvirtconnection.py +++ b/plugins/kimchi/model/libvirtconnection.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/model/libvirtstoragepool.py b/plugins/kimchi/model/libvirtstoragepool.py index b22856b..71e45a4 100644 --- a/plugins/kimchi/model/libvirtstoragepool.py +++ b/plugins/kimchi/model/libvirtstoragepool.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/model/storageservers.py b/plugins/kimchi/model/storageservers.py index accc5f5..02d1e8b 100644 --- a/plugins/kimchi/model/storageservers.py +++ b/plugins/kimchi/model/storageservers.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/model/storagetargets.py b/plugins/kimchi/model/storagetargets.py index 4090b45..3f100ce 100644 --- a/plugins/kimchi/model/storagetargets.py +++ b/plugins/kimchi/model/storagetargets.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/model/tasks.py b/plugins/kimchi/model/tasks.py index 678fdc2..f5d475e 100644 --- a/plugins/kimchi/model/tasks.py +++ b/plugins/kimchi/model/tasks.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/model/users.py b/plugins/kimchi/model/users.py index 2fa65dd..98c96a4 100644 --- a/plugins/kimchi/model/users.py +++ b/plugins/kimchi/model/users.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/scan.py b/plugins/kimchi/scan.py index b475c46..af322c9 100644 --- a/plugins/kimchi/scan.py +++ b/plugins/kimchi/scan.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/screenshot.py b/plugins/kimchi/screenshot.py index 7c2347c..d724bc7 100644 --- a/plugins/kimchi/screenshot.py +++ b/plugins/kimchi/screenshot.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/tests/Makefile.am b/plugins/kimchi/tests/Makefile.am index c1f6784..fd0476e 100644 --- a/plugins/kimchi/tests/Makefile.am +++ b/plugins/kimchi/tests/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM Corp, 2013 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/tests/test_exception.py b/plugins/kimchi/tests/test_exception.py index f1b81ba..7f9c8b1 100644 --- a/plugins/kimchi/tests/test_exception.py +++ b/plugins/kimchi/tests/test_exception.py @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/tests/test_networkxml.py b/plugins/kimchi/tests/test_networkxml.py index a64b6c2..ed1a058 100644 --- a/plugins/kimchi/tests/test_networkxml.py +++ b/plugins/kimchi/tests/test_networkxml.py @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/tests/test_plugin.py b/plugins/kimchi/tests/test_plugin.py index ebc4a39..cf8ef9a 100644 --- a/plugins/kimchi/tests/test_plugin.py +++ b/plugins/kimchi/tests/test_plugin.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/tests/test_rollbackcontext.py b/plugins/kimchi/tests/test_rollbackcontext.py index 6eac6d0..ea10fe0 100644 --- a/plugins/kimchi/tests/test_rollbackcontext.py +++ b/plugins/kimchi/tests/test_rollbackcontext.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/ui/Makefile.am b/plugins/kimchi/ui/Makefile.am index 21fe703..aa13b7a 100644 --- a/plugins/kimchi/ui/Makefile.am +++ b/plugins/kimchi/ui/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/config/Makefile.am b/plugins/kimchi/ui/config/Makefile.am index e3b3d19..5f8f6a3 100644 --- a/plugins/kimchi/ui/config/Makefile.am +++ b/plugins/kimchi/ui/config/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/css/Makefile.am b/plugins/kimchi/ui/css/Makefile.am index 5071d29..c16af7e 100644 --- a/plugins/kimchi/ui/css/Makefile.am +++ b/plugins/kimchi/ui/css/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/css/theme-default/guest-storage-add.css b/plugins/kimchi/ui/css/theme-default/guest-storage-add.css index 9cc41e8..25b8a9c 100644 --- a/plugins/kimchi/ui/css/theme-default/guest-storage-add.css +++ b/plugins/kimchi/ui/css/theme-default/guest-storage-add.css @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/css/theme-default/host.css b/plugins/kimchi/ui/css/theme-default/host.css index a0cccb1..a7618d6 100644 --- a/plugins/kimchi/ui/css/theme-default/host.css +++ b/plugins/kimchi/ui/css/theme-default/host.css @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/css/theme-default/storagepool-add-volume.css b/plugins/kimchi/ui/css/theme-default/storagepool-add-volume.css index 6e8a551..6aa5e96 100644 --- a/plugins/kimchi/ui/css/theme-default/storagepool-add-volume.css +++ b/plugins/kimchi/ui/css/theme-default/storagepool-add-volume.css @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/css/theme-default/template.css b/plugins/kimchi/ui/css/theme-default/template.css index 27fe404..fbab23f 100644 --- a/plugins/kimchi/ui/css/theme-default/template.css +++ b/plugins/kimchi/ui/css/theme-default/template.css @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/css/theme-default/template_list.css b/plugins/kimchi/ui/css/theme-default/template_list.css index 3161a33..4de4704 100644 --- a/plugins/kimchi/ui/css/theme-default/template_list.css +++ b/plugins/kimchi/ui/css/theme-default/template_list.css @@ -1,7 +1,7 @@ /* * Project Kimchi * -* Copyright IBM, Corp. 2013-2014 +* Copyright IBM, Corp. 2013-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/images/Makefile.am b/plugins/kimchi/ui/images/Makefile.am index 0562e6a..361c219 100644 --- a/plugins/kimchi/ui/images/Makefile.am +++ b/plugins/kimchi/ui/images/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/images/theme-default/Makefile.am b/plugins/kimchi/ui/images/theme-default/Makefile.am index 7e11d75..ba1398d 100644 --- a/plugins/kimchi/ui/images/theme-default/Makefile.am +++ b/plugins/kimchi/ui/images/theme-default/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/js/Makefile.am b/plugins/kimchi/ui/js/Makefile.am index c9d1218..4bc4861 100644 --- a/plugins/kimchi/ui/js/Makefile.am +++ b/plugins/kimchi/ui/js/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/js/src/kimchi.guest_add_main.js b/plugins/kimchi/ui/js/src/kimchi.guest_add_main.js index 6be6f9a..d269eeb 100644 --- a/plugins/kimchi/ui/js/src/kimchi.guest_add_main.js +++ b/plugins/kimchi/ui/js/src/kimchi.guest_add_main.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/js/src/kimchi.guest_media_main.js b/plugins/kimchi/ui/js/src/kimchi.guest_media_main.js index b920527..61b5918 100644 --- a/plugins/kimchi/ui/js/src/kimchi.guest_media_main.js +++ b/plugins/kimchi/ui/js/src/kimchi.guest_media_main.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/js/src/kimchi.host.js b/plugins/kimchi/ui/js/src/kimchi.host.js index e2d2511..bcff58e 100644 --- a/plugins/kimchi/ui/js/src/kimchi.host.js +++ b/plugins/kimchi/ui/js/src/kimchi.host.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/js/src/kimchi.main.js b/plugins/kimchi/ui/js/src/kimchi.main.js index 2fdeb85..79d46ea 100644 --- a/plugins/kimchi/ui/js/src/kimchi.main.js +++ b/plugins/kimchi/ui/js/src/kimchi.main.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/js/src/kimchi.report_add_main.js b/plugins/kimchi/ui/js/src/kimchi.report_add_main.js index 5f098d3..2c3ca57 100644 --- a/plugins/kimchi/ui/js/src/kimchi.report_add_main.js +++ b/plugins/kimchi/ui/js/src/kimchi.report_add_main.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/js/src/kimchi.report_rename_main.js b/plugins/kimchi/ui/js/src/kimchi.report_rename_main.js index 1bdb8d9..c3f039e 100644 --- a/plugins/kimchi/ui/js/src/kimchi.report_rename_main.js +++ b/plugins/kimchi/ui/js/src/kimchi.report_rename_main.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/js/src/kimchi.repository_add_main.js b/plugins/kimchi/ui/js/src/kimchi.repository_add_main.js index 656306b..70a71fe 100644 --- a/plugins/kimchi/ui/js/src/kimchi.repository_add_main.js +++ b/plugins/kimchi/ui/js/src/kimchi.repository_add_main.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/js/src/kimchi.repository_edit_main.js b/plugins/kimchi/ui/js/src/kimchi.repository_edit_main.js index 5bfc51e..e18ea91 100644 --- a/plugins/kimchi/ui/js/src/kimchi.repository_edit_main.js +++ b/plugins/kimchi/ui/js/src/kimchi.repository_edit_main.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/js/src/kimchi.template_main.js b/plugins/kimchi/ui/js/src/kimchi.template_main.js index b09fe12..948a4bf 100644 --- a/plugins/kimchi/ui/js/src/kimchi.template_main.js +++ b/plugins/kimchi/ui/js/src/kimchi.template_main.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/pages/Makefile.am b/plugins/kimchi/ui/pages/Makefile.am index 56288e3..3c50f31 100644 --- a/plugins/kimchi/ui/pages/Makefile.am +++ b/plugins/kimchi/ui/pages/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/pages/guest-storage-add.html.tmpl b/plugins/kimchi/ui/pages/guest-storage-add.html.tmpl index a26e0f9..901178f 100644 --- a/plugins/kimchi/ui/pages/guest-storage-add.html.tmpl +++ b/plugins/kimchi/ui/pages/guest-storage-add.html.tmpl @@ -1,7 +1,7 @@ #* * Project Kimchi * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/pages/guests.html.tmpl b/plugins/kimchi/ui/pages/guests.html.tmpl index b8a1259..975a05a 100644 --- a/plugins/kimchi/ui/pages/guests.html.tmpl +++ b/plugins/kimchi/ui/pages/guests.html.tmpl @@ -1,7 +1,7 @@ #* * Project Kimchi * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/pages/help/Makefile.am b/plugins/kimchi/ui/pages/help/Makefile.am index a4ee361..c356520 100644 --- a/plugins/kimchi/ui/pages/help/Makefile.am +++ b/plugins/kimchi/ui/pages/help/Makefile.am @@ -1,4 +1,4 @@ -# Copyright IBM Corp, 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/ui/pages/help/de_DE/Makefile.am b/plugins/kimchi/ui/pages/help/de_DE/Makefile.am index 3d99aae..3952fa4 100644 --- a/plugins/kimchi/ui/pages/help/de_DE/Makefile.am +++ b/plugins/kimchi/ui/pages/help/de_DE/Makefile.am @@ -1,4 +1,4 @@ -# Copyright IBM Corp, 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/ui/pages/help/en_US/Makefile.am b/plugins/kimchi/ui/pages/help/en_US/Makefile.am index d37f03a..c312ebb 100644 --- a/plugins/kimchi/ui/pages/help/en_US/Makefile.am +++ b/plugins/kimchi/ui/pages/help/en_US/Makefile.am @@ -1,4 +1,4 @@ -# Copyright IBM Corp, 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/ui/pages/help/es_ES/Makefile.am b/plugins/kimchi/ui/pages/help/es_ES/Makefile.am index 29c596f..b31785f 100644 --- a/plugins/kimchi/ui/pages/help/es_ES/Makefile.am +++ b/plugins/kimchi/ui/pages/help/es_ES/Makefile.am @@ -1,4 +1,4 @@ -# Copyright IBM Corp, 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/ui/pages/help/fr_FR/Makefile.am b/plugins/kimchi/ui/pages/help/fr_FR/Makefile.am index 11ce394..4c5d5df 100644 --- a/plugins/kimchi/ui/pages/help/fr_FR/Makefile.am +++ b/plugins/kimchi/ui/pages/help/fr_FR/Makefile.am @@ -1,4 +1,4 @@ -# Copyright IBM Corp, 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/ui/pages/help/it_IT/Makefile.am b/plugins/kimchi/ui/pages/help/it_IT/Makefile.am index 62e2f29..5717cc8 100644 --- a/plugins/kimchi/ui/pages/help/it_IT/Makefile.am +++ b/plugins/kimchi/ui/pages/help/it_IT/Makefile.am @@ -1,4 +1,4 @@ -# Copyright IBM Corp, 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/ui/pages/help/ja_JP/Makefile.am b/plugins/kimchi/ui/pages/help/ja_JP/Makefile.am index f9c2f33..e0632cd 100644 --- a/plugins/kimchi/ui/pages/help/ja_JP/Makefile.am +++ b/plugins/kimchi/ui/pages/help/ja_JP/Makefile.am @@ -1,4 +1,4 @@ -# Copyright IBM Corp, 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/ui/pages/help/kimchi.css b/plugins/kimchi/ui/pages/help/kimchi.css index 32fae4a..1ac5942 100644 --- a/plugins/kimchi/ui/pages/help/kimchi.css +++ b/plugins/kimchi/ui/pages/help/kimchi.css @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/pages/help/ko_KR/Makefile.am b/plugins/kimchi/ui/pages/help/ko_KR/Makefile.am index e441955..d2f920b 100644 --- a/plugins/kimchi/ui/pages/help/ko_KR/Makefile.am +++ b/plugins/kimchi/ui/pages/help/ko_KR/Makefile.am @@ -1,4 +1,4 @@ -# Copyright IBM Corp, 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/ui/pages/help/pt_BR/Makefile.am b/plugins/kimchi/ui/pages/help/pt_BR/Makefile.am index 7fc2cb0..65a1061 100644 --- a/plugins/kimchi/ui/pages/help/pt_BR/Makefile.am +++ b/plugins/kimchi/ui/pages/help/pt_BR/Makefile.am @@ -1,4 +1,4 @@ -# Copyright IBM Corp, 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/ui/pages/help/ru_RU/Makefile.am b/plugins/kimchi/ui/pages/help/ru_RU/Makefile.am index 85ca27a..f5a2e9e 100644 --- a/plugins/kimchi/ui/pages/help/ru_RU/Makefile.am +++ b/plugins/kimchi/ui/pages/help/ru_RU/Makefile.am @@ -1,4 +1,4 @@ -# Copyright IBM Corp, 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/ui/pages/help/zh_CN/Makefile.am b/plugins/kimchi/ui/pages/help/zh_CN/Makefile.am index e785048..426c5b0 100644 --- a/plugins/kimchi/ui/pages/help/zh_CN/Makefile.am +++ b/plugins/kimchi/ui/pages/help/zh_CN/Makefile.am @@ -1,4 +1,4 @@ -# Copyright IBM Corp, 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/ui/pages/help/zh_TW/Makefile.am b/plugins/kimchi/ui/pages/help/zh_TW/Makefile.am index 9c8ac26..b5ee387 100644 --- a/plugins/kimchi/ui/pages/help/zh_TW/Makefile.am +++ b/plugins/kimchi/ui/pages/help/zh_TW/Makefile.am @@ -1,4 +1,4 @@ -# Copyright IBM Corp, 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/ui/pages/templates.html.tmpl b/plugins/kimchi/ui/pages/templates.html.tmpl index af1cf3f..337084c 100644 --- a/plugins/kimchi/ui/pages/templates.html.tmpl +++ b/plugins/kimchi/ui/pages/templates.html.tmpl @@ -1,7 +1,7 @@ #* * Project Kimchi * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/spice-html5/Makefile.am b/plugins/kimchi/ui/spice-html5/Makefile.am index c43f1ef..fc46351 100644 --- a/plugins/kimchi/ui/spice-html5/Makefile.am +++ b/plugins/kimchi/ui/spice-html5/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/spice-html5/css/Makefile.am b/plugins/kimchi/ui/spice-html5/css/Makefile.am index ed51972..5005974 100644 --- a/plugins/kimchi/ui/spice-html5/css/Makefile.am +++ b/plugins/kimchi/ui/spice-html5/css/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/spice-html5/pages/Makefile.am b/plugins/kimchi/ui/spice-html5/pages/Makefile.am index 431ec6c..2c354a4 100644 --- a/plugins/kimchi/ui/spice-html5/pages/Makefile.am +++ b/plugins/kimchi/ui/spice-html5/pages/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/ui/spice-html5/thirdparty/Makefile.am b/plugins/kimchi/ui/spice-html5/thirdparty/Makefile.am index 474478d..79cd1f5 100644 --- a/plugins/kimchi/ui/spice-html5/thirdparty/Makefile.am +++ b/plugins/kimchi/ui/spice-html5/thirdparty/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/plugins/kimchi/xmlutils/Makefile.am b/plugins/kimchi/xmlutils/Makefile.am index 207ad7f..5667443 100644 --- a/plugins/kimchi/xmlutils/Makefile.am +++ b/plugins/kimchi/xmlutils/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM Corp, 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/xmlutils/__init__.py b/plugins/kimchi/xmlutils/__init__.py index ca7ede4..771bf68 100644 --- a/plugins/kimchi/xmlutils/__init__.py +++ b/plugins/kimchi/xmlutils/__init__.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/xmlutils/disk.py b/plugins/kimchi/xmlutils/disk.py index 126ce77..54e6763 100644 --- a/plugins/kimchi/xmlutils/disk.py +++ b/plugins/kimchi/xmlutils/disk.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/xmlutils/graphics.py b/plugins/kimchi/xmlutils/graphics.py index 2b4346a..8bf83a9 100644 --- a/plugins/kimchi/xmlutils/graphics.py +++ b/plugins/kimchi/xmlutils/graphics.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/xmlutils/network.py b/plugins/kimchi/xmlutils/network.py index c73aad9..c454224 100644 --- a/plugins/kimchi/xmlutils/network.py +++ b/plugins/kimchi/xmlutils/network.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/kimchi/xmlutils/qemucmdline.py b/plugins/kimchi/xmlutils/qemucmdline.py index 66238a7..bcafd75 100644 --- a/plugins/kimchi/xmlutils/qemucmdline.py +++ b/plugins/kimchi/xmlutils/qemucmdline.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/sample/__init__.py b/plugins/sample/__init__.py index a3a8f05..b8299b8 100644 --- a/plugins/sample/__init__.py +++ b/plugins/sample/__init__.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/sample/model.py b/plugins/sample/model.py index 4ada648..8a093a1 100644 --- a/plugins/sample/model.py +++ b/plugins/sample/model.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/plugins/sample/ui/js/util.js b/plugins/sample/ui/js/util.js index 7689a81..75240c0 100644 --- a/plugins/sample/ui/js/util.js +++ b/plugins/sample/ui/js/util.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/plugins/sample/ui/pages/i18n.json.tmpl b/plugins/sample/ui/pages/i18n.json.tmpl index 737bb39..24f7eca 100644 --- a/plugins/sample/ui/pages/i18n.json.tmpl +++ b/plugins/sample/ui/pages/i18n.json.tmpl @@ -1,7 +1,7 @@ #* * Kimchi * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Makefile.am b/src/Makefile.am index 2fed7d5..a730574 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM Corp, 2013-2015 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/nginx/Makefile.am b/src/nginx/Makefile.am index 0f36b44..b1098e1 100644 --- a/src/nginx/Makefile.am +++ b/src/nginx/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM Corp, 2015 +# Copyright IBM, Corp. 2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/Makefile.am b/src/wok/Makefile.am index 6e00907..c7f8825 100644 --- a/src/wok/Makefile.am +++ b/src/wok/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM Corp, 2013 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/__init__.py b/src/wok/__init__.py index edf8e5d..ee98092 100644 --- a/src/wok/__init__.py +++ b/src/wok/__init__.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/asynctask.py b/src/wok/asynctask.py index 1e0ec4b..0e19e16 100644 --- a/src/wok/asynctask.py +++ b/src/wok/asynctask.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/basemodel.py b/src/wok/basemodel.py index 096c66b..57059f1 100644 --- a/src/wok/basemodel.py +++ b/src/wok/basemodel.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/cachebust.py b/src/wok/cachebust.py index d04b2c6..50e68f1 100644 --- a/src/wok/cachebust.py +++ b/src/wok/cachebust.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/control/Makefile.am b/src/wok/control/Makefile.am index d6cb3f0..f68badf 100644 --- a/src/wok/control/Makefile.am +++ b/src/wok/control/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM Corp, 2013 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/control/__init__.py b/src/wok/control/__init__.py index 4ad9459..14bfb8e 100644 --- a/src/wok/control/__init__.py +++ b/src/wok/control/__init__.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/control/plugins.py b/src/wok/control/plugins.py index 1cc1d5a..9488e2f 100644 --- a/src/wok/control/plugins.py +++ b/src/wok/control/plugins.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/control/utils.py b/src/wok/control/utils.py index 496320c..3988ba9 100644 --- a/src/wok/control/utils.py +++ b/src/wok/control/utils.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/exception.py b/src/wok/exception.py index 6f5e9d9..f36ff77 100644 --- a/src/wok/exception.py +++ b/src/wok/exception.py @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/model/Makefile.am b/src/wok/model/Makefile.am index 8f0f102..ee31167 100644 --- a/src/wok/model/Makefile.am +++ b/src/wok/model/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM Corp, 2013 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/model/__init__.py b/src/wok/model/__init__.py index ca7ede4..771bf68 100644 --- a/src/wok/model/__init__.py +++ b/src/wok/model/__init__.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/model/plugins.py b/src/wok/model/plugins.py index e350f1e..f568d42 100644 --- a/src/wok/model/plugins.py +++ b/src/wok/model/plugins.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/network.py b/src/wok/network.py index 1433b8a..80b2cc1 100644 --- a/src/wok/network.py +++ b/src/wok/network.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/objectstore.py b/src/wok/objectstore.py index 107b568..4c0b024 100644 --- a/src/wok/objectstore.py +++ b/src/wok/objectstore.py @@ -1,6 +1,6 @@ # Project Kimchi # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/rollbackcontext.py b/src/wok/rollbackcontext.py index 2f3e8bc..1d93181 100644 --- a/src/wok/rollbackcontext.py +++ b/src/wok/rollbackcontext.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/server.py b/src/wok/server.py index 5b48049..9d2c27b 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/sslcert.py b/src/wok/sslcert.py index 6b64796..792a8a3 100644 --- a/src/wok/sslcert.py +++ b/src/wok/sslcert.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # Copyright (C) 2004-2005 OSAF. All Rights Reserved. # # Portions of this file were derived from the python-m2crypto unit tests: diff --git a/src/wok/template.py b/src/wok/template.py index c743f73..41e5c91 100644 --- a/src/wok/template.py +++ b/src/wok/template.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/xmlutils/Makefile.am b/src/wok/xmlutils/Makefile.am index 69aa524..a355541 100644 --- a/src/wok/xmlutils/Makefile.am +++ b/src/wok/xmlutils/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM Corp, 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/xmlutils/__init__.py b/src/wok/xmlutils/__init__.py index ca7ede4..771bf68 100644 --- a/src/wok/xmlutils/__init__.py +++ b/src/wok/xmlutils/__init__.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/xmlutils/utils.py b/src/wok/xmlutils/utils.py index be08a14..cb0dbcd 100644 --- a/src/wok/xmlutils/utils.py +++ b/src/wok/xmlutils/utils.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/ui/Makefile.am b/ui/Makefile.am index 6be27ed..3c34391 100644 --- a/ui/Makefile.am +++ b/ui/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/css/Makefile.am b/ui/css/Makefile.am index 29ddb26..bffff55 100644 --- a/ui/css/Makefile.am +++ b/ui/css/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/css/theme-default/circleGauge.css b/ui/css/theme-default/circleGauge.css index 48ef1d3..6966d80 100644 --- a/ui/css/theme-default/circleGauge.css +++ b/ui/css/theme-default/circleGauge.css @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/css/theme-default/grid.css b/ui/css/theme-default/grid.css index dfc20ff..c607691 100644 --- a/ui/css/theme-default/grid.css +++ b/ui/css/theme-default/grid.css @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/css/theme-default/jquery-ui.custom.css b/ui/css/theme-default/jquery-ui.custom.css index 56f7e06..9353422 100644 --- a/ui/css/theme-default/jquery-ui.custom.css +++ b/ui/css/theme-default/jquery-ui.custom.css @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/css/theme-default/line-chart.css b/ui/css/theme-default/line-chart.css index 15d9bb8..edf34f5 100644 --- a/ui/css/theme-default/line-chart.css +++ b/ui/css/theme-default/line-chart.css @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/css/theme-default/tile-check.css b/ui/css/theme-default/tile-check.css index 5e802ca..bbf5da0 100644 --- a/ui/css/theme-default/tile-check.css +++ b/ui/css/theme-default/tile-check.css @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/css/theme-default/toolbar.css b/ui/css/theme-default/toolbar.css index ea2a039..76372b8 100644 --- a/ui/css/theme-default/toolbar.css +++ b/ui/css/theme-default/toolbar.css @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/images/Makefile.am b/ui/images/Makefile.am index 297c0bd..5e944bb 100644 --- a/ui/images/Makefile.am +++ b/ui/images/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/images/theme-default/Makefile.am b/ui/images/theme-default/Makefile.am index 336729c..5b15aff 100644 --- a/ui/images/theme-default/Makefile.am +++ b/ui/images/theme-default/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/js/Makefile.am b/ui/js/Makefile.am index 2549846..1529ee9 100644 --- a/ui/js/Makefile.am +++ b/ui/js/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/js/src/wok.form.js b/ui/js/src/wok.form.js index 0bb7c4b..fc434c6 100644 --- a/ui/js/src/wok.form.js +++ b/ui/js/src/wok.form.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/js/src/wok.line-chart.js b/ui/js/src/wok.line-chart.js index 8b40288..66b819a 100644 --- a/ui/js/src/wok.line-chart.js +++ b/ui/js/src/wok.line-chart.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/js/src/wok.select.js b/ui/js/src/wok.select.js index 60830a5..0b2a4ce 100644 --- a/ui/js/src/wok.select.js +++ b/ui/js/src/wok.select.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/js/widgets/button-dropDown.js b/ui/js/widgets/button-dropDown.js index ec6bd2a..0209c7b 100644 --- a/ui/js/widgets/button-dropDown.js +++ b/ui/js/widgets/button-dropDown.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 * * Licensed under the Apache License, Version 2.0 (the 'License'); * you may not use this file except in compliance with the License. diff --git a/ui/js/widgets/circleGauge.js b/ui/js/widgets/circleGauge.js index 52ec027..bfbebf6 100644 --- a/ui/js/widgets/circleGauge.js +++ b/ui/js/widgets/circleGauge.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/js/widgets/combobox.js b/ui/js/widgets/combobox.js index 92244a2..8b79086 100644 --- a/ui/js/widgets/combobox.js +++ b/ui/js/widgets/combobox.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 * * Licensed under the Apache License, Version 2.0 (the 'License'); * you may not use this file except in compliance with the License. diff --git a/ui/js/widgets/filter-select.js b/ui/js/widgets/filter-select.js index db6b4b0..fff566f 100644 --- a/ui/js/widgets/filter-select.js +++ b/ui/js/widgets/filter-select.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 * * Licensed under the Apache License, Version 2.0 (the 'License'); * you may not use this file except in compliance with the License. diff --git a/ui/js/widgets/select-menu.js b/ui/js/widgets/select-menu.js index bd7a207..54b9a0b 100644 --- a/ui/js/widgets/select-menu.js +++ b/ui/js/widgets/select-menu.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 * * Licensed under the Apache License, Version 2.0 (the 'License'); * you may not use this file except in compliance with the License. diff --git a/ui/libs/Makefile.am b/ui/libs/Makefile.am index 49ad3bb..5951fad 100644 --- a/ui/libs/Makefile.am +++ b/ui/libs/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/libs/themes/base/Makefile.am b/ui/libs/themes/base/Makefile.am index 1bbaa50..483306a 100644 --- a/ui/libs/themes/base/Makefile.am +++ b/ui/libs/themes/base/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/libs/themes/base/images/Makefile.am b/ui/libs/themes/base/images/Makefile.am index dd619c8..b117bd9 100644 --- a/ui/libs/themes/base/images/Makefile.am +++ b/ui/libs/themes/base/images/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/pages/Makefile.am b/ui/pages/Makefile.am index 68f4c92..b979444 100644 --- a/ui/pages/Makefile.am +++ b/ui/pages/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/pages/error.html.tmpl b/ui/pages/error.html.tmpl index eea1179..3b7fbbe 100644 --- a/ui/pages/error.html.tmpl +++ b/ui/pages/error.html.tmpl @@ -1,7 +1,7 @@ #* * Kimchi * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/pages/websockify/Makefile.am b/ui/pages/websockify/Makefile.am index 5321562..6add3e3 100644 --- a/ui/pages/websockify/Makefile.am +++ b/ui/pages/websockify/Makefile.am @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. -- 1.7.1

2 2

CentOS Init Script
by Michael Sole 05 Aug '15

05 Aug '15

I created a very simple CentOS 6 compatible init script. Its a little hacky but it does work. I know I am supposed to make a patch but perhaps someone can evaluate and decide if you want to include it: #!/bin/sh # # Name: Kimchi init script for CentOS 6 # Author: Michael Sole # Email: michael.sole(at)soledevelopment.com # # Description: Very simple init script to start, stop and restart the Kimchi control panel # # Usage: /etc/init.d/kimchid start|stop|restart ### BEGIN INIT INFO # Provides: kimchid # Required-Start: $local_fs $syslog # Required-Stop: $local_fs $syslog # Default-Start: 2345 # Default-Stop: 90 # Short-Description: run kimchi daemon # Description: Very simple init script to start, stop and restart the Kimchi control panel ### END INIT INFO # Source function library. . /etc/rc.d/init.d/functions exec="/usr/bin/kimchid" prog="kimchid" lockfile=/var/lock/subsys/$prog start() { if [ -f "$lockfile" ] then echo "Lock file found, is the daemon already running?" exit 5 fi echo -n $"Starting $prog: " nohup $exec > /dev/null 2>&1 & echo "OK" touch $lockfile return 0 } stop() { echo -n $"Stopping $prog: " rm -f $lockfile ps aux | grep -ie $prog | awk '{print $2}' | xargs kill -9 > /dev/null 2>&1 return 0 } restart() { stop start } case "$1" in start) $1 ;; stop) $1 ;; restart) $1 ;; *) echo $"Usage: $0 {start|stop|restart}" exit 2 esac exit $?

3 2

[PATCH] Fix minus in manpage
by Frédéric Bonnard 05 Aug '15

05 Aug '15

From: Frederic Bonnard <frediz(a)linux.vnet.ibm.com> Escape minus for options so they don't get interpreted as hyphens. --- docs/kimchid.8.in | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/kimchid.8.in b/docs/kimchid.8.in index 08e96e5..d715e87 100644 --- a/docs/kimchid.8.in +++ b/docs/kimchid.8.in @@ -17,35 +17,35 @@ supports HTML5. .SH OPTIONS The following options are supported: .TP -\fB-h\fP , \fB--help\fP +\fB\-h\fP , \fB\-\-help\fP Show this help message and exit. .TP -\fB--host\fP \fIhost\fP +\fB\-\-host\fP \fIhost\fP Specify the hostname or IP to listen on. .TP -\fB--port\fP \fIport\fP +\fB\-\-port\fP \fIport\fP Specify the HTTP port (default \fI8000\fP). .TP -\fB--ssl-port\fP \fIssl_port\fP +\fB\-\-ssl-port\fP \fIssl_port\fP Specify the HTTPS port (default \fI8001\fP). .TP -\fB--cherrypy_port\fP \fIcherrypy_port\fP +\fB\-\-cherrypy_port\fP \fIcherrypy_port\fP Specify the Cherrypy server port (default \fI8010\fP). .TP -\fB--log-level\fP [\fIdebug\fP | \fIinfo\fP | \fIwarning\fP | \fIerror\fP | \fIcritical\fP] +\fB\-\-log-level\fP [\fIdebug\fP | \fIinfo\fP | \fIwarning\fP | \fIerror\fP | \fIcritical\fP] Specify the log level (default \fIdebug\fP). .TP -\fB--access-log\fP \fIaccess_log\fP +\fB\-\-access-log\fP \fIaccess_log\fP Specify the access log location where kimchi should create the access log file. .TP -\fB--environment\fP [\fIdevelopment\fP | \fIproduction\fP] +\fB\-\-environment\fP [\fIdevelopment\fP | \fIproduction\fP] Specify the running environment of kimchi server. Check cherrypy documentation for more details (default \fIproduction\fP). .TP -\fB--federation\fP [\fIon\fP | \fIoff\fP] +\fB\-\-federation\fP [\fIon\fP | \fIoff\fP] Register and discover Kimchi peers in the same network using OpenSLP. Check below the \fBFEDERATION\fP section for more details (default \fIoff\fP). .TP -\fB--test\fP +\fB\-\-test\fP Run kimchi on a mock version that does not affect the system. For testing proposals. .SH FEDERATION Federation feature is a mechanism to discover Kimchi peers in the same network. @@ -63,23 +63,23 @@ To enable it, do the following: ports in your firewall configuration For system using firewalld, do: - sudo firewall-cmd --permanent --add-port=427/udp - sudo firewall-cmd --permanent --add-port=427/tcp - sudo firewall-cmd --reload + sudo firewall-cmd \-\-permanent \-\-add-port=427/udp + sudo firewall-cmd \-\-permanent \-\-add-port=427/tcp + sudo firewall-cmd \-\-reload For openSUSE systems, do: sudo /sbin/SuSEfirewall2 open EXT TCP 427 sudo /sbin/SuSEfirewall2 open EXT UDP 427 For system using iptables, do: - sudo iptables -A INPUT -p tcp --dport 427 -j ACCEPT - sudo iptables -A INPUT -p udp --dport 427 -j ACCEPT + sudo iptables \-A INPUT \-p tcp \-\-dport 427 \-j ACCEPT + sudo iptables \-A INPUT \-p udp \-\-dport 427 \-j ACCEPT 3. In addition to the OpenSLP ports, you also need to allow multicast in the firewall configuration For system using firewalld, do: - sudo firewall-cmd --direct --add-rule ipv4 filter INPUT 0 -s <subnet> -j ACCEPT + sudo firewall-cmd \-\-direct \-\-add-rule ipv4 filter INPUT 0 \-s <subnet> \-j ACCEPT For openSUSE systems, do: Add the subnet to the trusted networks listed on FW_TRUSTED_NETS in @@ -87,7 +87,7 @@ To enable it, do the following: Make sure to restart /sbin/SuSEfirewall2 after modifying /etc/sysconfig/SuSEfirewall2 For system using iptables, do: - sudo iptables -A INPUT -s <subnet> -j ACCEPT + sudo iptables \-A INPUT \-s <subnet> \-j ACCEPT 4. Start slpd service and make sure it is up while running Kimchi sudo service slpd start -- 2.1.4

3 3

[PATCH v2 0/4] Add usb xhci controller for hotplug on Power
by Jose Ricardo Ziviani 05 Aug '15

05 Aug '15

v2: - Added a new test case; Power system requires an USB XHCI controller in order to allow PCI hotplug. This patch adds such controller by default when creating a new VM and inform the users if a VM currently doesn't have the controller. Jose Ricardo Ziviani (4): Add a new error code for pci hotplug Check for usb xhci controller in Power platform Define the USB xhci controller in the template for Power Systems Add a new test case for pci hotplug on Power src/kimchi/i18n.py | 1 + src/kimchi/model/vmhostdevs.py | 28 +++++++++++++++++++++- src/kimchi/vmtemplate.py | 17 +++++++++++++ tests/test_model.py | 54 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 99 insertions(+), 1 deletion(-) -- 1.9.1

2 5