- Kimchi-devel - oVirt List Archives

Mail test only - please ignore/delete (eom)
by Jan Schneider 26 Aug '15

26 Aug '15

1 1

Re: [Kimchi-devel] New-UI Helvetica Font
by Jan Schneider 26 Aug '15

26 Aug '15

Hello team, I had some discussions on the fonts and am interested in the current status. *Some background for non-UI persons:* First we need to distinguish between the server and the client. The server contains the Kimchi/Ginger-webserver and the Kimchi/Ginger-installation with functional and UI code. The client contains a browser instance connected to the Kimchi/Ginger-webserver and displays the UI. Per default the browser uses fonts which are installed on the client. Five generic fonts are available on each client operating system and are used as a default. In CSS/HTML you specify a list of fonts starting with the most preferred one and ending with a generic one (default). You can also provide fonts via the server. This ensures that your preferred font is available at the client. Such fonts are part of the Kimchi/Ginger-installation on the server (no additional rpm). *My opinion on the font discussion:* 1) Icon Font Awesome This font is very useful as it provides a lot of scalable icons. We should use/package this font 2) Fonts like "Open Sans" and/or TeXGyreHeros as open source replacement for "Helvetica Neue" The sizes of graphical elements vary much more depending on the language than on the font. Our layout must be flexible enough to support this. My recommendation is to use fonts which are already installed on the client. Kind regards Jan From: Samuel Henrique De Oliveira Guimaraes <samuel.guimaraes(a)eldorado.org.br> To: Kevin Zander <klzander(a)linux.vnet.ibm.com>, Aline Manera <alinefm(a)linux.vnet.ibm.com>, "kimchi-devel(a)ovirt.org" <kimchi-devel(a)ovirt.org>, "donspang(a)us.ibm.com" <donspang(a)us.ibm.com> Date: 08/11/2015 07:13 PM Subject: Re: [Kimchi-devel] New-UI Helvetica Font Sent by: kimchi-devel-bounces(a)ovirt.org ------------------------------------------------------------------------ I thought that since we are packaging Font-Awesome, Elusive and other font files as icons it was ok to distribute Open Sans with Kimchi. I proposed moving to an open source and redistributable font family instead of a font stack because a text with Arial Unicode on Windows doesn’t fill the same space in pixels as a text with Helvetica Neue on OS X and iOS. Open Sans was an alternative because it has the same variations as Helvetica Neue and almost the same size (I mean letter spacing / tracking, kerning, body width, leading and height), we wouldn’t have “condensed” styles in one system and plain and regular bold and normal text in other systems. Samuel *From:* Kevin Zander [mailto:klzander@linux.vnet.ibm.com] * Sent:* terça-feira, 11 de agosto de 2015 13:31* To:* Aline Manera <alinefm(a)linux.vnet.ibm.com>; Samuel Henrique De Oliveira Guimaraes <samuel.guimaraes(a)eldorado.org.br>; kimchi-devel(a)ovirt.org; donspang(a)us.ibm.com* Subject:* Re: [Kimchi-devel] New-UI Helvetica Font On Tue, 2015-08-11 at 12:01 -0300, Aline Manera wrote: On 10/08/2015 09:58, Samuel Henrique De Oliveira Guimaraes wrote: Hi team, I’m sending some screenshots to compare different fonts so we can decide if we are going to replace Helvetica Neue for Open Sans and/or TeXGyreHeros. I also found out that Open Sans doesn’t have all the character glyphs for simplified and traditional Chinese, Japanese and Korean languages (wok_current.png file, you can see that these texts have jagged edges). The equivalent font for these languages is called Noto Sans CJK which is licensed under SIL Open Font License (OFL). The downside is that Noto Sans is very heavy (~88MB each language set) so we would have to figure a way to load these font files only when the user has changed the locale in the front-end. OH! Wait... The idea is to use an open source and wide used font, which means, Kimchi will not package any font file. Isn’t there an open source and wide used font which works with all languages? _http://www.cssfontstack.com/_ Which of these has the best unicode support though, I cannot answer. _https://en.wikipedia.org/wiki/Unicode_font#List_of_Unicode_fonts_ Thanks, Samuel Guimaraes *From:* Aline Manera [_mailto:alinefm@linux.vnet.ibm.com_] * Sent:* quarta-feira, 5 de agosto de 2015 15:24* To:* Samuel Henrique De Oliveira Guimaraes _<samuel.guimaraes(a)eldorado.org.br>_ <mailto:samuel.guimaraes@eldorado.org.br>; _kimchi-devel(a)ovirt.org_ <mailto:kimchi-devel@ovirt.org>; _donspang(a)us.ibm.com_ <mailto:donspang@us.ibm.com>* Subject:* Re: [Kimchi-devel] New-UI Helvetica Font On 16/07/2015 13:09, Samuel Henrique De Oliveira Guimaraes wrote: Hi team, I noticed that the new-ui design pattern for typography specifies Helvetica Neue family in four different styles. This font family is shipped with the latest versions of Mac OS X and iOS but it is not available for free on Windows and Linux distributions. I believe this might conflict with Kimchi license. Even if we buy or rent a webfont license we can’t distribute the TTF, EOT, WOFF and SVG files in our repositories. I think that we can’t even use a webfont license in this case (pointing to a remote location or service like Adobe Typekit or MyFonts) because most font-licensing services are charging based on pre-paid pageviews. Usually for web apps, mobile web apps and cloud based services we have to buy a server license to store the webfont files within our servers, but since Kimchi is an open-source project that anyone can check out and run, every kimchi instance would have to buy their own font license. We can set Helvetica as the default font-family in the CSS and if the user doesn’t have this font installed the browser will load the next available font (Arial or any other Sans-Serif) but since each font has different sizes, some elements may not fit in the screen exactly like they were seen in the mockups. Hrm... we should build the new UI with responsive web design in mind which means changing the font, font size, resizing the browser or whatever will not impact in the final layout. Also, the UI specs recommends Helvetica Neue in 5 different styles (Light, Roman, Regular, Medium and Bold), most system fonts only have 3. We don’t have something like “Arial Light” for instance. My suggestion is that we replace Helvetica Neue for Open Sans because it covers all the style specifications and it is licensed under Apache 2.0. Any thoughts? Could you provide a screenshot with the Open Sans font so we can see how it will look like? In first hand, I am OK to change to Open Sans. I am copying Don who originally designed the new UI with the Helvetica Neue font to check if he has any advice to do. Thanks, Samuel Guimarães _______________________________________________ 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] New-UI Helvetica Font
by Jan Schneider 26 Aug '15

26 Aug '15

Hello team, I had some discussions on the fonts and am interested in the current status. *Some background for non-UI persons:* First we need to distinguish between the server and the client. The server contains the Kimchi/Ginger-webserver and the Kimchi/Ginger-installation with functional and UI code. The client contains a browser instance connected to the Kimchi/Ginger-webserver and displays the UI. Per default the browser uses fonts which are installed on the client. Five generic fonts are available on each client operating system and are used as a default. In CSS/HTML you specify a list of fonts starting with the most preferred one and ending with a generic one (default). You can also provide fonts via the server. This ensures that your preferred font is available at the client. Such fonts are part of the Kimchi/Ginger-installation on the server (no additional rpm). *My opinion on the font discussion:* 1) Icon Font Awesome This font is very useful as it provides a lot of scalable icons. We should use/package this font 2) Fonts like "Open Sans" and/or TeXGyreHeros as open source replacement for "Helvetica Neue" The sizes of graphical elements vary much more depending on the language than on the font. Our layout must be flexible enough to support this. My recommendation is to use fonts which are already installed on the client. Kind regards Jan From: Samuel Henrique De Oliveira Guimaraes <samuel.guimaraes(a)eldorado.org.br> To: Kevin Zander <klzander(a)linux.vnet.ibm.com>, Aline Manera <alinefm(a)linux.vnet.ibm.com>, "kimchi-devel(a)ovirt.org" <kimchi-devel(a)ovirt.org>, "donspang(a)us.ibm.com" <donspang(a)us.ibm.com> Date: 08/11/2015 07:13 PM Subject: Re: [Kimchi-devel] New-UI Helvetica Font Sent by: kimchi-devel-bounces(a)ovirt.org ------------------------------------------------------------------------ I thought that since we are packaging Font-Awesome, Elusive and other font files as icons it was ok to distribute Open Sans with Kimchi. I proposed moving to an open source and redistributable font family instead of a font stack because a text with Arial Unicode on Windows doesn’t fill the same space in pixels as a text with Helvetica Neue on OS X and iOS. Open Sans was an alternative because it has the same variations as Helvetica Neue and almost the same size (I mean letter spacing / tracking, kerning, body width, leading and height), we wouldn’t have “condensed” styles in one system and plain and regular bold and normal text in other systems. Samuel *From:* Kevin Zander [mailto:klzander@linux.vnet.ibm.com] * Sent:* terça-feira, 11 de agosto de 2015 13:31* To:* Aline Manera <alinefm(a)linux.vnet.ibm.com>; Samuel Henrique De Oliveira Guimaraes <samuel.guimaraes(a)eldorado.org.br>; kimchi-devel(a)ovirt.org; donspang(a)us.ibm.com* Subject:* Re: [Kimchi-devel] New-UI Helvetica Font On Tue, 2015-08-11 at 12:01 -0300, Aline Manera wrote: On 10/08/2015 09:58, Samuel Henrique De Oliveira Guimaraes wrote: Hi team, I’m sending some screenshots to compare different fonts so we can decide if we are going to replace Helvetica Neue for Open Sans and/or TeXGyreHeros. I also found out that Open Sans doesn’t have all the character glyphs for simplified and traditional Chinese, Japanese and Korean languages (wok_current.png file, you can see that these texts have jagged edges). The equivalent font for these languages is called Noto Sans CJK which is licensed under SIL Open Font License (OFL). The downside is that Noto Sans is very heavy (~88MB each language set) so we would have to figure a way to load these font files only when the user has changed the locale in the front-end. OH! Wait... The idea is to use an open source and wide used font, which means, Kimchi will not package any font file. Isn’t there an open source and wide used font which works with all languages? _http://www.cssfontstack.com/_ Which of these has the best unicode support though, I cannot answer. _https://en.wikipedia.org/wiki/Unicode_font#List_of_Unicode_fonts_ Thanks, Samuel Guimaraes *From:* Aline Manera [_mailto:alinefm@linux.vnet.ibm.com_] * Sent:* quarta-feira, 5 de agosto de 2015 15:24* To:* Samuel Henrique De Oliveira Guimaraes _<samuel.guimaraes(a)eldorado.org.br>_ <mailto:samuel.guimaraes@eldorado.org.br>; _kimchi-devel(a)ovirt.org_ <mailto:kimchi-devel@ovirt.org>; _donspang(a)us.ibm.com_ <mailto:donspang@us.ibm.com>* Subject:* Re: [Kimchi-devel] New-UI Helvetica Font On 16/07/2015 13:09, Samuel Henrique De Oliveira Guimaraes wrote: Hi team, I noticed that the new-ui design pattern for typography specifies Helvetica Neue family in four different styles. This font family is shipped with the latest versions of Mac OS X and iOS but it is not available for free on Windows and Linux distributions. I believe this might conflict with Kimchi license. Even if we buy or rent a webfont license we can’t distribute the TTF, EOT, WOFF and SVG files in our repositories. I think that we can’t even use a webfont license in this case (pointing to a remote location or service like Adobe Typekit or MyFonts) because most font-licensing services are charging based on pre-paid pageviews. Usually for web apps, mobile web apps and cloud based services we have to buy a server license to store the webfont files within our servers, but since Kimchi is an open-source project that anyone can check out and run, every kimchi instance would have to buy their own font license. We can set Helvetica as the default font-family in the CSS and if the user doesn’t have this font installed the browser will load the next available font (Arial or any other Sans-Serif) but since each font has different sizes, some elements may not fit in the screen exactly like they were seen in the mockups. Hrm... we should build the new UI with responsive web design in mind which means changing the font, font size, resizing the browser or whatever will not impact in the final layout. Also, the UI specs recommends Helvetica Neue in 5 different styles (Light, Roman, Regular, Medium and Bold), most system fonts only have 3. We don’t have something like “Arial Light” for instance. My suggestion is that we replace Helvetica Neue for Open Sans because it covers all the style specifications and it is licensed under Apache 2.0. Any thoughts? Could you provide a screenshot with the Open Sans font so we can see how it will look like? In first hand, I am OK to change to Open Sans. I am copying Don who originally designed the new UI with the Helvetica Neue font to check if he has any advice to do. Thanks, Samuel Guimarães _______________________________________________ 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] New-UI Helvetica Font
by Jan Schneider 26 Aug '15

26 Aug '15

From: Jan Schneider/Germany/IBM To: "Kimchi Devel" <kimchi-devel(a)ovirt.org> Date: 08/26/2015 04:51 PM Subject: Re: [Kimchi-devel] New-UI Helvetica Font ------------------------------------------------------------------------ Hello team, I had some discussions on the fonts and am interested in the current status. *Some background for non-UI persons:* First we need to distinguish between the server and the client. The server contains the Kimchi/Ginger-webserver and the Kimchi/Ginger-installation with functional and UI code. The client contains a browser instance connected to the Kimchi/Ginger-webserver and displays the UI. Per default the browser uses fonts which are installed on the client. Five generic fonts are available on each client operating system and are used as a default. In HTML/CSS you specify a list of fonts starting with the most preferred one and ending with a generic one (default). You can also provide fonts via the server. This ensures that your preferred font is available at the client. Such fonts are part of the Kimchi/Ginger-installation on the server (no additional rpm). *My opinion on the font discussion:* 1) Icon Font Awesome This font is very useful as it provides a lot of scalable icons. We should use/package this font 2) Fonts like "Open Sans" and/or TeXGyreHeros as open source replacement for "Helvetica Neue" The sizes of graphical elements vary much more depending on the language than on the font. Our layout must be flexible enough to support this. My recommendation is to use fonts which are already installed on the client. Kind regards Jan From: Samuel Henrique De Oliveira Guimaraes <samuel.guimaraes(a)eldorado.org.br> To: Kevin Zander <klzander(a)linux.vnet.ibm.com>, Aline Manera <alinefm(a)linux.vnet.ibm.com>, "kimchi-devel(a)ovirt.org" <kimchi-devel(a)ovirt.org>, "donspang(a)us.ibm.com" <donspang(a)us.ibm.com> Date: 08/11/2015 07:13 PM Subject: Re: [Kimchi-devel] New-UI Helvetica Font Sent by: kimchi-devel-bounces(a)ovirt.org ------------------------------------------------------------------------ I thought that since we are packaging Font-Awesome, Elusive and other font files as icons it was ok to distribute Open Sans with Kimchi. I proposed moving to an open source and redistributable font family instead of a font stack because a text with Arial Unicode on Windows doesn’t fill the same space in pixels as a text with Helvetica Neue on OS X and iOS. Open Sans was an alternative because it has the same variations as Helvetica Neue and almost the same size (I mean letter spacing / tracking, kerning, body width, leading and height), we wouldn’t have “condensed” styles in one system and plain and regular bold and normal text in other systems. Samuel *From:* Kevin Zander [mailto:klzander@linux.vnet.ibm.com] * Sent:* terça-feira, 11 de agosto de 2015 13:31* To:* Aline Manera <alinefm(a)linux.vnet.ibm.com>; Samuel Henrique De Oliveira Guimaraes <samuel.guimaraes(a)eldorado.org.br>; kimchi-devel(a)ovirt.org; donspang(a)us.ibm.com* Subject:* Re: [Kimchi-devel] New-UI Helvetica Font On Tue, 2015-08-11 at 12:01 -0300, Aline Manera wrote: On 10/08/2015 09:58, Samuel Henrique De Oliveira Guimaraes wrote: Hi team, I’m sending some screenshots to compare different fonts so we can decide if we are going to replace Helvetica Neue for Open Sans and/or TeXGyreHeros. I also found out that Open Sans doesn’t have all the character glyphs for simplified and traditional Chinese, Japanese and Korean languages (wok_current.png file, you can see that these texts have jagged edges). The equivalent font for these languages is called Noto Sans CJK which is licensed under SIL Open Font License (OFL). The downside is that Noto Sans is very heavy (~88MB each language set) so we would have to figure a way to load these font files only when the user has changed the locale in the front-end. OH! Wait... The idea is to use an open source and wide used font, which means, Kimchi will not package any font file. Isn’t there an open source and wide used font which works with all languages? _http://www.cssfontstack.com/_ Which of these has the best unicode support though, I cannot answer. _https://en.wikipedia.org/wiki/Unicode_font#List_of_Unicode_fonts_ Thanks, Samuel Guimaraes *From:* Aline Manera [_mailto:alinefm@linux.vnet.ibm.com_] * Sent:* quarta-feira, 5 de agosto de 2015 15:24* To:* Samuel Henrique De Oliveira Guimaraes _<samuel.guimaraes(a)eldorado.org.br>_ <mailto:samuel.guimaraes@eldorado.org.br>; _kimchi-devel(a)ovirt.org_ <mailto:kimchi-devel@ovirt.org>; _donspang(a)us.ibm.com_ <mailto:donspang@us.ibm.com>* Subject:* Re: [Kimchi-devel] New-UI Helvetica Font On 16/07/2015 13:09, Samuel Henrique De Oliveira Guimaraes wrote: Hi team, I noticed that the new-ui design pattern for typography specifies Helvetica Neue family in four different styles. This font family is shipped with the latest versions of Mac OS X and iOS but it is not available for free on Windows and Linux distributions. I believe this might conflict with Kimchi license. Even if we buy or rent a webfont license we can’t distribute the TTF, EOT, WOFF and SVG files in our repositories. I think that we can’t even use a webfont license in this case (pointing to a remote location or service like Adobe Typekit or MyFonts) because most font-licensing services are charging based on pre-paid pageviews. Usually for web apps, mobile web apps and cloud based services we have to buy a server license to store the webfont files within our servers, but since Kimchi is an open-source project that anyone can check out and run, every kimchi instance would have to buy their own font license. We can set Helvetica as the default font-family in the CSS and if the user doesn’t have this font installed the browser will load the next available font (Arial or any other Sans-Serif) but since each font has different sizes, some elements may not fit in the screen exactly like they were seen in the mockups. Hrm... we should build the new UI with responsive web design in mind which means changing the font, font size, resizing the browser or whatever will not impact in the final layout. Also, the UI specs recommends Helvetica Neue in 5 different styles (Light, Roman, Regular, Medium and Bold), most system fonts only have 3. We don’t have something like “Arial Light” for instance. My suggestion is that we replace Helvetica Neue for Open Sans because it covers all the style specifications and it is licensed under Apache 2.0. Any thoughts? Could you provide a screenshot with the Open Sans font so we can see how it will look like? In first hand, I am OK to change to Open Sans. I am copying Don who originally designed the new UI with the Helvetica Neue font to check if he has any advice to do. Thanks, Samuel Guimarães _______________________________________________ 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

[PATCH] [WOK] Adding a css class name to ginger tab and main template (including wok toolbar)
by sguimaraes943＠yahoo.com 25 Aug '15

25 Aug '15

From: sguimaraes943 <sguimaraes943(a)yahoo.com> Signed-off-by: samhenri <samuel.guimaraes(a)eldorado.org.br> --- ui/config/tab-ext.xml | 1 + ui/pages/host-admin.html.tmpl | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ui/config/tab-ext.xml b/ui/config/tab-ext.xml index d58327f..651434d 100644 --- a/ui/config/tab-ext.xml +++ b/ui/config/tab-ext.xml @@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA <access role="user" mode="none"/> <title>Administration</title> + <css>administration</css> <path>plugins/ginger/host-admin.html</path> </tab> </tabs-ext> diff --git a/ui/pages/host-admin.html.tmpl b/ui/pages/host-admin.html.tmpl index 238ab9f..4ebd17b 100644 --- a/ui/pages/host-admin.html.tmpl +++ b/ui/pages/host-admin.html.tmpl @@ -28,8 +28,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA <script type="text/javascript" src="plugins/ginger/js/host-admin.js"></script> </head> <body> -<div class="ginger"> - +<div id="administration-root-container" class="ginger"> +<div class="toolbar"> + <div class="container"> + <div class="tools pull-right"> + </div> + </div> +</div> <div id="gingerHostAdmin" class="host-admin"> <h3 class="firmware-ppc-enabled">$_("Firmware Update")</h3> <div class="content-area"> -- 1.9.3

1 0

Kimchi GUI Prototype, Base Navigation
by Jan Schneider 25 Aug '15

25 Aug '15

Hello, I started a Kimchi GUI Prototype with the Pencil tool. First topic I would like to discuss is the base navigation proposal shown below 1) There is a horizontal main navigation area which contains 'Host' and 'Virtualization'. 'Containers' is an example for a future plugin. 2) There is a vertical sub navigation area. Each item in the sub navigation has an icon and a label (1 or 2 lines). I am very interested in your feedback and would like to come to an agreement on this. I will discuss with Aline if we can store the Kimchi GUI Prototype at a central place. It is packed in a single file PencilGuiPrototype.zip Please extract this file and read ./readme.txt To view the Kimchi GUI Prototype open file ./htmlExport/index.html in your browser and navigate by clicking on navigation tabs/buttons. If you want to edit the Kimchi GUI Prototype you will find further information in ./readme.txt Kind regards Jan Alternate design with the same navigation �PNG

4 6

[PATCH] Improve code to get default disk format for VMTemplate
by Aline Manera 20 Aug '15

20 Aug '15

The default template configuration is defined in the template.conf file. This file is parsed on server start up and the result is always returned in the osinfo.lookup() method. That means when creating a new VMTemplate instance it will already contain all the default values to use for the Template creation. The disks are in a dict format like below: [{u'index': 0, u'size': 10, u'format': u'qcow2'}] Each disk has its own size and format and we just need to use them. We don't need to parse the template.conf file again in order to get the right values. Also adjust the tests according to those changes. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/vmtemplate.py | 40 ++++++++++++++++++---------------------- tests/test_model.py | 9 ++++++--- tests/test_template.py | 8 ++++---- 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index a165a5d..56a0de8 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -23,13 +23,11 @@ import time import urlparse import uuid -from configobj import ConfigObj from lxml import etree from lxml.builder import E from kimchi import imageinfo from kimchi import osinfo -from kimchi.config import paths from kimchi.exception import InvalidParameter, IsoFormatError, MissingParameter from kimchi.exception import ImageFormatError, OperationFailed from kimchi.isoinfo import IsoImage @@ -64,23 +62,31 @@ class VMTemplate(object): entry = osinfo.lookup(os_distro, os_version) self.info.update(entry) - # Auto-generate a template name and no one is passed + # Auto-generate a template name if no one is passed if 'name' not in args or args['name'] == '': args['name'] = self._gen_name(distro, version) self.name = args['name'] - # Override with the passed in parameters + # Merge graphics settings graph_args = args.get('graphics') if graph_args: graphics = dict(self.info['graphics']) graphics.update(graph_args) args['graphics'] = graphics - self.info.update(args) - # Assign right disk format to logical and [i]scsi storagepools - if self._get_storage_type() in ['logical', 'iscsi', 'scsi']: - for i, disk in enumerate(self.info['disks']): - self.info['disks'][i]['format'] = 'raw' + # Merge disks dict + default_disk = self.info['disks'][0] + for i, d in enumerate(args.get('disks', [])): + disk = dict(default_disk) + disk.update(d) + + # Assign right disk format to logical and [i]scsi storagepools + if self._get_storage_type() in ['logical', 'iscsi', 'scsi']: + disk['format'] = 'raw' + args['disks'][i] = disk + + # Override template values according to 'args' + self.info.update(args) def _get_os_info(self, args, scan): distro = version = 'unknown' @@ -159,14 +165,6 @@ class VMTemplate(object): dev, xml = get_disk_xml(params) return xml - @staticmethod - def get_default_disk0_format(): - config_file = os.path.join(paths.conf_dir, 'template.conf') - config = ConfigObj(config_file) - - default_vol_format = config['storage']['disk.0'].get('format', 'qcow2') - return default_vol_format - def _get_disks_xml(self, vm_uuid): # Current implementation just allows to create disk in one single # storage pool, so we cannot mix the types (scsi volumes vs img file) @@ -174,8 +172,7 @@ class VMTemplate(object): storage_path = self._get_storage_path() base_disk_params = {'type': 'disk', 'disk': 'file', - 'bus': self.info['disk_bus'], - 'format': self.get_default_disk0_format()} + 'bus': self.info['disk_bus']} logical_disk_params = {'format': 'raw'} iscsi_disk_params = {'disk': 'block', 'format': 'raw'} @@ -187,7 +184,7 @@ class VMTemplate(object): pool_name = pool_name_from_uri(self.info['storagepool']) for index, disk in enumerate(self.info['disks']): params = dict(base_disk_params) - params['format'] = disk.get('format', params['format']) + params['format'] = disk['format'] params.update(locals().get('%s_disk_params' % storage_type, {})) params['index'] = index @@ -203,7 +200,6 @@ class VMTemplate(object): return unicode(disks_xml, 'utf-8') def to_volume_list(self, vm_uuid): - default_vol_format = self.get_default_disk0_format() storage_path = self._get_storage_path() ret = [] for i, d in enumerate(self.info['disks']): @@ -212,7 +208,7 @@ class VMTemplate(object): info = {'name': volume, 'capacity': d['size'], - 'format': d.get('format', default_vol_format), + 'format': d['format'], 'path': '%s/%s' % (storage_path, volume)} if 'logical' == self._get_storage_type() or \ diff --git a/tests/test_model.py b/tests/test_model.py index 717b9bc..7ca823a 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -32,11 +32,11 @@ import iso_gen import kimchi.objectstore import utils from kimchi import netinfo +from kimchi import osinfo from kimchi.basemodel import Singleton from kimchi.config import config, paths from kimchi.exception import InvalidOperation from kimchi.exception import InvalidParameter, NotFoundError, OperationFailed -from kimchi.osinfo import get_template_default from kimchi.model import model from kimchi.model.libvirtconnection import LibvirtConnection from kimchi.model.vms import VMModel @@ -386,7 +386,7 @@ class ModelTests(unittest.TestCase): def test_vm_disk(self): disk_path = os.path.join(TMP_DIR, 'existent2.iso') open(disk_path, 'w').close() - modern_disk_bus = get_template_default('modern', 'disk_bus') + modern_disk_bus = osinfo.get_template_default('modern', 'disk_bus') def _attach_disk(expect_bus=modern_disk_bus): disk_args = {"type": "disk", @@ -485,7 +485,7 @@ class ModelTests(unittest.TestCase): rollback.prependDefer(inst.vm_delete, vm_name) # Need to check the right disk_bus for old distro - disk = _attach_disk(get_template_default('old', 'disk_bus')) + disk = _attach_disk(osinfo.get_template_default('old', 'disk_bus')) inst.vmstorage_delete('kimchi-ide-bus-vm', disk) # Hot plug IDE bus disk does not work @@ -620,11 +620,14 @@ class ModelTests(unittest.TestCase): with open(config_file, 'w') as f: f.write(conf_file_data) + osinfo.defaults = osinfo._get_tmpl_defaults() + def _restore_template_conf_file(self): config_file = os.path.join(paths.conf_dir, 'template.conf') config_bkp_file = \ os.path.join(paths.conf_dir, 'template.conf-unit_test_bkp') os.rename(config_bkp_file, config_file) + osinfo.defaults = osinfo._get_tmpl_defaults() def _get_disk_format_from_vm(self, vm, conn): dom = VMModel.get_vm(vm, conn) diff --git a/tests/test_template.py b/tests/test_template.py index 83561c1..48ef229 100644 --- a/tests/test_template.py +++ b/tests/test_template.py @@ -24,7 +24,7 @@ import unittest from functools import partial -from kimchi.vmtemplate import VMTemplate +from kimchi import osinfo from kimchi.config import READONLY_POOL_TYPE from kimchi.mockmodel import MockModel from utils import get_free_port, patch_auth, request, run_server @@ -88,7 +88,7 @@ class TemplateTests(unittest.TestCase): self.assertEquals(sorted(tmpl.keys()), sorted(keys)) # Verify if default disk format was configured - default_disk_format = VMTemplate.get_default_disk0_format() + default_disk_format = osinfo.defaults['disks'][0]['format'] self.assertEquals(tmpl['disks'][0]['format'], default_disk_format) # Clone a template @@ -199,8 +199,8 @@ class TemplateTests(unittest.TestCase): self.assertEquals(update_tmpl['cdrom'], cdrom_data['cdrom']) # Update disks - disk_data = {'disks': [{'index': 0, 'size': 10}, - {'index': 1, 'size': 20}]} + disk_data = {'disks': [{'index': 0, 'size': 10, 'format': 'raw'}, + {'index': 1, 'size': 20, 'format': 'raw'}]} resp = self.request(new_tmpl_uri, json.dumps(disk_data), 'PUT') self.assertEquals(200, resp.status) resp = self.request(new_tmpl_uri) -- 2.1.0

2 2

[PATCH] Add m4/pkg.m4 to .gitignore
by Aline Manera 20 Aug '15

20 Aug '15

Commit aaa60fae added PKG_CONFIG as dependency and now the m4/pkg.m4 file is auto-generated an each build. Add it to .gitignore to avoid untracked files. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b3988b6..4757cf7 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ autom4te.cache Makefile Makefile.in aclocal.m4 +m4/pkg.m4 build-aux/compile build-aux/config.guess build-aux/config.sub -- 2.1.0

2 2

[PATCH] Issues #682/#684/#685: Change some code errors when start, shutdown or poweroff vms
by Ramon Medeiros 19 Aug '15

19 Aug '15

When trying to start a running vm, shutoff or poweroff a shutdown vm, the retrieved error was 500 (Internal Server Error). A better error would be 400 (Invalid Request). Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- src/kimchi/model/vms.py | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index 106e9bc..d3020b6 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -1105,7 +1105,12 @@ class VMModel(object): try: dom.create() except libvirt.libvirtError as e: - raise OperationFailed("KCHVM0019E", + # vm already running: return error 403 + if DOM_STATE_MAP[dom.info()[0]] == "running": + raise InvalidOperation("KCHVM0019E", + {'name': name, 'err': e.get_error_message()}) + else: + raise OperationFailed("KCHVM0019E", {'name': name, 'err': e.get_error_message()}) def poweroff(self, name): @@ -1113,7 +1118,12 @@ class VMModel(object): try: dom.destroy() except libvirt.libvirtError as e: - raise OperationFailed("KCHVM0020E", + # vm already powered off: return error 403 + if DOM_STATE_MAP[dom.info()[0]] == "shutoff": + raise InvalidOperation("KCHVM0020E", + {'name': name, 'err': e.get_error_message()}) + else: + raise OperationFailed("KCHVM0020E", {'name': name, 'err': e.get_error_message()}) def shutdown(self, name): @@ -1121,7 +1131,12 @@ class VMModel(object): try: dom.shutdown() except libvirt.libvirtError as e: - raise OperationFailed("KCHVM0029E", + # vm already powered off: return error 403 + if DOM_STATE_MAP[dom.info()[0]] == "shutoff": + raise InvalidOperation("KCHVM0029E", + {'name': name, 'err': e.get_error_message()}) + else: + raise OperationFailed("KCHVM0029E", {'name': name, 'err': e.get_error_message()}) def reset(self, name): -- 2.1.0

1 0

GUI Prototyping Tool
by Jan Schneider 19 Aug '15

19 Aug '15

Hi, today I was looking for an Open Source GUI Prototyping Tool. Harshal already used Pencil http://pencil.evolus.vn/ which is also the best I found. Pencil is an Open Source tool supporting multi platforms (Windows, Linux, Mac). It looks like development of Pencil stopped in 2013. I installed it and made some basic tests. In my opinion it is sufficient for visualizing general UI concepts in Kimchi/Ginmger but not for more. My recommendation is to use it for these aspects. What is your opinion? Do you know other tools? Kind regards Jan

4 5