- Kimchi-devel - oVirt List Archives

[PATCH 0/6] [WIP] update manage repository UI to work with new API
by Adam King 18 Mar '14

18 Mar '14

host tab table population works. Edit populates fields correctly. Parse contents from the form does not yet work. Updae needed to kimchi.form.js Consider changing the name notation from [] to . to make it simpler to parse. Haven't touched add yet, but it should be a linear extrapolation from edit->save Patch set includes latest UI from the list. Adam King (1): manageRep update to match new BE Hongliang Wang (5): Repository Management - Add i18n Strings Repository Management - Add API Support Repository Management - Add Repository Support Repository Management - Edit Repository Support Repository Management - Integrate into Host Tab docs/API.html | 978 +++++++++++++++++++++++++++++++ po/POTFILES.in | 2 + ui/css/theme-default/host.css | 8 + ui/css/theme-default/repository-add.css | 39 ++ ui/css/theme-default/repository-edit.css | 128 ++++ ui/js/src/kimchi.api.js | 76 ++- ui/js/src/kimchi.grid.js | 17 +- ui/js/src/kimchi.host.js | 186 +++++- ui/js/src/kimchi.repository_add_main.js | 84 +++ ui/js/src/kimchi.repository_edit_main.js | 99 ++++ ui/pages/i18n.html.tmpl | 19 + ui/pages/repository-add.html.tmpl | 104 ++++ ui/pages/repository-edit.html.tmpl | 115 ++++ ui/pages/tabs/host.html.tmpl | 15 + 14 files changed, 1865 insertions(+), 5 deletions(-) create mode 100644 docs/API.html create mode 100644 ui/css/theme-default/repository-add.css create mode 100644 ui/css/theme-default/repository-edit.css create mode 100644 ui/js/src/kimchi.repository_add_main.js create mode 100644 ui/js/src/kimchi.repository_edit_main.js create mode 100644 ui/pages/repository-add.html.tmpl create mode 100644 ui/pages/repository-edit.html.tmpl -- 1.8.1.4

1 6

[PATCH v3] Remove debug report's file path from UI
by Mark Wu 18 Mar '14

18 Mar '14

Now the file path displayed on UI is "/data/debugreports/<reportname>/", It's misleading because people could assume it's path on file system, but it's the uri path in fact. We don't need expose the URI path because the download button can help user to get the file. So this patch removes it from UI. And this patch also renames debug report's 'file' attribute to 'uri', because we use it to represent the download uri path. Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- docs/API.md | 2 +- src/kimchi/control/debugreports.py | 2 +- src/kimchi/model/debugreports.py | 2 +- ui/css/theme-default/host.css | 4 ---- ui/js/src/kimchi.host.js | 4 ---- ui/pages/i18n.html.tmpl | 1 - 6 files changed, 3 insertions(+), 12 deletions(-) diff --git a/docs/API.md b/docs/API.md index 672ef14..105498a 100644 --- a/docs/API.md +++ b/docs/API.md @@ -672,7 +672,7 @@ specific to the low level collection tool being used. * **GET**: Retrieve the full description of Debug Report * name: The debug report name used to identify the report - * file: The debug report file name used to identify the report + * uri: The URI path to download a debug report * time: The time when the debug report is created * **DELETE**: Remove the Debug Report diff --git a/src/kimchi/control/debugreports.py b/src/kimchi/control/debugreports.py index 9922cfa..6efae23 100644 --- a/src/kimchi/control/debugreports.py +++ b/src/kimchi/control/debugreports.py @@ -37,7 +37,7 @@ class DebugReport(Resource): @property def data(self): return {'name': self.ident, - 'file': self.info['file'], + 'uri': self.info['uri'], 'time': self.info['ctime']} diff --git a/src/kimchi/model/debugreports.py b/src/kimchi/model/debugreports.py index c6e698b..6ae282a 100644 --- a/src/kimchi/model/debugreports.py +++ b/src/kimchi/model/debugreports.py @@ -162,7 +162,7 @@ class DebugReportModel(object): ctime = time.strftime("%Y-%m-%d-%H:%M:%S", time.localtime(ctime)) file_target = os.path.split(file_target)[-1] file_target = os.path.join("/data/debugreports", file_target) - return {'file': file_target, + return {'uri': file_target, 'ctime': ctime} def delete(self, name): diff --git a/ui/css/theme-default/host.css b/ui/css/theme-default/host.css index 0f8b941..8af34f5 100644 --- a/ui/css/theme-default/host.css +++ b/ui/css/theme-default/host.css @@ -215,14 +215,10 @@ } .debug-report-name, -.debug-report-file, .debug-report-time { width: 200px; } -.debug-report-file { - width: 300px; -} /* End of Debug Report */ /* Software Updates */ diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index 6300f37..fa7b4c8 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -186,10 +186,6 @@ kimchi.host_main = function() { label: i18n['KCHDR6003M'], 'class': 'debug-report-name' }, { - name: 'file', - label: i18n['KCHDR6004M'], - 'class': 'debug-report-file' - }, { name: 'time', label: i18n['KCHDR6005M'], 'class': 'debug-report-time' diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl index 2f47e50..a626759 100644 --- a/ui/pages/i18n.html.tmpl +++ b/ui/pages/i18n.html.tmpl @@ -92,7 +92,6 @@ var i18n = { 'KCHDR6001M': "$_("Debug report will be removed permanently and can't be recovered. Do you want to continue?")", 'KCHDR6002M': "$_("Debug Reports")", 'KCHDR6003M': "$_("Name")", - 'KCHDR6004M': "$_("File Path")", 'KCHDR6005M': "$_("Generated Time")", 'KCHDR6006M': "$_("Generate")", 'KCHDR6007M': "$_("Generating...")", -- 1.8.4.2

3 4

[PATCH] [UI] Software Update: Enable "Update All" Button when Task Fails
by Hongliang Wang 18 Mar '14

18 Mar '14

"Update All" Button stays disabled even when the updating task fails. Fix it in this patch. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.host.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index f9696ea..91ac894 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -57,7 +57,9 @@ kimchi.host_main = function() { kimchi.topic('kimchi/softwareUpdated').publish({ result: result }); - }, function() {}, reloadProgressArea); + }, function(result) { + $(updateButton).text(i18n['KCHUPD6006M']).prop('disabled', false); + }, reloadProgressArea); } }], frozenFields: [], -- 1.8.1.4

2 2

dita warning when make.
by Sheldon 18 Mar '14

18 Mar '14

not sure are these warnings harmful. 1. xsltproc -o guests.html dita-help.xsl guests.dita 2. guests.dita:4: warning: failed to load external entity "-//IBM//DTD DITA CSHelp//EN" 3. "..\dtd\cshelp.dtd"> 4. ^ 5. xsltproc -o host.html dita-help.xsl host.dita 6. host.dita:4: warning: failed to load external entity "-//IBM//DTD DITA CSHelp//EN" 7. "..\dtd\cshelp.dtd"> 8. ^ 9. xsltproc -o network.html dita-help.xsl network.dita 10. network.dita:4: warning: failed to load external entity "-//IBM//DTD DITA CSHelp//EN" 11. "..\dtd\cshelp.dtd"> 12. ^ 13. xsltproc -o storage.html dita-help.xsl storage.dita 14. storage.dita:4: warning: failed to load external entity "-//IBM//DTD DITA CSHelp//EN" 15. "..\dtd\cshelp.dtd"> 16. ^ 17. xsltproc -o templates.html dita-help.xsl templates.dita 18. templates.dita:4: warning: failed to load external entity "-//IBM//DTD DITA CSHelp//EN" 19. "..\dtd\cshelp.dtd"> 20. ^ -- Thanks and best regards! Sheldon Feng(???)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

2 1

[PATCH] Changes to help
by Kersten Richter 18 Mar '14

18 Mar '14

Added information for software updates, adding storage device, and replacing contents of CDROM. Plus a couple of clean up things. Signed-off-by: Kersten Richter <kersten(a)us.ibm.com> --- ui/pages/help/guests.dita | 83 ++++++++++++++++++++++++++++++------------ ui/pages/help/host.dita | 44 +++++++++++++---------- ui/pages/help/templates.dita | 18 +++++----- 3 files changed, 93 insertions(+), 52 deletions(-) diff --git a/ui/pages/help/guests.dita b/ui/pages/help/guests.dita index bae98bb..0456bbb 100644 --- a/ui/pages/help/guests.dita +++ b/ui/pages/help/guests.dita @@ -23,26 +23,28 @@ KVM virtual machines.</shortdesc> <dd>Network input/output transmission rate in KB per seconds.</dd> </dlentry><dlentry> <dt>Disk I/O</dt> -<dd> Disk input/output transmission rate in KB per seconds.</dd> +<dd>Disk input/output transmission rate in KB per seconds.</dd> </dlentry><dlentry> <dt>Livetile</dt> -<dd rev="rev1">State of guest operating system console, or an icon -that represents the <tm tmtype="tm" trademark="Linux">Linux</tm> distribution -if the guest is not active.</dd> +<dd>State of guest operating system console, or an icon that represents +the <tm tmtype="tm" trademark="Linux">Linux</tm> distribution if the +guest is not active.</dd> </dlentry></dl></p> <p>The following actions icons are displayed for each guest:<dl> <dlentry> -<dt rev="rev1">Reset</dt> -<dd rev="rev1">Click to reset the guest. </dd> +<dt>Reset</dt> +<dd>Click to reset the guest. </dd> </dlentry><dlentry> -<dt><tm tmclass="IGNORE" tmtype="reg" trademark="Power">Power</tm> (Start -or Stop)</dt> +<dt>Power (Start or Stop)</dt> <dd>Click to power on or power off the guest. If the icon is red, the power is off; if the icon is green, the power is on.</dd> </dlentry></dl> </p> <p>The following actions can be selected for each guest:<ul> -<li>Select <uicontrol>VNC</uicontrol> to connect to the remote console -for the guest operating system.</li> +<li>Select <uicontrol>Connect</uicontrol> to connect to the remote +console for the guest operating system.</li> +<li>Select <uicontrol>Manage media</uicontrol> to change the path +to the installation media.</li> +<li>Select <uicontrol>Reset</uicontrol> to reset the guest.</li> <li>Select <uicontrol>Edit</uicontrol> to edit the properties of an existing guest. Guests can be edited only while stopped.</li> <li>Select <uicontrol>Delete</uicontrol> to delete the guest.</li> @@ -66,16 +68,12 @@ create a template.</li> </cshelp> <cshelp id="kimhvirtmedit" xml:lang="en-us"> <title>Edit guest</title> -<shortdesc rev="rev1">Edit the properties of an existing virtual machine. -Guests can be edited only while stopped.</shortdesc> -<csprolog><csmetadata> -<cswindowtitle>Title of window or panel associated with this help; -for review output only.</cswindowtitle> -<cswidgetlabel>Name of field or control associated with this help; -for review output only</cswidgetlabel> -</csmetadata></csprolog> +<shortdesc>Edit the properties of an existing virtual machine. Guests +can be edited only while stopped.</shortdesc> +<csprolog><csmetadata></csmetadata></csprolog> <csbody> -<p>For each guest, the following information is displayed:<dl><dlentry> +<p>For each guest, the following information is displayed on the <wintitle>General</wintitle> tab:<dl> +<dlentry> <dt>Name</dt> <dd>Name of the virtual machine.</dd> </dlentry><dlentry> @@ -86,14 +84,51 @@ for review output only</cswidgetlabel> <dd>Amount of memory in MB.</dd> </dlentry><dlentry> <dt>Icon</dt> -<dd rev="rev2"> Graphic image representing the Linux distribution -to be displayed in place of current status (Livetile) when the guest -is not active.</dd> +<dd>Graphic image representing the Linux distribution to be displayed +in place of current status (Livetile) when the guest is not active.</dd> </dlentry></dl></p> +<p>The following information is displayed on the <wintitle>Storage</wintitle> tab.</p> +<dl><dlentry> +<dt>Storage</dt> +<dd>Displays the location of the ISO file used for installation.</dd> +</dlentry></dl><?Pub Caret -2?> <p> Fields that are not disabled can be edited. After you edit a field, click <uicontrol>Save</uicontrol>. </p> </csbody> -</cshelp><?Pub Caret -1?> +</cshelp> +<cshelp id="kimstoragedevice" xml:lang="en-us"> +<title>Add, replace, or detach a storage device</title> +<shortdesc rev="rev1">You can add, replace, or detach a storage device +to your virtual machine. The only supported device is CDROM. To edit +your storage devices, follow these steps:</shortdesc> +<csbody> +<ol> +<li>On the <wintitle>Edit Guest</wintitle> window, select <wintitle>Storage</wintitle>.</li> +<li>To replace a storage device, click the first icon with the <uicontrol>orange +slash (/)</uicontrol>. Enter the ISO file path and click <uicontrol>Replace</uicontrol>.</li> +<li>To detach a storage device, click the second icon with the <uicontrol>red +dash (-)</uicontrol>. Confirm the deletion and click <uicontrol>OK</uicontrol>.</li> +<li>To add a storage device, click the third icon with the green <uicontrol>plus +sign (+)</uicontrol>. Enter a device name and ISO file path and click <uicontrol>Attach</uicontrol>.</li> +</ol> +</csbody> +</cshelp> +<cshelp id="kimreplacemedia" xml:lang="en-us"> +<title>Replace a CDROM of VM</title> +<shortdesc rev="rev1">You can replace the contents of the CDROM for +a virtual machine after the installation is complete.</shortdesc> +<csbody> +<ol> +<li>Ensure that the virtual machine is started.</li> +<li>From the Actions menu, select <uicontrol>Manage Media</uicontrol>.</li> +<li>To change what is currently loaded in the CDROM, click the <uicontrol>orange +slash (/)</uicontrol> icon next to the hdc field.</li> +<li>On the <wintitle>Replace a CDROM of VM</wintitle> page, enter +the ISO file path. The other two fields are read-only.</li> +<li>Click <uicontrol>Replace</uicontrol>.</li> +</ol> +</csbody> +</cshelp> <?tm 1391540919 3?> </cshelp> -<?Pub *0000003805?> +<?Pub *0000005541?> diff --git a/ui/pages/help/host.dita b/ui/pages/help/host.dita index d961edc..1b60b27 100644 --- a/ui/pages/help/host.dita +++ b/ui/pages/help/host.dita @@ -9,16 +9,16 @@ For support please see: https://w3.opensource.ibm.com/projects/dita-cshelp/--> <cshelp id="kimhhost" xml:lang="en-us"> <title>Host</title> -<shortdesc rev="rev1">The <wintitle>Host</wintitle> page shows information -about the host system, and allows you to shut down, restart, and connect +<shortdesc>The <wintitle>Host</wintitle> page shows information about +the host system, and allows you to shut down, restart, and connect to the host.</shortdesc> <csbody> <p>You can perform the following actions on the host:<ul> <li>Select <uicontrol>Shut down</uicontrol> to shut down the host system.</li> <li>Select <uicontrol>Restart</uicontrol> to restart the host system.</li> -<li rev="rev1">Select <uicontrol>Connect</uicontrol> to open a VNC -connection to the host system, if it is not already connected.</li> +<li>Select <uicontrol>Connect</uicontrol> to open a VNC connection +to the host system, if it is not already connected.</li> </ul></p> <p>Click the following sections to display information about the host:<dl> <dlentry> @@ -28,24 +28,30 @@ version, and code name, as well as the processor type and amount of memory in GB.</dd> </dlentry><dlentry> <dt>System statistics</dt> -<dd rev="rev1">This section displays graphs to show statistics for -CPU, memory, disk I/O, and network I/O for the host. Select <uicontrol>Collecting +<dd>This section displays graphs to show statistics for CPU, memory, +disk I/O, and network I/O for the host. Select <uicontrol>Collecting data after leaving this page</uicontrol> to continue collecting data when the host tab is out of view.</dd> </dlentry><dlentry> +<dt>Software Updates</dt> +<dd>This section displays information for all of the packages that +have updates available, including package name, version, architecture, +and repository. You can update all of the packages listed by selecting <uicontrol>Update +All</uicontrol>. You cannot select individual packages for updates.</dd> +</dlentry><dlentry> <dt>Debug reports</dt> -<dd rev="rev1">This section displays debug reports, including name -and file path. You can select from options to generate a new report, -or rename, remove, or download an existing report.<p>The debug report -is generated using the <cmdname>sosreport</cmdname> command. It is -available for Red Hat Enterprise <tm tmtype="tm" trademark="Linux">Linux</tm>, -Fedora, and Ubuntu distributions. The command generates a .tar file -that contains configuration and diagnostic information, such as the -running kernel version, loaded modules, and system and service configuration -files. The command also runs external programs to collect further -information and stores this output in the resulting archive.</p> </dd> -</dlentry></dl></p> -</csbody><?Pub Caret -2?> +<dd>This section displays debug reports, including name and file path. +You can select from options to generate a new report, or rename, remove, +or download an existing report.<p>The debug report is generated using +the <cmdname>sosreport</cmdname> command. It is available for Red +Hat Enterprise <tm tmtype="tm" trademark="Linux">Linux</tm>, Fedora, +and Ubuntu distributions. The command generates a .tar file that contains +configuration and diagnostic information, such as the running kernel +version, loaded modules, and system and service configuration files. +The command also runs external programs to collect further information +and stores this output in the resulting archive.</p> </dd> +</dlentry></dl><?Pub Caret 693?></p> +</csbody> <?tm 1392659967 1?> </cshelp> -<?Pub *0000002392?> +<?Pub *0000002695?> diff --git a/ui/pages/help/templates.dita b/ui/pages/help/templates.dita index d0122ec..8306681 100644 --- a/ui/pages/help/templates.dita +++ b/ui/pages/help/templates.dita @@ -56,7 +56,7 @@ is configured to use.</dd> <dd>Amount of memory in MB to be allocated to the virtual machine.</dd> </dlentry><dlentry> <dt>Disk</dt> -<dd rev="rev1">Disk size in GB.</dd> +<dd>Disk size in GB.</dd> </dlentry><dlentry> <dt>CDROM</dt> <dd>File path to the location of the ISO file used to install the @@ -66,10 +66,10 @@ KVM guest.</dd> <dd>Specific storage pool or the default storage pool.</dd> </dlentry><dlentry> <dt>Network</dt> -<dd rev="rev1">Default network interfaces available to the KVM guest. -You can select multiple networks.</dd> -</dlentry></dl><?Pub Caret 681?> Fields that are not disabled can -be edited. After you edit a field, click <uicontrol>Save</uicontrol>. </p> +<dd>Default network interfaces available to the KVM guest. You can +select multiple networks.</dd> +</dlentry></dl> Fields that are not disabled can be edited. After +you edit a field, click <uicontrol>Save</uicontrol>. </p> </csbody> </cshelp> <cshelp id="kimhaddtempl"> @@ -108,15 +108,15 @@ Templates from Selected ISO</uicontrol>.</li> <li>Select <uicontrol>All</uicontrol> to create a template from each listed ISO image, then click <uicontrol>Create Templates from Selected ISO</uicontrol>.</li> -<li rev="rev1">If the ISO image that you want to use does not appear -in the scan results, you can select from the following options:<ul> +<li>If the ISO image that you want to use does not appear in the scan +results, you can select from the following options:<ul> <li>Select <uicontrol>I want to use a specific ISO file</uicontrol> to specify a path to the ISO image.</li> <li>Click <uicontrol>Search more ISOs</uicontrol> to search for more ISO images.</li> -</ul></li> +</ul></li><?Pub Caret 0?> </ul></p> </csbody> </cshelp> </cshelp> -<?Pub *0000004468?> +<?Pub *0000004433?> -- 1.7.1

3 2

[PATCH] Remove bridge and vlan interface unconditionally on removing vlan network
by Mark Wu 18 Mar '14

18 Mar '14

It's observed that the low layer interfaces could be down for some reason, such as that the physical interface is in disconnected state. In this case, we still need destroy the interfaces to avoid that they're left on the system util reboot. Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- src/kimchi/model/networks.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/kimchi/model/networks.py b/src/kimchi/model/networks.py index 0242156..38e42e9 100644 --- a/src/kimchi/model/networks.py +++ b/src/kimchi/model/networks.py @@ -336,6 +336,5 @@ class NetworkModel(object): if bridge.startswith('kimchi-'): conn = self.conn.get() iface = conn.interfaceLookupByName(bridge) - if iface.isActive(): - iface.destroy(0) + iface.destroy(0) iface.undefine() -- 1.8.4.2

2 1

[PATCH v3] [UI] Grid Loading Mask - Some Elements are Missing
by Hongliang Wang 18 Mar '14

18 Mar '14

Some elements were lost and add them back here: 1) Show a message under the icon 2) Put the icon and text in the center both horizontally and vertically 3) Give the mask a opacity value 4) Hide the mask initially v2 -> v3: 3a) Put toolbar under mask (Adam King's comment) v1 -> v2: 2a) Rebased. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/grid.css | 13 +++++++------ ui/js/src/kimchi.grid.js | 6 ++++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ui/css/theme-default/grid.css b/ui/css/theme-default/grid.css index 958bdb0..44ae614 100644 --- a/ui/css/theme-default/grid.css +++ b/ui/css/theme-default/grid.css @@ -214,27 +214,28 @@ } .grid-mask { + background: rgba(190, 190, 190, .9); bottom: 0; left: 0; position: absolute; right: 0; - top: 48px; + z-index: 5; } .grid-loading { bottom: 0; - height: 100%; + height: 68px; left: 0; margin: auto; + position: absolute; right: 0; text-align: center; top: 0; - width: 100%; + width: 49px; } .grid-loading-icon { background: url("../images/theme-default/kimchi-loading.gif") no-repeat left top; - height: 100%; - width: 100%; - background-position: center; + height: 48px; + width: 49px; } diff --git a/ui/js/src/kimchi.grid.js b/ui/js/src/kimchi.grid.js index e5892ff..540f1ba 100644 --- a/ui/js/src/kimchi.grid.js +++ b/ui/js/src/kimchi.grid.js @@ -57,7 +57,9 @@ kimchi.widget.Grid = function(params) { '<div class="grid-mask hidden">', '<div class="grid-loading">', '<div class="grid-loading-icon"></div>', - '<div class="grid-loading-text"></div>', + '<div class="grid-loading-text">', + i18n['KCHGRD6001M'], + '</div>', '</div>', '</div>', '</div>' @@ -157,7 +159,7 @@ kimchi.widget.Grid = function(params) { gridContentNode.css('top', (captionHeight + toolbarHeight) + 'px'); var maskNode = $('.grid-mask', gridNode); - maskNode.css('top', (captionHeight + toolbarHeight) + 'px'); + maskNode.css('top', captionHeight + 'px'); var fillBody = function(container, fields, data) { var tbody = ($('tbody', container).length && $('tbody', container)) -- 1.8.1.4

3 2

[PATCH] [UI] Fix Bug - Text Overlapped in Template Add Window
by Hongliang Wang 18 Mar '14

18 Mar '14

Aline found the bug which is caused by commit 23b5850. Fix it in this patch. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/window.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ui/css/theme-default/window.css b/ui/css/theme-default/window.css index 3d6d563..22e6327 100644 --- a/ui/css/theme-default/window.css +++ b/ui/css/theme-default/window.css @@ -49,7 +49,8 @@ max-height: 100%; } -.window header { +.window>header, +.window>form>header { position: absolute; left: 0; right: 0; @@ -99,12 +100,14 @@ cursor: pointer; } -.window header>.close:HOVER { +.window>header>.close:HOVER, +.window>form>header>.close:HOVER { border: 2px solid #444; color: #444; } -.window header>.title { +.window>header>.title, +.window>form>header>.title { font-size: 18px; height: 48px; line-height: 48px; -- 1.8.1.4

4 3

[PATCH] Fix multiple pep8
by lvroyce＠linux.vnet.ibm.com 18 Mar '14

18 Mar '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Make check fails with pep8 version 1.3.3. Fix files revolve to comply with pep8. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/auth.py | 2 +- src/kimchi/model/networks.py | 2 +- src/kimchi/osinfo.py | 2 +- src/kimchi/root.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/kimchi/auth.py b/src/kimchi/auth.py index b042d73..501afb2 100644 --- a/src/kimchi/auth.py +++ b/src/kimchi/auth.py @@ -136,7 +136,7 @@ def check_auth_session(): kimchiRobot = cherrypy.request.headers.get('Kimchi-Robot') if kimchiRobot == "kimchi-robot": if (time.time() - cherrypy.session[REFRESH] > - cherrypy.session.timeout * 60): + cherrypy.session.timeout * 60): cherrypy.session[USER_ID] = None cherrypy.lib.sessions.expire() raise cherrypy.HTTPError(401) diff --git a/src/kimchi/model/networks.py b/src/kimchi/model/networks.py index 0242156..b7096e5 100644 --- a/src/kimchi/model/networks.py +++ b/src/kimchi/model/networks.py @@ -64,7 +64,7 @@ class NetworksModel(object): # FIXME we can not distinguish this error from other internal # error by error code. if ("network is already in use by interface" - in e.message.lower()): + in e.message.lower()): # libvirt do not support update IP element, so delete the # the network and create new one. net.undefine() diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 02dbabf..c5f889b 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -113,7 +113,7 @@ def lookup(distro, version): if distro in modern_version_bases[arch]: if LooseVersion(version) >= LooseVersion( - modern_version_bases[arch][distro]): + modern_version_bases[arch][distro]): params.update(template_specs[arch]['modern']) else: params.update(template_specs[arch]['old']) diff --git a/src/kimchi/root.py b/src/kimchi/root.py index 5bad9b4..9bae34a 100644 --- a/src/kimchi/root.py +++ b/src/kimchi/root.py @@ -51,7 +51,7 @@ class Root(Resource): data = {'code': status, 'reason': message} res = template.render('error.html', data) if (type(res) is unicode and - LooseVersion(cherrypy.__version__) < LooseVersion('3.2.5')): + LooseVersion(cherrypy.__version__) < LooseVersion('3.2.5')): res = res.encode("utf-8") return res @@ -60,7 +60,7 @@ class Root(Resource): 'call_stack': cherrypy._cperror.format_exc()} res = template.render('error.html', data) if (type(res) is unicode and - LooseVersion(cherrypy.__version__) < LooseVersion('3.2.5')): + LooseVersion(cherrypy.__version__) < LooseVersion('3.2.5')): res = res.encode("utf-8") return res -- 1.8.1.2

3 2

[PATCH] Skip 'screendump' for vms no video device configured
by Mark Wu 18 Mar '14

18 Mar '14

It's observed that if a vm is created by external tool and doesn't have video device, libivrt will keep reporting the following error message: "internal error: unable to execute QEMU command 'screendump': There is no QemuConsole I can screendump from." This patch skips screendump for that kinds of vms to avoid the error message and repeately sending the black images. On UI side, it changes to display vm's icon instead of the black image if it doesn't have video device. Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- src/kimchi/model/vms.py | 6 +++++- ui/js/src/kimchi.guest_main.js | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index 3b8a666..79b335c 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -275,6 +275,10 @@ class VMModel(object): def _live_vm_update(self, dom, params): pass + def _has_video(self, dom): + dom = ElementTree.fromstring(dom.XMLDesc(0)) + return dom.find('devices/video') is not None + def lookup(self, name): dom = self.get_vm(name, self.conn) info = dom.info() @@ -284,7 +288,7 @@ class VMModel(object): graphics_type, graphics_listen, graphics_port = graphics graphics_port = graphics_port if state == 'running' else None try: - if state == 'running': + if state == 'running' and self._has_video(dom): screenshot = self.vmscreenshot.lookup(name) elif state == 'shutoff': # reset vm stats when it is powered off to avoid sending diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index bdd5a69..8a20d07 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -186,7 +186,7 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { guestTitle.html(vmObject.name); //Setup the VM console thumbnail display - var curImg = vmObject.state == 'running' ? vmObject.screenshot : vmObject.icon; + var curImg = vmObject.screenshot || vmObject.icon; var load_src = curImg || 'images/icon-vm.png'; var tile_src = prevScreenImage || vmObject['load-src']; var liveTile=result.find('div[name=guest-tile] > .tile'); -- 1.8.4.2

3 2