June 2015 - Kimchi-devel - oVirt List Archives

RFC - Guest memory usage
by Daniel Henrique Barboza 27 Oct '15

27 Oct '15

I was looking at the following item in the backlog: Guests Stats: Display memory utilization (use virt-df or virt-top or ...) If I understood it right, the idea here is to show the -inner- memory allocation of the guest. If you have a VM with 4Gb of RAM running an Ubuntu, we want to know how much memory the Ubuntu OS and its processes are using. I've done an investigation and I haven't found any tool to accomplish this. "virt-top", "virsh dommemstat" and the libvirt API retrieves the information of the memory usage of the guest relative to the host. In the example mentioned before, supposing that the host has 64Gb of RAM, all these tools would show that the VM is using 12% of the host RAM. They do not dive in the VM and shows the actual mem usage of the Ubuntu and its processes running there. Haven't found anything useful in other MLs and forums. The common answer is 'run top in a terminal inside the VM', which of course does not suit us. My question is: any thoughts about how we can implement this feature? Because I am starting to think that, in the end, this kind of info is strict to the guest OS and can't be polled from the outside. Thanks!

5 5

[PATCH 0/4] Improve VM CPU update code
by Crístian Deives 08 Sep '15

08 Sep '15

This patchset refactors part of the code related to updating VM CPUs. I am aware of two tests which are failing with this patchset. They'll be worked on before the final version. Crístian Deives (4): Use locks to prevent concurrent updates to VMs Update VCPU by using libvirt function Set max VCPU count to the max supported value Check if the VM update params are valid for the current state src/kimchi/i18n.py | 3 ++- src/kimchi/mockmodel.py | 48 ++++++++++++++------------------------ src/kimchi/model/vms.py | 62 ++++++++++++++++++++++++++++++++++++++----------- tests/test_rest.py | 3 ++- 4 files changed, 71 insertions(+), 45 deletions(-) -- 2.4.3

3 6

New branches upstream
by Aline Manera 03 Jul '15

03 Jul '15

Hi all, As we decided for a stabilization release after 1.5, I will create a new branch named 'next' to apply the patches not related to bug fixes. Once we get 1.5.1 released, the 'next' branch will be merged into 'master' I will also create the 'wok' branch to handle the wok framework and the new UI development. I want to use the 1.5.1 time frame to test as much as we can the wok framework and the new UI we can release all that right after 1.5.1 Summary: - master: current release development - next <https://github.com/kimchi-project/kimchi/tree/next>: new features - wok <https://github.com/kimchi-project/kimchi/tree/wok>: disruptive features (wok framework + new UI) The current 'wok' branch is a copy of the master branch. I am working with Lucio to get the new UI patches merged with the 'wok' patches so we can update the upstream branch accordingly. Regards, Aline Manera

1 1

[PATCH 2/2] Review changes for Kimchi
by Kersten 03 Jul '15

03 Jul '15

Made changes to 3 files per comments from Aline. Signed-off-by: Kersten <kersten(a)us.ibm.com> --- ui/pages/help/en_US/guests.dita | 30 +++++++++++++++--------------- ui/pages/help/en_US/storage.dita | 8 ++++---- ui/pages/help/en_US/templates.dita | 15 +++++++++------ 3 files changed, 28 insertions(+), 25 deletions(-) diff --git a/ui/pages/help/en_US/guests.dita b/ui/pages/help/en_US/guests.dita index 7d0d453..45cf7da 100644 --- a/ui/pages/help/en_US/guests.dita +++ b/ui/pages/help/en_US/guests.dita @@ -10,14 +10,14 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/--> <cshelp id="kimhvirtm" xml:lang="en-us"> <title>Guests</title> <shortdesc>The <wintitle>Guests</wintitle> page lists the defined -guests or virtual machines.</shortdesc> +guests for your server.</shortdesc> <csbody> For each guest, the following information is displayed:<dl><dlentry> <dt>Name</dt> -<dd>Name of the virtual machine.</dd> +<dd>Name of the guest.</dd> </dlentry><dlentry> <dt>CPU</dt> -<dd>Percentage of processor utilization in the virtual machine.</dd> +<dd>Percentage of processor utilization in the guest.</dd> </dlentry><dlentry> <dt>Disk I/O</dt> <dd>Disk input/output transmission rate in KB per seconds.</dd> @@ -53,16 +53,16 @@ existing guest. Guests can be edited only while stopped.</li> <li>Select <uicontrol>Power Off</uicontrol> to force an immediate shut down of the guest.</li> <li>Select <uicontrol>Delete</uicontrol> to delete the guest.</li> -</ul>To create a guest, or virtual machine, click the <uicontrol>plus -(+)</uicontrol> icon on the page. +</ul>To create a guest, click the <uicontrol>plus (+)</uicontrol> icon +on the page. </csbody> <cshelp id="kimhvirtmcrt" xml:lang="en-us"> -<title>Create a guest (virtual machine)</title> +<title>Create a guest</title> <shortdesc>Create a guest by using an existing template.</shortdesc> <csbody> <ol> -<li>Type the name to be used to identify the virtual machine.</li> -<li rev="rev1">Select a template. <ul> +<li>Type the name to be used to identify the guest.</li> +<li>Select a template. <ul> <li>If templates exist, select from displayed templates.</li> <li>If no templates exist, click <uicontrol>Create a template</uicontrol> to create a template.</li> @@ -73,9 +73,9 @@ create a template.</li> </cshelp> <cshelp id="kimhvirtmedit" xml:lang="en-us"> <title>Edit guest</title> -<shortdesc>Edit the properties of an existing virtual machine. Some -properties can be edited only while guest is stopped. Others will -take effect in next boot.</shortdesc> +<shortdesc>Edit the properties of an existing guest. Some properties +can be edited only while guest is stopped. Others will take effect +in next boot.</shortdesc> <csbody> <dl><dlentry> <dt>General</dt> @@ -124,11 +124,11 @@ guest.</li> iSCSI volumes or if the target pool does not have enough space, the clone will be created on a default storage pool. </note></li> </ol> -A guest appears in your list with the label "cloning..." When the -process is complete, the cloned guest is available to use.<?Pub -Caret 54?> +A guest appears in your list with the label <uicontrol>Cloning...</uicontrol> When +the process is complete, the cloned guest is available to use.<?Pub +Caret 45?> </csbody> </cshelp> <?tm 1391540919 3?> </cshelp> -<?Pub *0000005359?> +<?Pub *0000005287?> diff --git a/ui/pages/help/en_US/storage.dita b/ui/pages/help/en_US/storage.dita index e6f995d..53d1404 100644 --- a/ui/pages/help/en_US/storage.dita +++ b/ui/pages/help/en_US/storage.dita @@ -94,16 +94,16 @@ pool is created, it will be created for you.</li> </cshelp> <cshelp id="kimhdefstor" xml:lang="en-us"> <title>Add volume</title> -<shortdesc>Adds volume to a storage pool.</shortdesc><?Pub Caret 0?> +<shortdesc>Adds volume to a storage pool.</shortdesc> <csbody> <dl><dlentry> <dt>Fetch from remote URL</dt> -<dd>Specifies a location to upload the volume from. For example: <filepath>https://my-server/fedora22.img</filepath>.</dd> +<dd>Specifies a location to download the volume from. For example: <filepath>https://my-server/fedora22.img</filepath>.</dd> </dlentry><dlentry> <dt>Upload a file</dt> <dd>Specifies a location on your local system.</dd> -</dlentry></dl> +</dlentry></dl><?Pub Caret 57?> </csbody> </cshelp> </cshelp> -<?Pub *0000004413?> +<?Pub *0000004416?> diff --git a/ui/pages/help/en_US/templates.dita b/ui/pages/help/en_US/templates.dita index 1c03016..ad3747c 100644 --- a/ui/pages/help/en_US/templates.dita +++ b/ui/pages/help/en_US/templates.dita @@ -55,7 +55,7 @@ You can select multiple networks.</dd> <dd>In the <uicontrol>CPU Number</uicontrol> field, specify the number of processors that are defined for the template.</dd> <dd>Select to Manually set CPU topology for each guest.</dd> -</dlentry></dl><?Pub Caret 322?> +</dlentry></dl> </csbody> </cshelp> <cshelp id="kimhaddtempl"> @@ -69,16 +69,19 @@ ISO image to 'ISO' storage pool for following discovery.</shortdesc> <dd>Select to scan storage pools for installation ISO images available on the system.</dd> </dlentry><dlentry> +<dt>Local Image File</dt> +<dd>Select to specify a path to the local image file.</dd> +</dlentry><dlentry> <dt>Remote ISO image</dt> <dd>Select to specify a remote location for an installation ISO image.</dd> </dlentry></dl> </csbody> </cshelp> <cshelp id="kimhaddloct"> -<title>Add template - local ISO image</title> -<shortdesc>Add a template from a local ISO image.</shortdesc> +<title>Add template - ISO image</title> +<shortdesc>Add a template from a ISO image.</shortdesc> <csbody> -The ISO images available on the system are displayed. +The ISO images available on the system ore remotely are displayed. <dl><dlentry> <dt>OS</dt> <dd>Name of the operating system or distribution.</dd> @@ -105,7 +108,7 @@ specify a path to the ISO image.</li> ISO images.</li> </ul></li> </ul> -</csbody> +</csbody><?Pub Caret -2?> </cshelp> </cshelp> -<?Pub *0000004089?> +<?Pub *0000004194?> -- 1.9.5.msysgit.1

2 2

[PATCH] Help updates for Kimchi
by Kersten 03 Jul '15

03 Jul '15

From: Kersten Richter <kersten(a)us.ibm.com> includes all of the dita files for kimchi. cleaned up coding a bit and simplified help. Also added new tasks and information (storage volume shutdown versus power off. Signed-off-by: unknown <kersten(a)ADMINIB-EI291RC.rchland.ibm.com> --- ui/pages/help/en_US/guests.dita | 124 ++++++++++++++++++------------------- ui/pages/help/en_US/host.dita | 22 +++---- ui/pages/help/en_US/network.dita | 7 +-- ui/pages/help/en_US/storage.dita | 50 +++++++++------ ui/pages/help/en_US/templates.dita | 86 +++++++++++-------------- 5 files changed, 141 insertions(+), 148 deletions(-) diff --git a/ui/pages/help/en_US/guests.dita b/ui/pages/help/en_US/guests.dita index 1bb437a..7d0d453 100644 --- a/ui/pages/help/en_US/guests.dita +++ b/ui/pages/help/en_US/guests.dita @@ -10,7 +10,7 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/--> <cshelp id="kimhvirtm" xml:lang="en-us"> <title>Guests</title> <shortdesc>The <wintitle>Guests</wintitle> page lists the defined -KVM virtual machines.</shortdesc> +guests or virtual machines.</shortdesc> <csbody> For each guest, the following information is displayed:<dl><dlentry> <dt>Name</dt> @@ -19,12 +19,12 @@ KVM virtual machines.</shortdesc> <dt>CPU</dt> <dd>Percentage of processor utilization in the virtual machine.</dd> </dlentry><dlentry> -<dt>Network I/O</dt> -<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> </dlentry><dlentry> +<dt>Network I/O</dt> +<dd>Network input/output transmission rate in KB per seconds.</dd> +</dlentry><dlentry> <dt>Livetile</dt> <dd>State of guest operating system console, or an icon that represents the <tm tmtype="tm" trademark="Linux">Linux</tm> distribution if the @@ -42,18 +42,23 @@ the power is off; if the icon is green, the power is on.</dd> The following actions can be selected for each guest:<ul> <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>Clone</uicontrol> to copy an existing guest +definition to create a guest.</li> +<li>Select <uicontrol>Reset</uicontrol> to reset the guest. You can +only reset a guest that is started.</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>Start</uicontrol> to start a guest</li> +<li>Select <uicontrol>Shut Down</uicontrol> to shut down a guest gracefully.</li> +<li>Select <uicontrol>Power Off</uicontrol> to force an immediate +shut down of the guest.</li> <li>Select <uicontrol>Delete</uicontrol> to delete the guest.</li> </ul>To create a guest, or virtual machine, click the <uicontrol>plus -(+)</uicontrol> icon in the upper right of the page. +(+)</uicontrol> icon on the page. </csbody> <cshelp id="kimhvirtmcrt" xml:lang="en-us"> -<title>Create virtual machine</title> -<shortdesc>Create a virtual machine by using an existing template.</shortdesc> +<title>Create a guest (virtual machine)</title> +<shortdesc>Create a guest by using an existing template.</shortdesc> <csbody> <ol> <li>Type the name to be used to identify the virtual machine.</li> @@ -61,76 +66,69 @@ existing guest. Guests can be edited only while stopped.</li> <li>If templates exist, select from displayed templates.</li> <li>If no templates exist, click <uicontrol>Create a template</uicontrol> to create a template.</li> -</ul></li> +</ul>You can view information about a template by hovering over it.</li> <li>Click <uicontrol>Create</uicontrol>.</li> </ol> </csbody> </cshelp> <cshelp id="kimhvirtmedit" xml:lang="en-us"> <title>Edit guest</title> -<shortdesc>Edit the properties of an existing virtual machine. Some properties -can be edited only while guest is stopped. Others will take effect in next boot.</shortdesc> -<csprolog><csmetadata></csmetadata></csprolog> +<shortdesc>Edit the properties of an existing virtual machine. Some +properties can be edited only while guest is stopped. Others will +take effect in next boot.</shortdesc> <csbody> -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. (can only be edited while guest is stopped)</dd> -</dlentry><dlentry> -<dt>CPUs</dt> -<dd>Number of processors. (if guest is running, new amount will take effect -in next boot)</dd> -</dlentry><dlentry> -<dt>Memory</dt> -<dd>Amount of memory in MB. (if guest is running, new amount will take effect -in next boot)</dd> -</dlentry><dlentry> -<dt>Icon</dt> -<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> -The following information is displayed on the <wintitle>Storage</wintitle> tab. <dl><dlentry> +<dt>General</dt> +<dd>Displays information about your guest, including name, CPUs, memory, +and icon to use for your guest. You can edit the name of a stopped +guest. Changing the CPUs and memory takes effect after the next boot.</dd> +</dlentry><dlentry> <dt>Storage</dt> -<dd>Displays the location of the ISO file used for installation.</dd> -</dlentry></dl><?Pub Caret -2?> +<dd>Displays the device and path for storage for the selected guest. +You can add, edit, and remove storage devices for your guest.</dd> +</dlentry></dl> +<dl><dlentry> +<dt>Interface</dt> +<dd>Displays network information for the guest, including name, type, +and MAC address. You can add, edit, and remove interfaces for your +guest.</dd> +</dlentry></dl> +<dl><dlentry> +<dt>Permission</dt> +<dd>Displays the users and groups that are authorized for the guest. </dd> +</dlentry></dl> +<dl><dlentry> +<dt>Host PCI Device</dt> +<dd>Displays a list of all PCI devices available on the host. </dd> +</dlentry></dl> +<dl><dlentry> +<dt>Snapshot</dt> +<dd>Displays snapshots of the guest. You can create, edit, or delete +a snapshot. By selecting a snapshot and selecting revert, the guest +is restored to a point in the past, determined by the snapshot data, +and discards any changes made beyond that point in time.</dd> +</dlentry></dl> Fields that are not disabled can be edited. After you edit a field, click <uicontrol>Save</uicontrol>. </csbody> </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> +<cshelp id="kimhvirtmclone" xml:lang="en-us"> +<title>Cloning a guest</title> +<shortdesc>Cloning a guests allows you to create a copy of a guest.</shortdesc> <csbody> +To clone a guest: <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> +<li>Select <uicontrol>Clone</uicontrol> from the Action menu of a +guest.</li> +<li>Accept the warning. <note>When a target guest is using SCSI or +iSCSI volumes or if the target pool does not have enough space, the +clone will be created on a default storage pool. </note></li> </ol> +A guest appears in your list with the label "cloning..." When the +process is complete, the cloned guest is available to use.<?Pub +Caret 54?> </csbody> </cshelp> <?tm 1391540919 3?> </cshelp> -<?Pub *0000005541?> +<?Pub *0000005359?> diff --git a/ui/pages/help/en_US/host.dita b/ui/pages/help/en_US/host.dita index 0dcb670..4af3498 100644 --- a/ui/pages/help/en_US/host.dita +++ b/ui/pages/help/en_US/host.dita @@ -20,18 +20,16 @@ system.</li> <li>Select <uicontrol>Connect</uicontrol> to open a VNC connection to the host system, if it is not already connected.</li> </ul> -Click the following sections to display information about the host:<dl> -<dlentry> +Click the following sections to display information about the host: +<dl><dlentry> <dt>Basic information</dt> <dd>This section displays the host operating system distribution, -version, and code name, as well as the processor type, the number of -online CPUs and amount of memory in GB.</dd> +version, and code name, as well as the processor type, the number +of online CPUs and amount of memory in GB.</dd> </dlentry><dlentry> <dt>System statistics</dt> <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> +disk I/O, and network I/O for the host. </dd> </dlentry><dlentry> <dt>Software Updates</dt> <dd>This section displays information for all of the packages that @@ -49,8 +47,8 @@ If your system is Ubuntu or Debian, then add <filepath>deb</filepath> repositori you are working with yum repositories, you can add a GPG check to verify that a package from this repository have not been corrupted. Select a repository and then <uicontrol>Edit</uicontrol>. Select <uicontrol>Yes</uicontrol> to -enable GPG Check and then enter a URL to the GPG key file for the -repository.<?Pub Caret 156?></dd> +enable <uicontrol>GPG Check</uicontrol> and then enter a URL to the +GPG key file for the repository.</dd> </dlentry><dlentry> <dt>Debug reports</dt> <dd>This section displays debug reports, including name and file path. @@ -63,8 +61,8 @@ 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. </dd> -</dlentry></dl> -</csbody> +</dlentry></dl> +</csbody><?Pub Caret -1?> <?tm 1392659967 1?> </cshelp> -<?Pub *0000003492?> +<?Pub *0000003410?> diff --git a/ui/pages/help/en_US/network.dita b/ui/pages/help/en_US/network.dita index 25c05ff..9f67070 100644 --- a/ui/pages/help/en_US/network.dita +++ b/ui/pages/help/en_US/network.dita @@ -35,8 +35,7 @@ connection.</li> <li>Select <uicontrol>Stop</uicontrol> to end the network connection.</li> <li>Select <uicontrol>Delete</uicontrol> to delete the connection information.</li> -</ul>To create a network, click the <uicontrol>plus (+)</uicontrol> icon -in the upper right of the display. +</ul>To create a network, click the <uicontrol>plus (+)</uicontrol> icon. </csbody> <cshelp id="kimhnetwcrt" xml:lang="en-us"> <title>Create a network</title> @@ -59,10 +58,10 @@ initiate communication to guests.</dd> be contacted by external systems as if they were physical systems on the network. For bridged mode, you must specify additional destination and VLAN information.</dd> -</dlentry></dl><?Pub Caret 224?></li> +</dlentry></dl></li><?Pub Caret -2?> <li>Click <uicontrol>Create</uicontrol>.</li> </ol> </csbody> </cshelp> </cshelp> -<?Pub *0000002571?> +<?Pub *0000002536?> diff --git a/ui/pages/help/en_US/storage.dita b/ui/pages/help/en_US/storage.dita index d9a32f9..e6f995d 100644 --- a/ui/pages/help/en_US/storage.dita +++ b/ui/pages/help/en_US/storage.dita @@ -10,13 +10,17 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/--> <cshelp id="kimhstor" xml:lang="en-us"> <title>Storage</title> <shortdesc>The <wintitle>Storage</wintitle> page lists the available -storage pools, including the out of box 'default' and 'ISO' storage pool. -If you want to use your own ISO, please add it to 'ISO' storage pool path.</shortdesc> +storage pools, including the out of box 'default' and 'ISO' storage +pool. If you want to use your own ISO, please add it to 'ISO' storage +pool path.</shortdesc> <csbody> For each storage pool, the following information is displayed:<dl> <dlentry> <dt>Name</dt> -<dd>Name of the storage pool and percentage used.</dd> +<dd>Name of the storage pool.</dd> +</dlentry><dlentry> +<dt>% Used</dt> +<dd>Percentage of the storage pool that is being used.</dd> </dlentry><dlentry> <dt>State</dt> <dd>State of the storage pool, active (green) or inactive (red). </dd> @@ -38,25 +42,14 @@ If you want to use your own ISO, please add it to 'ISO' storage pool path.</shor pool so that it can be used.</li> <li>Select <uicontrol>Deactivate</uicontrol> to deactivate an active storage pool.</li> +<li>Select <uicontrol>Add Volume</uicontrol> to add more volume to +an active storage pool.</li> <li>Select <uicontrol>Undefine</uicontrol> to remove an inactive storage pool.</li> </ul> To display storage volume details for a storage pool, click the -arrow on the right side of the storage pool row. Details include -the following:<dl><dlentry> -<dt>Type</dt> -<dd>The type of volume, for example, <uicontrol>file</uicontrol>.</dd> -</dlentry><dlentry> -<dt>Format</dt> -<dd>The format, varying dependent on the type.</dd> -</dlentry><dlentry> -<dt>Capacity</dt> -<dd>Size of the storage volume.</dd> -</dlentry><dlentry> -<dt>Allocation</dt> -<dd>Amount of space that is already allocated in the storage pool.</dd> -</dlentry></dl>To define a storage pool, click the <uicontrol>plus -(+)</uicontrol> icon in the upper right of the display. +arrow on the right side of the storage pool row. To define a storage +pool, click the <uicontrol>plus (+)</uicontrol> icon. </csbody> <cshelp id="kimhdefstor" xml:lang="en-us"> <title>Define a storage pool</title> @@ -90,10 +83,27 @@ the device in <uicontrol>Device path</uicontrol>.</dd> <dt><uicontrol>SCSI Fibre Channel</uicontrol></dt> <dd>Specifies a pool based on an SCSI Fibre Channel. Select which SCSI adapter to use.</dd> -</dlentry></dl><?Pub Caret 0?></li> +</dlentry></dl></li> +<li>Specify a storage path for the storage pool. The storage path +is the location in the local file system that the pool is mapped to. +The path must be unique. If the directory does not exist when the +pool is created, it will be created for you.</li> <li>Click <uicontrol>Create</uicontrol>.</li> </ol> </csbody> </cshelp> +<cshelp id="kimhdefstor" xml:lang="en-us"> +<title>Add volume</title> +<shortdesc>Adds volume to a storage pool.</shortdesc><?Pub Caret 0?> +<csbody> +<dl><dlentry> +<dt>Fetch from remote URL</dt> +<dd>Specifies a location to upload the volume from. For example: <filepath>https://my-server/fedora22.img</filepath>.</dd> +</dlentry><dlentry> +<dt>Upload a file</dt> +<dd>Specifies a location on your local system.</dd> +</dlentry></dl> +</csbody> +</cshelp> </cshelp> -<?Pub *0000003914?> +<?Pub *0000004413?> diff --git a/ui/pages/help/en_US/templates.dita b/ui/pages/help/en_US/templates.dita index 57ee9b5..1c03016 100644 --- a/ui/pages/help/en_US/templates.dita +++ b/ui/pages/help/en_US/templates.dita @@ -12,8 +12,8 @@ https://w3.opensource.ibm.com/projects/dita-cshelp/--> <shortdesc>The <wintitle>Templates</wintitle> page shows the defined virtual machine templates that can be used to create KVM guests.</shortdesc> <csbody> -For each template, the following information is displayed:<dl> -<dlentry> +For each template, the following information is displayed: +<dl><dlentry> <dt>OS</dt> <dd>Name of the operating system or distribution.</dd> </dlentry><dlentry> @@ -25,74 +25,61 @@ virtual machine templates that can be used to create KVM guests.</shortdesc> </dlentry><dlentry> <dt>Memory</dt> <dd>Amount of random access memory to be allocated, in MB.</dd> -</dlentry></dl> -The following actions can be selected for each template:<ul> +</dlentry></dl> +The following actions can be selected for each template: +<ul> <li>Select <uicontrol>Edit</uicontrol> to edit the template.</li> +<li>Select <uicontrol>Clone</uicontrol> to copy a template.</li> <li>Select <uicontrol>Delete</uicontrol> to delete the template.</li> -</ul>To add a template, click the <uicontrol>plus (+)</uicontrol> icon -in the upper right of the display. +</ul> +To add a template, click the <uicontrol>plus (+)</uicontrol> icon. </csbody> <cshelp id="kimhedittempl" xml:lang="en-us"> <title>Edit template</title> <shortdesc>Edit an existing template.</shortdesc> <csbody> -For each template, the following information is displayed: <dl> -<dlentry> -<dt>Name</dt> -<dd>Name of the template.</dd> +For each template, the following information is displayed: +<dl><dlentry> +<dt>General</dt> +<dd>Displays the name, vendor distribution, version, memory, file +path to ISO file, and graphics preferences.</dd> </dlentry><dlentry> -<dt>Vendor</dt> -<dd>The name of the company that created the operating system or distribution -that the template is configured to use.</dd> +<dt>Storage</dt> +<dd>Specify the storage pool information for the template.</dd> </dlentry><dlentry> -<dt>Version</dt> -<dd>The version of the operating system or distribution that the template -is configured to use.</dd> -</dlentry><dlentry> -<dt>CPU number</dt> -<dd>Number of processors that are defined for the template.</dd> -</dlentry><dlentry> -<dt>Memory</dt> -<dd>Amount of memory in MB to be allocated to the virtual machine.</dd> -</dlentry><dlentry> -<dt>Disk</dt> -<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 -KVM guest.</dd> -</dlentry><dlentry> -<dt>Storage pool</dt> -<dd>Specific storage pool or the default storage pool.</dd> +<dt>Interface</dt> +<dd>Displays the default network interfaces available to the KVM guest. +You can select multiple networks.</dd> </dlentry><dlentry> -<dt>Network</dt> -<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>. +<dt>Processor</dt> +<dd>In the <uicontrol>CPU Number</uicontrol> field, specify the number +of processors that are defined for the template.</dd> +<dd>Select to Manually set CPU topology for each guest.</dd> +</dlentry></dl><?Pub Caret 322?> </csbody> </cshelp> <cshelp id="kimhaddtempl"> <title>Add template</title> -<shortdesc>Add a template from source media. -You can add your own ISO image to 'ISO' storage pool for following discovery.</shortdesc> +<shortdesc>Add a template from source media. You can add your own +ISO image to 'ISO' storage pool for following discovery.</shortdesc> <csbody> -Select the location of the source media from the following options:<dl> -<dlentry> +Select the location of the source media from the following options: +<dl><dlentry> <dt>Local ISO image</dt> <dd>Select to scan storage pools for installation ISO images available on the system.</dd> </dlentry><dlentry> <dt>Remote ISO image</dt> <dd>Select to specify a remote location for an installation ISO image.</dd> -</dlentry></dl> +</dlentry></dl> </csbody> </cshelp> <cshelp id="kimhaddloct"> <title>Add template - local ISO image</title> <shortdesc>Add a template from a local ISO image.</shortdesc> <csbody> -The ISO images available on the system are displayed.<dl><dlentry> +The ISO images available on the system are displayed. +<dl><dlentry> <dt>OS</dt> <dd>Name of the operating system or distribution.</dd> </dlentry><dlentry> @@ -101,13 +88,14 @@ on the system.</dd> </dlentry><dlentry> <dt>Size</dt> <dd>Size of the ISO image.</dd> -</dlentry></dl> +</dlentry></dl> To create a template from an ISO image, choose from the following -options:<ul> +options: +<ul> <li>Select an ISO image from which to create a template, then click <uicontrol>Create 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 +listed ISO image, then click <uicontrol>Create Templates from Selected ISO</uicontrol>.</li> <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> @@ -115,9 +103,9 @@ results, you can select from the following options:<ul> specify a path to the ISO image.</li> <li>Click <uicontrol>Search more ISOs</uicontrol> to search for more ISO images.</li> -</ul></li><?Pub Caret 0?> -</ul> +</ul></li> +</ul> </csbody> </cshelp> </cshelp> -<?Pub *0000004433?> +<?Pub *0000004089?> -- 1.9.5.msysgit.1

2 2

[PATCH] Kimchi Problems with psutils 3.0.1
by stephan.conrad＠gmail.com 30 Jun '15

30 Jun '15

From: Stephan Conrad <stephan.conrad(a)gmail.com> Hi, psutils 3.0.1 has removed some depricated functions and vaiables. I made a Patch that kimchi can run with this version of psutil. Regards Stephan Stephan Conrad (1): Patched kimchi for psutils 3.0.1 src/kimchi/model/host.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.4.4

2 2

[PATCH] Make Kimchi show arch linux version and add support for pacman
by stephan.conrad＠gmail.com 30 Jun '15

30 Jun '15

From: Stephan Conrad <stephan.conrad(a)gmail.com> I made a patch witch add the support for software updates via pacman and to show that kimchi is running under Arch Linux Stephan Conrad (1): Make Kimchi show arch linux version and add support for pacman src/kimchi/model/host.py | 2 +- src/kimchi/swupdate.py | 76 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 75 insertions(+), 3 deletions(-) -- 2.4.3

2 2

[PATCH] Make Kimchi show arch linux version and add support for pacman
by stephan.conrad＠gmail.com 30 Jun '15

30 Jun '15

From: Stephan Conrad <stephan.conrad(a)gmail.com> I made a patch witch add the support for software updates via pacman and to show that kimchi is running under Arch Linux Stephan Conrad (1): Make Kimchi show arch linux version and add support for pacman src/kimchi/model/host.py | 2 +- src/kimchi/swupdate.py | 76 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 75 insertions(+), 3 deletions(-) -- 2.4.3

2 2

[PATCH v2] List IPs of VM Ifaces
by Christy Perez 30 Jun '15

30 Jun '15

v2: - Check VM's state for shutoff, and return empty list of IPs if so. - RestTests: Start VM before checking for an IP in the list returned. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- docs/API.md | 1 + src/kimchi/mockmodel.py | 9 +++++++++ src/kimchi/model/vmifaces.py | 35 +++++++++++++++++++++++++++++++++++ tests/test_rest.py | 16 ++++++++++++++++ 4 files changed, 61 insertions(+) diff --git a/docs/API.md b/docs/API.md index e022c9e..10e80ac 100644 --- a/docs/API.md +++ b/docs/API.md @@ -299,6 +299,7 @@ A interface represents available network interface on VM. * bridge *(optional)*: the name of resource bridge, only be available when the interface type is bridge. * mac: Media Access Control Address of the VM interface. + * ips: A list of IP addresses associated with this MAC. * model *(optional)*: model of emulated network interface card. It will be one of these models: ne2k_pci, i82551, i82557b, i82559er, rtl8139, e1000, pcnet and virtio. * network *(optional)*: the name of resource network, only be available when the diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index aaf1af2..3f74b80 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -24,6 +24,7 @@ import random import time import kimchi.model.cpuinfo +import kimchi.model.vmifaces from lxml import objectify from lxml.builder import E @@ -76,6 +77,7 @@ class MockModel(Model): kimchi.model.cpuinfo.get_topo_capabilities = \ MockModel.get_topo_capabilities + kimchi.model.vmifaces.getDHCPLeases = MockModel.getDHCPLeases libvirt.virConnect.defineXML = MockModel.domainDefineXML libvirt.virDomain.XMLDesc = MockModel.domainXMLDesc libvirt.virDomain.undefine = MockModel.undefineDomain @@ -235,6 +237,13 @@ class MockModel(Model): pool = vol.storagePoolLookupByVolume() pool.createXML(new_xml) + @staticmethod + def getDHCPLeases(net, mac): + return [{'iface': 'virbr1', 'ipaddr': '192.168.0.167', + 'hostname': 'kimchi', 'expirytime': 1433285036L, + 'prefix': 24, 'clientid': '01:%s' % mac, + 'mac': mac, 'iaid': None, 'type': 0}] + def _probe_image(self, path): return ('unknown', 'unknown') diff --git a/src/kimchi/model/vmifaces.py b/src/kimchi/model/vmifaces.py index 93a769b..5df60fc 100644 --- a/src/kimchi/model/vmifaces.py +++ b/src/kimchi/model/vmifaces.py @@ -29,6 +29,14 @@ from kimchi.model.vms import DOM_STATE_MAP, VMModel from kimchi.xmlutils.interface import get_iface_xml +def getDHCPLeases(net, mac): + try: + leases = net.DHCPLeases(mac) + return leases + except libvirt.libvirtError: + return [] + + class VMIfacesModel(object): def __init__(self, **kargs): self.conn = kargs['conn'] @@ -132,9 +140,36 @@ class VMIfaceModel(object): info['network'] = iface.source.get('network') if info['type'] == 'bridge': info['bridge'] = iface.source.get('bridge') + info['ips'] = self._get_ips(vm, info['mac'], info['network']) return info + def _get_ips(self, vm, mac, network): + ips = [] + + # Return empty list if shutoff, even if leases still valid or ARP + # cache has entries for this MAC. + conn = self.conn.get() + dom = VMModel.get_vm(vm, self.conn) + if DOM_STATE_MAP[dom.info()[0]] == "shutoff": + return ips + + # An iface may have multiple IPs + # An IP could have been assigned without libvirt. + # First check the ARP cache. + with open('/proc/net/arp') as f: + ips = [line.split()[0] for line in f.xreadlines() if mac in line] + # Some ifaces may be inactive, so if the ARP cache didn't have them, + # and they happen to be assigned via DHCP, we can check there too. + net = conn.networkLookupByName(network) + leases = getDHCPLeases(net, mac) + for lease in leases: + ip = lease.get('ipaddr') + if ip not in ips: + ips.append(ip) + + return ips + def delete(self, vm, mac): dom = VMModel.get_vm(vm, self.conn) iface = self._get_vmiface(vm, mac) diff --git a/tests/test_rest.py b/tests/test_rest.py index c2d142f..f0e27e7 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -713,6 +713,7 @@ class RestTests(unittest.TestCase): self.assertEquals(17, len(res['mac'])) self.assertEquals(get_template_default('old', 'nic_model'), res['model']) + self.assertTrue('ips' in res) # try to attach an interface without specifying 'model' req = json.dumps({'type': 'network'}) @@ -743,6 +744,21 @@ class RestTests(unittest.TestCase): newMacAddr).read()) self.assertEquals(newMacAddr, iface['mac']) + # Start the VM + resp = self.request('/vms/test-vm/start', '{}', 'POST') + vm = json.loads(self.request('/vms/test-vm').read()) + self.assertEquals('running', vm['state']) + + # Check for an IP address + iface = json.loads(self.request('/vms/test-vm/ifaces/%s' % + newMacAddr).read()) + self.assertTrue(len(iface['ips']) > 0) + + # Force poweroff the VM + resp = self.request('/vms/test-vm/poweroff', '{}', 'POST') + vm = json.loads(self.request('/vms/test-vm').read()) + self.assertEquals('shutoff', vm['state']) + # detach network interface from vm resp = self.request('/vms/test-vm/ifaces/%s' % iface['mac'], '{}', 'DELETE') -- 2.1.0

2 4

[PATCH 0/2] Issue #670: openSUSE: problem while building Kimchi
by Ramon Medeiros 29 Jun '15

29 Jun '15

v3: Test if string is empty instead of testing directory v2: Do not use systemd macros. Copy systemd commands from fedora spec Ramon Medeiros (2): Issue #670: openSUSE: problem while building Kimchi Issue #670: openSUSE: problem while building Kimchi Makefile.am | 4 ++-- contrib/kimchi.spec.suse.in | 38 ++++++++++++++++++++++++++++++++++---- 2 files changed, 36 insertions(+), 6 deletions(-) -- 2.1.0

2 3

[PATCH v2 0/2] Issue #670: openSUSE: problem while building Kimchi
by Ramon Medeiros 29 Jun '15

29 Jun '15

Changes: v2: Do not use systemd macros. Copy systemd commands from fedora spec Ramon Medeiros (2): Issue #670: openSUSE: problem while building Kimchi Issue #670: openSUSE: problem while building Kimchi Makefile.am | 4 ++-- contrib/kimchi.spec.suse.in | 38 ++++++++++++++++++++++++++++++++++---- 2 files changed, 36 insertions(+), 6 deletions(-) -- 2.1.0

2 3

[PATCH 0/2] Issue #670: openSUSE: problem while building Kimchi
by Ramon Medeiros 29 Jun '15

29 Jun '15

Ramon Medeiros (2): Issue #670: openSUSE: problem while building Kimchi Issue #670: openSUSE: problem while building Kimchi Makefile.am | 4 ++-- contrib/kimchi.spec.suse.in | 40 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 38 insertions(+), 6 deletions(-) -- 2.1.0

2 3

Plans for next release
by Aline Manera 29 Jun '15

29 Jun '15

Hi all, As Kimchi 1.5 was released last week, now it is time to plan the next release. As we have discussed in the last scrum meeting, we will do a stabilization release, ie, Kimchi 1.5.1, to cover bug fixes and enhancements for the existing features. Kimchi 1.5.1 will be announced on Sept 25th. You can check the detailed schedule at: https://github.com/kimchi-project/kimchi/wiki/Planning-1.5.1 Regards, Aline Manera

1 1

[PATCH] Github 663: software update improvements
by dhbarboza82＠gmail.com 29 Jun '15

29 Jun '15

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> - started considering just the return code of yum check-update instead of the existence of error output - ignoring any package declared after the 'Obsoleting Packages' warning Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> --- src/kimchi/yumparser.py | 14 +++++++++++++- tests/test_yumparser.py | 5 ++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/kimchi/yumparser.py b/src/kimchi/yumparser.py index 8151f86..792c3ae 100644 --- a/src/kimchi/yumparser.py +++ b/src/kimchi/yumparser.py @@ -229,10 +229,21 @@ def _include_line_checkupdate_output(line): return True +def _ignore_obsoleting_packages_in(output): + out = '' + for l in output.split('\n'): + if 'Obsoleting ' in l: + break + out += l + '\n' + return out + + def _filter_lines_checkupdate_output(output): if output is None: return [] + output = _ignore_obsoleting_packages_in(output) + out = [l for l in output.split('\n') if _include_line_checkupdate_output(l)] return out @@ -244,7 +255,8 @@ def _get_yum_checkupdate_output(): stdout=subprocess.PIPE, stderr=subprocess.PIPE) out, error = yum_update_cmd.communicate() - if error != '': + return_code = yum_update_cmd.returncode + if return_code == 1: return None return out diff --git a/tests/test_yumparser.py b/tests/test_yumparser.py index 69f411a..53a2d80 100644 --- a/tests/test_yumparser.py +++ b/tests/test_yumparser.py @@ -154,9 +154,8 @@ class YumParserTests(unittest.TestCase): def test_yum_checkupdate_parsing(self): output = _generate_yumcheckupdate_output() packages = get_yum_packages_list_update(output) - self.assertEqual(len(packages), 5) + self.assertEqual(len(packages), 3) self.assertEqual(packages[0].ui_from_repo, 'REPOSITORY1') self.assertEqual(packages[1].version, '20150611.-no-FAKE2') self.assertEqual(packages[2].name, 'PACKAGE3.dot.dot') - self.assertEqual(packages[3].arch, 'i386') - self.assertEqual(packages[4].arch, 'fakearch') + self.assertEqual(packages[2].arch, 'i386') -- 2.4.3

3 2

[PATCH] Bug fix: Allow creating a pool using an existing path
by Aline Manera 29 Jun '15

29 Jun '15

In the newer libvirt version, virStoragePool.build() raises an error when the target path already exists. To avoid errors related to that, make sure that exception is properly handled. Also add a test case to cover this scenario. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/model/storagepools.py | 33 +++++++++++++++++++++++---------- tests/test_model_storagepool.py | 12 +++++++++++- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/src/kimchi/model/storagepools.py b/src/kimchi/model/storagepools.py index f022deb..aa075cd 100644 --- a/src/kimchi/model/storagepools.py +++ b/src/kimchi/model/storagepools.py @@ -101,9 +101,6 @@ class StoragePoolsModel(object): xml = ET.tostring(pool) try: pool = conn.storagePoolDefineXML(xml, 0) - # Add build step to make sure target directory created - pool.build(libvirt.VIR_STORAGE_POOL_BUILD_NEW) - pool.setAutostart(1) except libvirt.libvirtError, e: msg = "Fatal: Unable to create storage pool %s. " msg += error_msg @@ -111,6 +108,17 @@ class StoragePoolsModel(object): kimchi_log.error("Details: %s", e.message) sys.exit(1) + # Build and set autostart value to pool + # Ignore error as the pool was already successfully created + try: + # Add build step to make sure target directory created + # The build process may fail when the pool directory + # already exists on system + pool.build(libvirt.VIR_STORAGE_POOL_BUILD_NEW) + pool.setAutostart(1) + except: + pass + if pool.isActive() == 0: try: pool.create(0) @@ -182,18 +190,23 @@ class StoragePoolsModel(object): return name pool = conn.storagePoolDefineXML(xml, 0) + except libvirt.libvirtError as e: + kimchi_log.error("Problem creating Storage Pool: %s", e) + raise OperationFailed("KCHPOOL0007E", + {'name': name, 'err': e.get_error_message()}) + + # Build and set autostart value to pool + # Ignore error as the pool was already successfully created + # The build process fails when the pool directory already exists + try: if params['type'] in ['logical', 'dir', 'netfs', 'scsi']: pool.build(libvirt.VIR_STORAGE_POOL_BUILD_NEW) - # autostart dir, logical, netfs and scsi storage pools created - # from kimchi pool.setAutostart(1) else: - # disable autostart for others pool.setAutostart(0) - except libvirt.libvirtError as e: - kimchi_log.error("Problem creating Storage Pool: %s", e) - raise OperationFailed("KCHPOOL0007E", - {'name': name, 'err': e.get_error_message()}) + except: + pass + if params['type'] == 'netfs': output, error, returncode = run_command(['setsebool', '-P', 'virt_use_nfs=1']) diff --git a/tests/test_model_storagepool.py b/tests/test_model_storagepool.py index eabf875..70f3c7b 100644 --- a/tests/test_model_storagepool.py +++ b/tests/test_model_storagepool.py @@ -20,6 +20,7 @@ import json import os +import tempfile import unittest from functools import partial @@ -65,7 +66,7 @@ class StoragepoolTests(unittest.TestCase): self.assertIn('default', [pool['name'] for pool in storagepools]) with RollbackContext() as rollback: - # Now add a couple of StoragePools to the mock model + # Now add a couple of storage pools for i in xrange(3): name = u'kīмсhī-storagepool-%i' % i req = json.dumps({'name': name, 'type': 'dir', @@ -97,6 +98,15 @@ class StoragepoolTests(unittest.TestCase): pools = json.loads(self.request('/storagepools').read()) self.assertEquals(len(storagepools) + 3, len(pools)) + # Create a pool with an existing path + tmp_path = tempfile.mkdtemp(dir='/var/lib/kimchi') + rollback.prependDefer(os.rmdir, tmp_path) + req = json.dumps({'name': 'existing_path', 'type': 'dir', + 'path': tmp_path}) + resp = self.request('/storagepools', req, 'POST') + rollback.prependDefer(model.storagepool_delete, 'existing_path') + self.assertEquals(201, resp.status) + # Reserved pool return 400 req = json.dumps({'name': 'kimchi_isos', 'type': 'dir', 'path': '/var/lib/libvirt/images/%i' % i}) -- 2.1.0

2 2

Kimchi 1.5 is released!
by Aline Manera 26 Jun '15

26 Jun '15

On behalf of everyone who has worked hard on this release, I am pleased to announce the availability of *Kimchi 1.5*! This release adds many new features including: ✔ Bug fixes ✔ Virtual NIC hot plug support ✔ Upload file to storage pool ✔ Make Template defaults configurable through a file ✔ Guest pause/resume support ✔ Support to edit guest MAC address ✔ Allow user changes guest disk format on Template level ✔ Create guests asynchronously ✔ Security: ✔ Prevent Bar Mitzvah attacks by disabling RC4 ✔ Prevent TLS Logjam attacks We have worked hard to ensure that Kimchi runs well on the most popular Linux distributions including: Fedora 22, Ubuntu 15.04, openSUSE 13.2, and RHEL 7.1. Kimchi uses standard Linux interfaces so it should run well on many other distributions too. You can easily grab this release in tarball format or via git: ✔https://github.com/kimchi-project/kimchi/archive/1.5.0.tar.gz ✔ git clonehttps://github.com/kimchi-project/kimchi.git <clonehttps://github.com/kimchi-project/kimchi.git> There are also some packages available at: ✔http://kimchi-project.github.io/kimchi/downloads/ Go ahead! Give it a try and let us know what you think! Regards, Aline Manera

1 0

[RFC PATCH V2 00/31] Split code into Wok server and Kimchi plugin
by Lucio Correia 23 Jun '15

23 Jun '15

Github branch URL: https://github.com/lcorreia/kimchi/tree/lcorreia/wok-v2 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: * 01 to 04: just renames/copies files, no code changes. * 05 to 13: initial changes - mostly repetitive stuff like renames * 14 and 15: core changes - a good summary of reorganization done to the code * 16 to 28: small fixes necessary for the reorganization to work * 29 to 31: additional fixes not specific to this new structure Patches 01 to 28 should be applied as a single commit in order to not break functionality. They are separated here to easy the reviewers work. The patchset is [RFC] because of that and also because there are some todo's yet: * TODO: Split error messages between wok and kimchi * TODO: Move netinfo.py from wok to kimchi (requires ginger adaptation for that) * TODO: Still need to run more detailed/deep tests This hopefully will be the base for next release (just after 1.5). 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 (31): Create kimchi plugin Rename src/kimchi to src/wok Rename kimchi-named files to wok Duplicate some kimchi files back to wok 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 .gitignore | 18 +- COPYING | 13 +- Makefile.am | 91 +- config/Makefile.am | 18 - config/ui/Makefile.am | 22 - config/ui/tabs.xml | 38 - configure.ac | 38 +- contrib/DEBIAN/control.in | 15 +- contrib/DEBIAN/postrm | 4 +- contrib/Makefile.am | 12 +- contrib/kimchi.spec.fedora.in | 189 -- contrib/kimchi.spec.suse.in | 120 - 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 | 94 + 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 | 123 + 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 | 108 + {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 {src => plugins}/kimchi/i18n.py | 0 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 | 478 ++++ 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 | 2320 +++++++++++++++++++ plugins/kimchi/po/en_US.po | 2156 ++++++++++++++++++ plugins/kimchi/po/es_ES.po | 2337 +++++++++++++++++++ plugins/kimchi/po/fr_FR.po | 2360 +++++++++++++++++++ {po => plugins/kimchi/po}/gen-pot.in | 0 plugins/kimchi/po/it_IT.po | 2306 +++++++++++++++++++ plugins/kimchi/po/ja_JP.po | 2301 +++++++++++++++++++ {po => plugins/kimchi/po}/kimchi.pot | 0 plugins/kimchi/po/ko_KR.po | 2228 ++++++++++++++++++ plugins/kimchi/po/pt_BR.po | 2370 ++++++++++++++++++++ plugins/kimchi/po/ru_RU.po | 2230 ++++++++++++++++++ plugins/kimchi/po/zh_CN.po | 2196 ++++++++++++++++++ plugins/kimchi/po/zh_TW.po | 2170 ++++++++++++++++++ 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 | 193 ++ 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 | 105 + 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 | 1219 ++++++++++ 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 | 163 ++ 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/button.css | 501 +++++ .../kimchi/ui}/css/theme-default/circleGauge.css | 0 .../kimchi/ui}/css/theme-default/form.css | 0 .../kimchi/ui}/css/theme-default/grid.css | 0 plugins/kimchi/ui/css/theme-default/guest-edit.css | 418 ++++ .../ui}/css/theme-default/guest-storage-add.css | 0 plugins/kimchi/ui/css/theme-default/host.css | 287 +++ .../ui}/css/theme-default/jquery-ui.custom.css | 0 .../kimchi/ui}/css/theme-default/line-chart.css | 0 plugins/kimchi/ui/css/theme-default/list.css | 326 +++ plugins/kimchi/ui/css/theme-default/message.css | 135 ++ plugins/kimchi/ui/css/theme-default/network.css | 319 +++ plugins/kimchi/ui/css/theme-default/popover.css | 124 + .../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 | 654 ++++++ .../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 | 313 +++ .../kimchi/ui}/css/theme-default/template_list.css | 0 .../kimchi/ui}/css/theme-default/tile-check.css | 0 .../kimchi/ui}/css/theme-default/toolbar.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 .../kimchi/ui}/images/theme-default/alert.png | Bin 3537 -> 3537 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 537 -> 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 plugins/kimchi/ui/images/theme-default/bg-mask.png | Bin 0 -> 2899 bytes .../ui}/images/theme-default/check-green.png | Bin 3501 -> 3501 bytes .../kimchi/ui}/images/theme-default/check-grey.png | Bin 3535 -> 3535 bytes .../ui/images/theme-default/folder-arrow-down.png | Bin 0 -> 2956 bytes .../images/theme-default/folder-arrow-right.png | Bin 2958 -> 2958 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-alert.png | Bin 3545 -> 3545 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-event.png | Bin 3791 -> 3791 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 .../ui}/images/theme-default/icon-setting.png | Bin 3664 -> 3664 bytes .../kimchi/ui}/images/theme-default/icon-sort.png | Bin 3421 -> 3421 bytes .../kimchi/ui}/images/theme-default/icon-tool.png | Bin 4466 -> 4466 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 .../ui}/images/theme-default/kimchi-loading.gif | Bin 6181 -> 6181 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/logo-white.png | Bin 0 -> 9879 bytes .../ui}/images/theme-default/thumb-guest.png | Bin 3896 -> 3896 bytes .../kimchi/ui}/images/theme-default/thumb-host.png | Bin 5069 -> 5069 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 +++++++++++ {ui => plugins/kimchi/ui}/js/src/kimchi.form.js | 0 plugins/kimchi/ui/js/src/kimchi.grid.js | 528 +++++ 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.line-chart.js | 202 ++ plugins/kimchi/ui/js/src/kimchi.main.js | 26 + plugins/kimchi/ui/js/src/kimchi.network.js | 391 ++++ 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 + {ui => plugins/kimchi/ui}/js/src/kimchi.select.js | 0 plugins/kimchi/ui/js/src/kimchi.storage_main.js | 419 ++++ .../ui/js/src/kimchi.storagepool_add_main.js | 415 ++++ .../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 + .../kimchi/ui}/js/widgets/circleGauge.js | 0 plugins/kimchi/ui/libs/Makefile.am | 22 + plugins/kimchi/ui/libs/themes/Makefile.am | 18 + plugins/kimchi/ui/libs/themes/base/Makefile.am | 22 + .../kimchi/ui/libs/themes/base/images/Makefile.am | 20 + .../libs/themes/base/images/animated-overlay.gif | Bin 0 -> 1738 bytes .../base/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 0 -> 180 bytes .../base/images/ui-bg_flat_75_ffffff_40x100.png | Bin 0 -> 178 bytes .../base/images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 0 -> 120 bytes .../base/images/ui-bg_glass_65_ffffff_1x400.png | Bin 0 -> 105 bytes .../base/images/ui-bg_glass_75_dadada_1x400.png | Bin 0 -> 111 bytes .../base/images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 0 -> 110 bytes .../base/images/ui-bg_glass_95_fef1ec_1x400.png | Bin 0 -> 119 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 0 -> 101 bytes .../themes/base/images/ui-icons_222222_256x240.png | Bin 0 -> 4369 bytes .../themes/base/images/ui-icons_2e83ff_256x240.png | Bin 0 -> 4369 bytes .../themes/base/images/ui-icons_454545_256x240.png | Bin 0 -> 4369 bytes .../themes/base/images/ui-icons_888888_256x240.png | Bin 0 -> 4369 bytes .../themes/base/images/ui-icons_cd0a0a_256x240.png | Bin 0 -> 4369 bytes plugins/kimchi/ui/pages/Makefile.am | 22 + plugins/kimchi/ui/pages/error.html.tmpl | 69 + plugins/kimchi/ui/pages/guest-add.html.tmpl | 93 + .../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 | 132 ++ plugins/kimchi/ui/pages/report-add.html.tmpl | 53 + plugins/kimchi/ui/pages/report-rename.html.tmpl | 53 + plugins/kimchi/ui/pages/repository-add.html.tmpl | 105 + plugins/kimchi/ui/pages/repository-edit.html.tmpl | 115 + plugins/kimchi/ui/pages/storage.html.tmpl | 146 ++ .../ui/pages/storagepool-add-volume.html.tmpl | 77 + plugins/kimchi/ui/pages/storagepool-add.html.tmpl | 178 ++ plugins/kimchi/ui/pages/template-add.html.tmpl | 229 ++ 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 | 271 +++ 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/gen-pot.in | 2 +- po/{kimchi.pot => wok.pot} | 0 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/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 | 476 ---- 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 | 271 --- 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/{kimchi => wok}/i18n.py | 0 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 | 104 - 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 | 162 -- tests/utils.py | 260 --- ui/Makefile.am | 4 +- ui/css/Makefile.am | 2 +- ui/css/theme-default/guest-edit.css | 418 ---- ui/css/theme-default/host.css | 287 --- ui/css/theme-default/list.css | 326 --- ui/css/theme-default/network.css | 319 --- ui/css/theme-default/report-rename.css | 39 - ui/css/theme-default/storage.css | 658 ------ ui/css/theme-default/template_add.css | 313 --- ui/css/theme-default/topbar.css | 4 + ui/images/Makefile.am | 4 +- ui/images/theme-default/Makefile.am | 2 +- 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 | 391 ---- 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.storage_main.js | 419 ---- ui/js/src/kimchi.storagepool_add_main.js | 415 ---- 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/wok.lang.js | 50 + 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/{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/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 | 4 +- ui/pages/error.html.tmpl | 8 +- ui/pages/guest-add.html.tmpl | 93 - 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 | 141 -- ui/pages/login.html.tmpl | 8 +- ui/pages/report-add.html.tmpl | 53 - ui/pages/report-rename.html.tmpl | 53 - ui/pages/repository-add.html.tmpl | 105 - ui/pages/repository-edit.html.tmpl | 115 - ui/pages/storagepool-add-volume.html.tmpl | 77 - ui/pages/storagepool-add.html.tmpl | 178 -- 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 | 128 -- ui/pages/tabs/storage.html.tmpl | 142 -- ui/pages/tabs/templates.html.tmpl | 73 - ui/pages/template-add.html.tmpl | 229 -- 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 | 141 ++ 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 - 728 files changed, 69789 insertions(+), 37853 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%) copy {src => plugins}/kimchi/i18n.py (100%) 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 copy {po => plugins/kimchi/po}/kimchi.pot (100%) 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/button.css rename {ui => plugins/kimchi/ui}/css/theme-default/circleGauge.css (100%) rename {ui => plugins/kimchi/ui}/css/theme-default/form.css (100%) rename {ui => plugins/kimchi/ui}/css/theme-default/grid.css (100%) 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 rename {ui => plugins/kimchi/ui}/css/theme-default/jquery-ui.custom.css (100%) rename {ui => plugins/kimchi/ui}/css/theme-default/line-chart.css (100%) create mode 100644 plugins/kimchi/ui/css/theme-default/list.css create mode 100644 plugins/kimchi/ui/css/theme-default/message.css create mode 100644 plugins/kimchi/ui/css/theme-default/network.css create mode 100644 plugins/kimchi/ui/css/theme-default/popover.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%) rename {ui => plugins/kimchi/ui}/css/theme-default/tile-check.css (100%) rename {ui => plugins/kimchi/ui}/css/theme-default/toolbar.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%) rename {ui => plugins/kimchi/ui}/images/theme-default/alert.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%) rename {ui => plugins/kimchi/ui}/images/theme-default/arrow-down.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/arrow-up.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/arrow_out.png (100%) create mode 100644 plugins/kimchi/ui/images/theme-default/bg-mask.png rename {ui => plugins/kimchi/ui}/images/theme-default/check-green.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/check-grey.png (100%) create mode 100644 plugins/kimchi/ui/images/theme-default/folder-arrow-down.png rename {ui => plugins/kimchi/ui}/images/theme-default/folder-arrow-right.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-alert.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-event.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-setting.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/icon-sort.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/icon-tool.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-loading.gif (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/kimchi-loading15x15.gif (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/loading.gif (100%) create mode 100644 plugins/kimchi/ui/images/theme-default/logo-white.png rename {ui => plugins/kimchi/ui}/images/theme-default/thumb-guest.png (100%) rename {ui => plugins/kimchi/ui}/images/theme-default/thumb-host.png (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 rename {ui => plugins/kimchi/ui}/js/src/kimchi.form.js (100%) create mode 100644 plugins/kimchi/ui/js/src/kimchi.grid.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.line-chart.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 rename {ui => plugins/kimchi/ui}/js/src/kimchi.select.js (100%) 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 rename {ui => plugins/kimchi/ui}/js/widgets/circleGauge.js (100%) create mode 100644 plugins/kimchi/ui/libs/Makefile.am create mode 100644 plugins/kimchi/ui/libs/themes/Makefile.am create mode 100644 plugins/kimchi/ui/libs/themes/base/Makefile.am create mode 100644 plugins/kimchi/ui/libs/themes/base/images/Makefile.am create mode 100644 plugins/kimchi/ui/libs/themes/base/images/animated-overlay.gif create mode 100644 plugins/kimchi/ui/libs/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png create mode 100644 plugins/kimchi/ui/libs/themes/base/images/ui-bg_flat_75_ffffff_40x100.png create mode 100644 plugins/kimchi/ui/libs/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png create mode 100644 plugins/kimchi/ui/libs/themes/base/images/ui-bg_glass_65_ffffff_1x400.png create mode 100644 plugins/kimchi/ui/libs/themes/base/images/ui-bg_glass_75_dadada_1x400.png create mode 100644 plugins/kimchi/ui/libs/themes/base/images/ui-bg_glass_75_e6e6e6_1x400.png create mode 100644 plugins/kimchi/ui/libs/themes/base/images/ui-bg_glass_95_fef1ec_1x400.png create mode 100644 plugins/kimchi/ui/libs/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png create mode 100644 plugins/kimchi/ui/libs/themes/base/images/ui-icons_222222_256x240.png create mode 100644 plugins/kimchi/ui/libs/themes/base/images/ui-icons_2e83ff_256x240.png create mode 100644 plugins/kimchi/ui/libs/themes/base/images/ui-icons_454545_256x240.png create mode 100644 plugins/kimchi/ui/libs/themes/base/images/ui-icons_888888_256x240.png create mode 100644 plugins/kimchi/ui/libs/themes/base/images/ui-icons_cd0a0a_256x240.png create mode 100644 plugins/kimchi/ui/pages/Makefile.am create mode 100644 plugins/kimchi/ui/pages/error.html.tmpl 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 rename po/{kimchi.pot => wok.pot} (100%) 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/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 rename src/{kimchi => wok}/i18n.py (100%) 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 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.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 create mode 100644 ui/js/src/wok.lang.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 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

1 31

[PATCH v2] Prevent Kimchi against TLS Logjam attacks
by Rodrigo Trujillo 18 Jun '15

18 Jun '15

There are several weaknesses in how Diffie-Hellman key exchange has been deployed, allowing a man-in-the-middle attack named Logjam, more details here: https://weakdh.org. This patch improves the security in Nginx server, generating 2048bit DH-Parameters or longer when using 2048bit RSA keys. Some parameters before patch: echo | openssl s_client -connect localhost:8001 -cipher "DH" Cipher : DHE-RSA-AES256-GCM-SHA384 New, TLSv1/SSLv3, Cipher is DHE-RSA-AES256-GCM-SHA384 Server public key is 2048 bit Server Temp Key: DH, 1024 bits Some parameters after patch: echo | openssl s_client -connect localhost:8001 -cipher "DH" Cipher : DHE-RSA-AES256-GCM-SHA384 New, TLSv1/SSLv3, Cipher is DHE-RSA-AES256-GCM-SHA384 Server public key is 2048 bit Server Temp Key: DH, 2048 bits (*) This patch also changes the Ciphers allowed by Nginx, change build scripts and the RPM spec file to deliver new file: dhparams.pem. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- Makefile.am | 1 + contrib/DEBIAN/control.in | 1 + contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + src/Makefile.am | 8 +++++++- src/kimchi/proxy.py | 6 +++++- src/nginx/Makefile.am | 2 ++ src/nginx/kimchi.conf.in | 4 +++- 8 files changed, 21 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 46b0b5b..1a0c8e7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -133,6 +133,7 @@ install-data-local: touch $(DESTDIR)/var/log/kimchi/kimchi-access.log touch $(DESTDIR)/var/log/kimchi/kimchi-error.log mkdir -p $(DESTDIR)/etc/kimchi/ + $(INSTALL_DATA) src/dhparams.pem $(DESTDIR)/etc/kimchi/dhparams.pem touch $(DESTDIR)/etc/nginx/conf.d/kimchi.conf uninstall-local: diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index 0747d0f..a288e9b 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -30,6 +30,7 @@ Depends: python-cherrypy3 (>= 3.2.0), libguestfs-tools, spice-html5 Build-Depends: libxslt, + openssl, python-lxml Maintainer: Aline Manera <alinefm(a)br.ibm.com> Description: Kimchi web server diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index dc5533a..183fd43 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -34,6 +34,7 @@ Requires: python-ldap Requires: python-libguestfs Requires: libguestfs-tools BuildRequires: libxslt +BuildRequires: openssl BuildRequires: python-lxml %if 0%{?rhel} >= 6 || 0%{?fedora} >= 19 diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in index 5681a60..fa55cc5 100644 --- a/contrib/kimchi.spec.suse.in +++ b/contrib/kimchi.spec.suse.in @@ -34,6 +34,7 @@ Requires: open-iscsi Requires: python-libguestfs Requires: guestfs-tools BuildRequires: libxslt-tools +BuildRequires: openssl BuildRequires: python-lxml %if 0%{?sles_version} == 11 diff --git a/src/Makefile.am b/src/Makefile.am index 38d231c..e0e0821 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -45,4 +45,10 @@ kimchid: kimchid.in Makefile kimchi.conf: kimchi.conf.in Makefile $(do_substitution) < kimchi.conf.in > kimchi.conf -CLEANFILES = $(bin_SCRIPTS) $(BUILT_SOURCES) +# Generate unique Diffie-Hellman group with 2048-bit +all-local: dhparams.pem + +dhparams.pem: + openssl dhparam -out dhparams.pem 2048 + +CLEANFILES = $(bin_SCRIPTS) $(BUILT_SOURCES) dhparams.pem diff --git a/src/kimchi/proxy.py b/src/kimchi/proxy.py index e3e35b4..5dcca65 100644 --- a/src/kimchi/proxy.py +++ b/src/kimchi/proxy.py @@ -68,6 +68,9 @@ def _create_proxy_config(options): with open(key, "w") as f: f.write(ssl_gen.key_pem()) + # Setting up Diffie-Hellman group with 2048-bit file + dhparams_pem = os.path.join(config_dir, "dhparams.pem") + # Read template file and create a new config file # with the specified parameters. with open(os.path.join(nginx_config_dir, "kimchi.conf.in")) as template: @@ -78,7 +81,8 @@ def _create_proxy_config(options): kimchid_port=options.cherrypy_port, proxy_ssl_port=options.ssl_port, cert_pem=cert, cert_key=key, - max_body_size=eval(options.max_body_size)) + max_body_size=eval(options.max_body_size), + dhparams_pem=dhparams_pem) # Write file to be used for nginx. config_file = open(os.path.join(nginx_config_dir, "kimchi.conf"), "w") diff --git a/src/nginx/Makefile.am b/src/nginx/Makefile.am index 0241b37..c754947 100644 --- a/src/nginx/Makefile.am +++ b/src/nginx/Makefile.am @@ -21,3 +21,5 @@ EXTRA_DIST = kimchi.conf.in confdir = $(sysconfdir)/nginx/conf.d dist_conf_DATA = kimchi.conf.in + +CLEANFILES = kimchi.conf diff --git a/src/nginx/kimchi.conf.in b/src/nginx/kimchi.conf.in index 3ecbde4..b0faea3 100644 --- a/src/nginx/kimchi.conf.in +++ b/src/nginx/kimchi.conf.in @@ -53,7 +53,9 @@ http { ssl_certificate ${cert_pem}; ssl_certificate_key ${cert_key}; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - ssl_ciphers ECDH@STRENGTH:DH@STRENGTH:HIGH:!RC4:!MD5:!DES:!aNULL:!eNULL; + ssl_ciphers 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA:@STRENGTH'; + ssl_prefer_server_ciphers on; + ssl_dhparam ${dhparams_pem}; add_header Strict-Transport-Security "max-age=31536000; includeSubdomains;"; add_header X-Frame-Options DENY; -- 2.1.0

2 1

[PATCH] Prevent Kimchi against TLS Logjam attacks
by Rodrigo Trujillo 18 Jun '15

18 Jun '15

There are several weaknesses in how Diffie-Hellman key exchange has been deployed, allowing a man-in-the-middle attack named Logjam, more details here: https://weakdh.org. This patch improves the security in Nginx server, generating 2048bit DH-Parameters or longer when using 2048bit RSA keys. Some parameters before patch: echo | openssl s_client -connect localhost:8001 -cipher "DH" Cipher : DHE-RSA-AES256-GCM-SHA384 New, TLSv1/SSLv3, Cipher is DHE-RSA-AES256-GCM-SHA384 Server public key is 2048 bit Server Temp Key: DH, 1024 bits Some parameters after patch: echo | openssl s_client -connect localhost:8001 -cipher "DH" Cipher : DHE-RSA-AES256-GCM-SHA384 New, TLSv1/SSLv3, Cipher is DHE-RSA-AES256-GCM-SHA384 Server public key is 2048 bit Server Temp Key: DH, 2048 bits (*) This patch also changes the Ciphers allowed by Nginx, change build scripts and the RPM spec file to deliver new file: dhparams.pem. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- Makefile.am | 1 + contrib/kimchi.spec.fedora.in | 3 ++- src/Makefile.am | 8 +++++++- src/kimchi/proxy.py | 6 +++++- src/nginx/Makefile.am | 2 ++ src/nginx/kimchi.conf.in | 4 +++- 6 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 46b0b5b..5f2b401 100644 --- a/Makefile.am +++ b/Makefile.am @@ -133,6 +133,7 @@ install-data-local: touch $(DESTDIR)/var/log/kimchi/kimchi-access.log touch $(DESTDIR)/var/log/kimchi/kimchi-error.log mkdir -p $(DESTDIR)/etc/kimchi/ + $(INSTALL_DATA) src/nginx/dhparams.pem $(DESTDIR)/etc/kimchi/dhparams.pem touch $(DESTDIR)/etc/nginx/conf.d/kimchi.conf uninstall-local: diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index dc5533a..de40fd1 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -34,6 +34,7 @@ Requires: python-ldap Requires: python-libguestfs Requires: libguestfs-tools BuildRequires: libxslt +BuildRequires: openssl BuildRequires: python-lxml %if 0%{?rhel} >= 6 || 0%{?fedora} >= 19 @@ -153,7 +154,7 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/kimchi/distros.d/opensuse.json %{_sysconfdir}/kimchi/distros.d/ubuntu.json %{_sysconfdir}/kimchi/distros.d/gentoo.json -%{_sysconfdir}/kimchi/ +%{_sysconfdir}/kimchi/* %{_sharedstatedir}/kimchi/debugreports/ %{_sharedstatedir}/kimchi/screenshots/ %{_sharedstatedir}/kimchi/vnc-tokens/ diff --git a/src/Makefile.am b/src/Makefile.am index 38d231c..e0e0821 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -45,4 +45,10 @@ kimchid: kimchid.in Makefile kimchi.conf: kimchi.conf.in Makefile $(do_substitution) < kimchi.conf.in > kimchi.conf -CLEANFILES = $(bin_SCRIPTS) $(BUILT_SOURCES) +# Generate unique Diffie-Hellman group with 2048-bit +all-local: dhparams.pem + +dhparams.pem: + openssl dhparam -out dhparams.pem 2048 + +CLEANFILES = $(bin_SCRIPTS) $(BUILT_SOURCES) dhparams.pem diff --git a/src/kimchi/proxy.py b/src/kimchi/proxy.py index e3e35b4..5dcca65 100644 --- a/src/kimchi/proxy.py +++ b/src/kimchi/proxy.py @@ -68,6 +68,9 @@ def _create_proxy_config(options): with open(key, "w") as f: f.write(ssl_gen.key_pem()) + # Setting up Diffie-Hellman group with 2048-bit file + dhparams_pem = os.path.join(config_dir, "dhparams.pem") + # Read template file and create a new config file # with the specified parameters. with open(os.path.join(nginx_config_dir, "kimchi.conf.in")) as template: @@ -78,7 +81,8 @@ def _create_proxy_config(options): kimchid_port=options.cherrypy_port, proxy_ssl_port=options.ssl_port, cert_pem=cert, cert_key=key, - max_body_size=eval(options.max_body_size)) + max_body_size=eval(options.max_body_size), + dhparams_pem=dhparams_pem) # Write file to be used for nginx. config_file = open(os.path.join(nginx_config_dir, "kimchi.conf"), "w") diff --git a/src/nginx/Makefile.am b/src/nginx/Makefile.am index 0241b37..c754947 100644 --- a/src/nginx/Makefile.am +++ b/src/nginx/Makefile.am @@ -21,3 +21,5 @@ EXTRA_DIST = kimchi.conf.in confdir = $(sysconfdir)/nginx/conf.d dist_conf_DATA = kimchi.conf.in + +CLEANFILES = kimchi.conf diff --git a/src/nginx/kimchi.conf.in b/src/nginx/kimchi.conf.in index 3ecbde4..b0faea3 100644 --- a/src/nginx/kimchi.conf.in +++ b/src/nginx/kimchi.conf.in @@ -53,7 +53,9 @@ http { ssl_certificate ${cert_pem}; ssl_certificate_key ${cert_key}; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - ssl_ciphers ECDH@STRENGTH:DH@STRENGTH:HIGH:!RC4:!MD5:!DES:!aNULL:!eNULL; + ssl_ciphers 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA:@STRENGTH'; + ssl_prefer_server_ciphers on; + ssl_dhparam ${dhparams_pem}; add_header Strict-Transport-Security "max-age=31536000; includeSubdomains;"; add_header X-Frame-Options DENY; -- 2.1.0

2 2

[PATCH] Issue #653: "make rpm" requests authentication with non-root
by Ramon Medeiros 17 Jun '15

17 Jun '15

Make install now will install firewalld and systemctl service. Also, it will create base file structure to run kimchi (what was being created at rpm spec). --- Makefile.am | 50 +++++++++++++++++++++++++++---------------- configure.ac | 9 ++++++++ contrib/kimchi.spec.fedora.in | 16 -------------- contrib/kimchi.spec.suse.in | 18 ---------------- 4 files changed, 41 insertions(+), 52 deletions(-) diff --git a/Makefile.am b/Makefile.am index 91a0fa2..46b0b5b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -115,27 +115,41 @@ ChangeLog: fi install-data-local: - @if test -d /usr/lib/systemd/system/ ; then \ - $(INSTALL_DATA) contrib/kimchid.service.fedora /usr/lib/systemd/system/kimchid.service; \ - systemctl daemon-reload; \ - elif test -d /etc/systemd/system; then \ - $(INSTALL_DATA) contrib/kimchid.service.fedora /etc/systemd/system/kimchid.service; \ - systemctl daemon-reload; \ - else \ - $(INSTALL_DATA) contrib/kimchid.sysvinit /etc/init.d/kimchid; \ - chmod +x /etc/init.d/kimchid; \ - fi + @if test -d $(systemdsystemunitdir) ; then \ + mkdir -p $(DESTDIR)/$(systemdsystemunitdir); \ + $(INSTALL_DATA) contrib/kimchid.service.fedora $(DESTDIR)/$(systemdsystemunitdir)/kimchid.service; \ + else \ + mkdir -p $(DESTDIR)/etc/init.d/ \ + $(INSTALL_DATA) contrib/kimchid.sysvinit $(DESTDIR)/etc/init.d/kimchid; \ + chmod +x $(DESTDIR)/etc/init.d/kimchid; \ + fi; \ + if test -d /usr/lib/firewalld/services/; then \ + mkdir -p $(DESTDIR)/usr/lib/firewalld/services/; \ + $(INSTALL_DATA) src/firewalld.xml $(DESTDIR)/usr/lib/firewalld/services/kimchid.xml; \ + fi; \ + mkdir -p $(DESTDIR)/var/lib/kimchi/{debugreports,screenshots,vnc-tokens,isos} + touch $(DESTDIR)/var/lib/kimchi/objectstore + mkdir -p $(DESTDIR)/var/log/kimchi/ + touch $(DESTDIR)/var/log/kimchi/kimchi-access.log + touch $(DESTDIR)/var/log/kimchi/kimchi-error.log + mkdir -p $(DESTDIR)/etc/kimchi/ + touch $(DESTDIR)/etc/nginx/conf.d/kimchi.conf uninstall-local: - @if test -f /usr/lib/systemd/system/kimchid.service; then \ - $(RM) /usr/lib/systemd/system/kimchid.service; \ - systemctl daemon-reload; \ - elif test -f /etc/systemd/system/kimchid.service; then \ - $(RM) /etc/systemd/system/kimchid.service; \ + @if test -f $(systemdsystemunitdir)/kimchid.service; then \ + $(RM) $(DESTDIR)/$(systemdsystemunitdir)/kimchid.service; \ elif test -f /etc/init.d/kimchid; then \ - $(RM) /etc/init.d/kimchid; \ - fi - + $(RM) $(DESTDIR)/etc/init.d/kimchid; \ + $(RM) $(DESTDIR)/etc/init/kimchi.conf; \ + fi; \ + if test -d /usr/lib/firewalld/services/; then \ + $(RM) $(DESTDIR)/usr/lib/firewalld/services/kimchid.xml; \ + fi; \ + $(RM) -rf $(DESTDIR)/var/lib/kimchi + $(RM) -rf $(DESTDIR)/var/log/kimchi + $(RM) -rf $(DESTDIR)/etc/kimchi + $(RM) $(DESTDIR)/etc/nginx/conf.d/kimchi.conf + VERSION: @if test -d .git; then \ git describe --abbrev=0 > $@; \ diff --git a/configure.ac b/configure.ac index f5091b8..0261b5f 100644 --- a/configure.ac +++ b/configure.ac @@ -64,6 +64,15 @@ else AC_SUBST([ENABLE_SAMPLE], [False]) fi +# check for systemd +PKG_PROG_PKG_CONFIG +AC_ARG_WITH([systemdsystemunitdir], + AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), + [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) +if test "x$with_systemdsystemunitdir" != xno; then + AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) +fi + AC_ARG_WITH( [spice-html5], [AS_HELP_STRING([--with-spice-html5], diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index 30f8417..dc5533a 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -85,22 +85,6 @@ make DESTDIR=%{buildroot} install %if 0%{?with_systemd} -# create /var/lib/kimchi structure -mkdir -p %{buildroot}/%{_sharedstatedir}/kimchi/{debugreports,screenshots,vnc-tokens,isos} -touch %{buildroot}/%{_sharedstatedir}/kimchi/objectstore - -# create /var/log/kimchi structure -mkdir -p %{buildroot}/%{_localstatedir}/log/kimchi/ -touch %{buildroot}/%{_localstatedir}/log/kimchi/kimchi-access.log -touch %{buildroot}/%{_localstatedir}/log/kimchi/kimchi-error.log - -# create /etc/kimchi structure -mkdir -p %{buildroot}/%{_sysconfdir}/kimchi/ -touch %{buildroot}/%{_sysconfdir}/nginx/conf.d/kimchi.conf - -# Install the systemd scripts -install -Dm 0644 contrib/kimchid.service.fedora %{buildroot}%{_unitdir}/kimchid.service -install -Dm 0640 src/firewalld.xml %{buildroot}%{_prefix}/lib/firewalld/services/kimchid.xml %endif %if 0%{?rhel} == 6 diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in index bf85661..5681a60 100644 --- a/contrib/kimchi.spec.suse.in +++ b/contrib/kimchi.spec.suse.in @@ -54,24 +54,6 @@ make rm -rf %{buildroot} make DESTDIR=%{buildroot} install -# create /var/lib/kimchi structure -mkdir -p %{buildroot}/%{_var}/lib/kimchi/{debugreports,screenshots,vnc-tokens,isos} -touch %{buildroot}/%{_var}/lib/kimchi/objectstore - -# create /var/log/kimchi structure -mkdir -p %{buildroot}/%{_localstatedir}/log/kimchi/ -touch %{buildroot}/%{_localstatedir}/log/kimchi/kimchi-access.log -touch %{buildroot}/%{_localstatedir}/log/kimchi/kimchi-error.log - -# create /etc/kimchi structure -mkdir -p %{buildroot}/%{_sysconfdir}/kimchi/ - -# create nginx configuration -touch %{buildroot}/%{_sysconfdir}/nginx/conf.d/kimchi.conf - -# Install the SysV init scripts -install -Dm 0755 contrib/kimchid.sysvinit %{buildroot}%{_initrddir}/kimchid - %post chkconfig kimchid on -- 2.1.0

2 1

[PATCH] Bug fix: Use a temp directory under /var to avoid permission
by Aline Manera 17 Jun '15

17 Jun '15

The user may have the Kimchi source code in any directory and using it as a base to do the tests may cause permission errors while open ISO files or creating guest disks. To avoid those errors use a temp directory under /var which already has the right permissions to all users. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- tests/test_model.py | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/test_model.py b/tests/test_model.py index 602ca6e..3828342 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -48,13 +48,13 @@ invalid_repository_urls = ['www.fedora.org', # missing protocol 'http://www.fedora', # invalid domain name 'file:///home/foobar'] # invalid path -ISO_PATH = '/tmp/kimchi-model-iso/' -UBUNTU_ISO = ISO_PATH + 'ubuntu14.04.iso' +TMP_DIR = '/var/lib/kimchi/tests/' +UBUNTU_ISO = TMP_DIR + 'ubuntu14.04.iso' def setUpModule(): - if not os.path.exists(ISO_PATH): - os.makedirs(ISO_PATH) + if not os.path.exists(TMP_DIR): + os.makedirs(TMP_DIR) iso_gen.construct_fake_iso(UBUNTU_ISO, True, '14.04', 'ubuntu') @@ -68,7 +68,7 @@ def setUpModule(): def tearDownModule(): - shutil.rmtree(ISO_PATH) + shutil.rmtree(TMP_DIR) class ModelTests(unittest.TestCase): @@ -382,7 +382,7 @@ class ModelTests(unittest.TestCase): @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_vm_disk(self): - disk_path = '/tmp/existent2.iso' + disk_path = os.path.join(TMP_DIR, 'existent2.iso') open(disk_path, 'w').close() modern_disk_bus = get_template_default('modern', 'disk_bus') @@ -403,7 +403,7 @@ class ModelTests(unittest.TestCase): inst = model.Model(objstore_loc=self.tmp_store) with RollbackContext() as rollback: - path = os.path.join(os.getcwd(), 'kimchi-images') + path = os.path.join(TMP_DIR, 'kimchi-images') pool = 'test-pool' vol = 'test-volume.img' vol_path = "%s/%s" % (path, vol) @@ -468,7 +468,7 @@ class ModelTests(unittest.TestCase): self.assertRaises( InvalidParameter, inst.vmstorages_create, vm_name, disk_args) - old_distro_iso = ISO_PATH + 'rhel4_8.iso' + old_distro_iso = TMP_DIR + 'rhel4_8.iso' iso_gen.construct_fake_iso(old_distro_iso, True, '4.8', 'rhel') vm_name = 'kimchi-ide-bus-vm' @@ -508,8 +508,8 @@ class ModelTests(unittest.TestCase): self.assertEquals(1, prev_count) # dummy .iso files - iso_path = '/tmp/existent.iso' - iso_path2 = '/tmp/existent2.iso' + iso_path = os.path.join(TMP_DIR, 'existent.iso') + iso_path2 = os.path.join(TMP_DIR, 'existent2.iso') open(iso_path, 'w').close() rollback.prependDefer(os.remove, iso_path) open(iso_path2, 'w').close() @@ -996,20 +996,20 @@ class ModelTests(unittest.TestCase): inst = model.Model(None, objstore_loc=self.tmp_store) with RollbackContext() as rollback: - path = '/tmp/kimchi-images/tmpdir' - if not os.path.exists(path): - os.makedirs(path) - iso_gen.construct_fake_iso('/tmp/kimchi-images/tmpdir/' - 'ubuntu12.04.iso', True, - '12.04', 'ubuntu') - iso_gen.construct_fake_iso('/tmp/kimchi-images/sles10.iso', - True, '10', 'sles') + deep_path = os.path.join(TMP_DIR, 'deep-scan') + subdir_path = os.path.join(deep_path, 'isos') + if not os.path.exists(subdir_path): + os.makedirs(subdir_path) + ubuntu_iso = os.path.join(deep_path, 'ubuntu12.04.iso') + sles_iso = os.path.join(subdir_path, 'sles10.iso') + iso_gen.construct_fake_iso(ubuntu_iso, True, '12.04', 'ubuntu') + iso_gen.construct_fake_iso(sles_iso, True, '10', 'sles') args = {'name': 'kimchi-scanning-pool', - 'path': '/tmp/kimchi-images', + 'path': deep_path, 'type': 'kimchi-iso'} inst.storagepools_create(args) - rollback.prependDefer(shutil.rmtree, '/tmp/kimchi-images') + rollback.prependDefer(shutil.rmtree, deep_path) rollback.prependDefer(shutil.rmtree, args['path']) rollback.prependDefer(inst.storagepool_deactivate, args['name']) -- 2.1.0

2 2

[PATCH] Bug fix: Detach host device prior to attach to guest
by Aline Manera 17 Jun '15

17 Jun '15

According to libvirt documentation, the device must be detached from host to avoid problems in the host system. In my tests, the host crashed after attaching a FC HBA as PCI passthrough device to a guest using Kimchi. A host reboot was needed to recover the system. For reference: https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/5/ht… Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 1 + src/kimchi/model/vmhostdevs.py | 21 ++++++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 00a6c7c..d2ffa34 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -126,6 +126,7 @@ messages = { "For Intel CPU, add intel_iommu=on to your Kernel parameter in /boot/grub2/grub.conf. " "For AMD CPU, add iommu=pt iommu=1."), "KCHVMHDEV0004E": _('"name" should be a device name string'), + "KCHVMHDEV0005E": _('The device %(name)s is probably in use by the host. Unable to attach it to the guest.'), "KCHVMIF0001E": _("Interface %(iface)s does not exist in virtual machine %(name)s"), "KCHVMIF0002E": _("Network %(network)s specified for virtual machine %(name)s does not exist"), diff --git a/src/kimchi/model/vmhostdevs.py b/src/kimchi/model/vmhostdevs.py index 946b1f6..ea75fce 100644 --- a/src/kimchi/model/vmhostdevs.py +++ b/src/kimchi/model/vmhostdevs.py @@ -25,6 +25,7 @@ from lxml import etree, objectify from lxml.builder import E from kimchi.exception import InvalidOperation, InvalidParameter, NotFoundError +from kimchi.exception import OperationFailed from kimchi.model.config import CapabilitiesModel from kimchi.model.host import DeviceModel, DevicesModel from kimchi.model.utils import get_vm_config_flag @@ -122,9 +123,23 @@ class VMHostDevsModel(object): dev_name = params['name'] self._passthrough_device_validate(dev_name) dev_info = DeviceModel(conn=self.conn).lookup(dev_name) - attach_device = getattr( - self, '_attach_%s_device' % dev_info['device_type']) - return attach_device(vmid, dev_info) + + with RollbackContext() as rollback: + try: + dev = self.conn.get().nodeDeviceLookupByName(dev_name) + dev.dettach() + except Exception: + raise OperationFailed('KCHVMHDEV0005E', {'name': dev_name}) + else: + rollback.prependDefer(dev.reAttach) + + attach_device = getattr( + self, '_attach_%s_device' % dev_info['device_type']) + + info = attach_device(vmid, dev_info) + rollback.commitAll() + + return info def _get_pci_device_xml(self, dev_info): if 'detach_driver' not in dev_info: -- 2.1.0

2 2

[PATCH] Gtihub #660 - Fixing .repo file with no repos handling
by Daniel Henrique Barboza 16 Jun '15

16 Jun '15

yumparser module will not add a {None: None} dict to the repositories listing when reading a .repo file which has no repositories declarations. Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> --- src/kimchi/yumparser.py | 5 +++-- tests/test_yumparser.py | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/kimchi/yumparser.py b/src/kimchi/yumparser.py index ce6ba9d..ac4ee02 100644 --- a/src/kimchi/yumparser.py +++ b/src/kimchi/yumparser.py @@ -109,8 +109,9 @@ def _get_repos_from_file(repo_file): value = value.strip() current_repo.set_attribute(key, value) - # add the last repo from file - repos_from_file[current_repo_id] = current_repo + # add the last repo from file. + if current_repo is not None: + repos_from_file[current_repo_id] = current_repo return repos_from_file diff --git a/tests/test_yumparser.py b/tests/test_yumparser.py index 8645a65..d17e647 100644 --- a/tests/test_yumparser.py +++ b/tests/test_yumparser.py @@ -22,6 +22,7 @@ import tempfile import unittest from kimchi.model import model +from kimchi.rollbackcontext import RollbackContext from kimchi.yumparser import delete_repo_from_file, get_repo_files from kimchi.yumparser import get_yum_repositories, write_repo_to_file from kimchi.yumparser import YumRepoObject @@ -45,6 +46,21 @@ def _create_fake_repos(repo_file_name): return repos +def _create_empty_repo_file(): + data = """ +# +# This is a repository file with no repositories at all +# No repositories must be added after reading this file. +# + """ + _, tmp_file_name = tempfile.mkstemp(suffix='.repo', + dir='/etc/yum.repos.d') + with open(tmp_file_name, 'w') as f: + f.writelines(data) + + return tmp_file_name + + def _create_fake_repos_file(): _, tmp_file_name = tempfile.mkstemp(suffix='.repo', dir='/etc/yum.repos.d') @@ -79,6 +95,14 @@ class YumParserTests(unittest.TestCase): repo_objects = get_yum_repositories() self.assertGreaterEqual(len(repo_objects), len(repo_files)) + def test_empty_repo_file(self): + with RollbackContext() as rollback: + repos = get_yum_repositories() + tmp_file_name = _create_empty_repo_file() + rollback.prependDefer(os.remove, tmp_file_name) + repos_after = get_yum_repositories() + self.assertEqual(len(repos_after), len(repos)) + def test_update_repo_attributes(self): repos = get_yum_repositories() fake_repo_2 = repos['fake-repo-2'] -- 2.1.0

3 2

[PATCH] Support ISO detection of xorriso ISOs
by Ramon Medeiros 16 Jun '15

16 Jun '15

ISOs were created by genisoimage, so the paths were lowercase, when readed in iso9660 format. Debian 8 ppc64el started to use xorriso, which uses uppercase paths. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- src/kimchi/isoinfo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kimchi/isoinfo.py b/src/kimchi/isoinfo.py index fd1f8f7..6fb0f38 100644 --- a/src/kimchi/isoinfo.py +++ b/src/kimchi/isoinfo.py @@ -308,7 +308,7 @@ lang=en#!/wiki/W51a7ffcf4dfd_4b40_9d82_446ebc23c550/page/PowerLinux\ if dir_parent == 1: # read the dir name using the namelen dir_name = path_table_data[i: i+dir_namelen].rstrip() - if dir_name == 'ppc': + if dir_name.lower() == 'ppc': # stop searching, dir was found break # Need to consider the optional padding field as well @@ -378,7 +378,7 @@ lang=en#!/wiki/W51a7ffcf4dfd_4b40_9d82_446ebc23c550/page/PowerLinux\ static_rec_size + file_name_len].rstrip() # The second bit of the file_flags indicate if this record # is a directory. - if filename == BOOT_FILE_NAME and (file_flags & 2) != 1: + if BOOT_FILE_NAME in filename.lower() and (file_flags & 2) != 1: self.bootable = True return -- 2.1.0

3 2

[PATCH] Github #657 - fixing yum check-update parsing
by Daniel Henrique Barboza 16 Jun '15

16 Jun '15

Enhancing the parsing of yum check-update command in the yumparser module. A new unit test was included to simulate the error condition. Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> --- src/kimchi/yumparser.py | 44 +++++++++++++++++++++++++++++++++----------- tests/test_yumparser.py | 27 +++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 11 deletions(-) diff --git a/src/kimchi/yumparser.py b/src/kimchi/yumparser.py index ce6ba9d..7612bbc 100644 --- a/src/kimchi/yumparser.py +++ b/src/kimchi/yumparser.py @@ -216,6 +216,27 @@ class YumUpdatePackageObject(object): self.ui_from_repo = repo +def _include_line_checkupdate_output(line): + tokens = line.split() + + if len(tokens) != 3: + return False + + if '.' not in tokens[0]: + return False + + return True + + +def _filter_lines_checkupdate_output(output): + if output is None: + return [] + + out = [l for l in output.split('\n') + if _include_line_checkupdate_output(l)] + return out + + def _get_yum_checkupdate_output(): cmd = ['yum', 'check-update', '-d0'] yum_update_cmd = subprocess.Popen(cmd, @@ -225,23 +246,24 @@ def _get_yum_checkupdate_output(): if error != '': return None - return out.split() + return out -def get_yum_packages_list_update(): - yum_checkupdate_output = _get_yum_checkupdate_output() - if yum_checkupdate_output is None: - return None +def get_yum_packages_list_update(checkupdate_output=None): + if checkupdate_output is None: + checkupdate_output = _get_yum_checkupdate_output() + + filtered_output = _filter_lines_checkupdate_output(checkupdate_output) packages = [] - index = 0 - while index < len(yum_checkupdate_output): - name_arch = yum_checkupdate_output[index] - index += 1 - version = yum_checkupdate_output[index] + for line in filtered_output: + line = line.split() + index = 0 + name_arch = line[index] index += 1 - repo = yum_checkupdate_output[index] + version = line[index] index += 1 + repo = line[index] name, arch = name_arch.rsplit('.', 1) packages.append(YumUpdatePackageObject(name, arch, version, repo)) diff --git a/tests/test_yumparser.py b/tests/test_yumparser.py index 8645a65..4ec84ae 100644 --- a/tests/test_yumparser.py +++ b/tests/test_yumparser.py @@ -23,6 +23,7 @@ import unittest from kimchi.model import model from kimchi.yumparser import delete_repo_from_file, get_repo_files +from kimchi.yumparser import get_yum_packages_list_update from kimchi.yumparser import get_yum_repositories, write_repo_to_file from kimchi.yumparser import YumRepoObject @@ -60,6 +61,22 @@ def _create_fake_repos_file(): return tmp_file_name +def _generate_yumcheckupdate_output(): + output = """ +Repository 'REPOSITORY1' is missing name in configuration, using id +Repository 'REPOSITORY1-OPTIONAL' is missing name in configuration, using id + +PACKAGE1.noarch 20150611.-gg-FAKE1 REPOSITORY1 +PACKAGE2.x86_64 20150611.-no-FAKE2 REPOSITORY2 +PACKAGE3.dot.dot.i386 20150611.-re-FAKE3 REPOSITORY3 + +Obsoleting Packages +OBSOLETE4.dot.dot.i386 20150611.FAKE4 REPOSITORY4 +OBSOLETE5.dot.dot.fakearch 20150611.FAKE5 REPOSITORY5 + """ + return output + + @unittest.skipIf(not _is_yum_distro(), 'Skipping: YUM exclusive test') def setUpModule(): global TEMP_REPO_FILE @@ -109,3 +126,13 @@ class YumParserTests(unittest.TestCase): repos = get_yum_repositories() repos_id = repos.keys() self.assertNotIn('fake-repo-3', repos_id) + + def test_yum_checkupdate_parsing(self): + output = _generate_yumcheckupdate_output() + packages = get_yum_packages_list_update(output) + self.assertEqual(len(packages), 5) + self.assertEqual(packages[0].ui_from_repo, 'REPOSITORY1') + self.assertEqual(packages[1].version, '20150611.-no-FAKE2') + self.assertEqual(packages[2].name, 'PACKAGE3.dot.dot') + self.assertEqual(packages[3].arch, 'i386') + self.assertEqual(packages[4].arch, 'fakearch') -- 2.1.0

3 2

[PATCH V2] Bug fix: Allow user creates multiple templates
by Aline Manera 11 Jun '15

11 Jun '15

V1 - V2: - Enclose the guest creation code with the lock Aline Manera (1): Bug fix: Allow user creates multiple templates src/kimchi/kvmusertests.py | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) -- 2.1.0

2 3

[PATCH 0/3 v4] Removing Yum API from Kimchi
by Daniel Henrique Barboza 10 Jun '15

10 Jun '15

v4: - simplified the code of YumRepoObj class x3: - skipping yumparser tests in Ubuntu - make check-local fixes The use of Yum API is causing a memory leak each time the Host tab is loaded. This can be verified by seeing the use of memory in $top. To remove the Yum API, a new module named 'yumparser' was created to manipulate Yum repositories directly from the filesystem and to return the software update list by parsing $yum check-update command. A new unit test file was created to verify the proper behavior of the yumparser module. Daniel Henrique Barboza (3): Adding yumparser module Unit tests for the yumparser module Changing repositories and swupdate to use yumparser module src/kimchi/repositories.py | 65 ++++-------- src/kimchi/swupdate.py | 16 ++- src/kimchi/yumparser.py | 248 +++++++++++++++++++++++++++++++++++++++++++++ tests/test_yumparser.py | 111 ++++++++++++++++++++ 4 files changed, 385 insertions(+), 55 deletions(-) create mode 100644 src/kimchi/yumparser.py create mode 100644 tests/test_yumparser.py -- 2.1.0

2 5

[PATCH] Fix bug #647: Properly set qxl as video model for Fedora 22
by Aline Manera 10 Jun '15

10 Jun '15

Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/osinfo.py | 6 ++++++ src/kimchi/vmtemplate.py | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 35aa594..78eb828 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -68,6 +68,9 @@ template_specs = {'x86': {'old': dict(disk_bus='ide', memory=1280)}} +custom_specs = {'fedora': {'22': dict(video_model='qxl')}} + + modern_version_bases = {'x86': {'debian': '6.0', 'ubuntu': '7.10', 'opensuse': '10.3', 'centos': '5.3', 'rhel': '6.0', 'fedora': '16', 'gentoo': '0', @@ -199,6 +202,9 @@ def lookup(distro, version): params['os_distro'] = params['os_version'] = "unknown" params.update(template_specs[arch]['old']) + # Get custom specifications + params.update(custom_specs.get(distro, {}).get(version, {})) + if distro in icon_available_distros: params['icon'] = 'images/icon-%s.png' % distro else: diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 4143839..79e04ed 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -259,6 +259,12 @@ class VMTemplate(object): <input type='tablet' bus='%(kbd_bus)s'> </input> """ + video = """ + <video> + <model type='%(video_model)s'/> + </video> + """ + input_output = "" if 'mouse_bus' in self.info.keys(): input_output += mouse % self.info @@ -268,6 +274,8 @@ class VMTemplate(object): input_output += tablet % self.info if 'sound_model' in self.info.keys(): input_output += sound % self.info + if 'video_model' in self.info.keys(): + input_output += video % self.info return input_output def _get_cpu_xml(self): -- 2.1.0

2 2

[PATCH 0/6 - V2][Memory HotPlug] Implements backend of memory device hotplug
by Rodrigo Trujillo 10 Jun '15

10 Jun '15

V2 - Fix erros in tests and add a test to slots number - Fix other minor issues with Libvirt < 1.2.14 V1 This patchset implements the backend part of memory hotplug functionality, including: - new feature test to check if libvirt supports memory devices - changes the way that memory is assigned or updated in the guest xml: * memory is now set in a basic NUMA node - includes maxMemory element in the XML: * which is equal the total memory of the host * sets memory device slots. The total number of slots are equal the maxMemory minus the memory assigned (1 slot == 1 GB ) - creates a new VM device, the memory device: * by default, a memory device will have 1GB * user can add the memory device with machine running or offline - memory devices are selected according to its position in the xml (the slot) 0, 1, 2, etc URL: - http://localhost:8010/vms/<VM>/memdevices - http://localhost:8010/vms/<VM>/memdevices/<MEM-DEV> Rodrigo Trujillo (6): [Memory HotPlug] Feature test to check support to memory devices [Memory HotPlug] Add maxMemory and numa configuration to guest xml [Memory HotPlug] Memory device control and model classes [Memory HotPlug] Add parameters checking and documentation to memory device API [Memory HotPlug] Fix VM offline memory update and fix slots assignment [Memory HotPlug] Fix test and adds slot test docs/API.md | 16 +++++++ src/kimchi/API.json | 14 +++++- src/kimchi/control/vm/memdevices.py | 47 +++++++++++++++++++ src/kimchi/i18n.py | 5 ++ src/kimchi/mockmodel.py | 7 +++ src/kimchi/model/config.py | 3 ++ src/kimchi/model/featuretests.py | 43 +++++++++++++++++ src/kimchi/model/vmmemdevices.py | 94 +++++++++++++++++++++++++++++++++++++ src/kimchi/model/vms.py | 85 ++++++++++++++++++++++++++++----- src/kimchi/vmtemplate.py | 40 ++++++++++++---- tests/test_model.py | 2 +- tests/test_rest.py | 4 +- tests/test_vmtemplate.py | 5 +- 13 files changed, 338 insertions(+), 27 deletions(-) create mode 100644 src/kimchi/control/vm/memdevices.py create mode 100644 src/kimchi/model/vmmemdevices.py -- 2.1.0

2 22

[PATCH v2] Fix make install for systemd systems
by Ramon Medeiros 09 Jun '15

09 Jun '15

Make install now will install firewalld and systemctl service. Also, it will create base file structure to run kimchi (what was being created at rpm spec). Changes: v2: Use macros to determine systemd directory Do not use root permissions on make install script (like rebooting systemctl) --- Makefile.am | 50 +++++++++++++++++++++++++++---------------- configure.ac | 9 ++++++++ contrib/kimchi.spec.fedora.in | 16 -------------- contrib/kimchi.spec.suse.in | 18 ---------------- 4 files changed, 41 insertions(+), 52 deletions(-) diff --git a/Makefile.am b/Makefile.am index 91a0fa2..46b0b5b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -115,27 +115,41 @@ ChangeLog: fi install-data-local: - @if test -d /usr/lib/systemd/system/ ; then \ - $(INSTALL_DATA) contrib/kimchid.service.fedora /usr/lib/systemd/system/kimchid.service; \ - systemctl daemon-reload; \ - elif test -d /etc/systemd/system; then \ - $(INSTALL_DATA) contrib/kimchid.service.fedora /etc/systemd/system/kimchid.service; \ - systemctl daemon-reload; \ - else \ - $(INSTALL_DATA) contrib/kimchid.sysvinit /etc/init.d/kimchid; \ - chmod +x /etc/init.d/kimchid; \ - fi + @if test -d $(systemdsystemunitdir) ; then \ + mkdir -p $(DESTDIR)/$(systemdsystemunitdir); \ + $(INSTALL_DATA) contrib/kimchid.service.fedora $(DESTDIR)/$(systemdsystemunitdir)/kimchid.service; \ + else \ + mkdir -p $(DESTDIR)/etc/init.d/ \ + $(INSTALL_DATA) contrib/kimchid.sysvinit $(DESTDIR)/etc/init.d/kimchid; \ + chmod +x $(DESTDIR)/etc/init.d/kimchid; \ + fi; \ + if test -d /usr/lib/firewalld/services/; then \ + mkdir -p $(DESTDIR)/usr/lib/firewalld/services/; \ + $(INSTALL_DATA) src/firewalld.xml $(DESTDIR)/usr/lib/firewalld/services/kimchid.xml; \ + fi; \ + mkdir -p $(DESTDIR)/var/lib/kimchi/{debugreports,screenshots,vnc-tokens,isos} + touch $(DESTDIR)/var/lib/kimchi/objectstore + mkdir -p $(DESTDIR)/var/log/kimchi/ + touch $(DESTDIR)/var/log/kimchi/kimchi-access.log + touch $(DESTDIR)/var/log/kimchi/kimchi-error.log + mkdir -p $(DESTDIR)/etc/kimchi/ + touch $(DESTDIR)/etc/nginx/conf.d/kimchi.conf uninstall-local: - @if test -f /usr/lib/systemd/system/kimchid.service; then \ - $(RM) /usr/lib/systemd/system/kimchid.service; \ - systemctl daemon-reload; \ - elif test -f /etc/systemd/system/kimchid.service; then \ - $(RM) /etc/systemd/system/kimchid.service; \ + @if test -f $(systemdsystemunitdir)/kimchid.service; then \ + $(RM) $(DESTDIR)/$(systemdsystemunitdir)/kimchid.service; \ elif test -f /etc/init.d/kimchid; then \ - $(RM) /etc/init.d/kimchid; \ - fi - + $(RM) $(DESTDIR)/etc/init.d/kimchid; \ + $(RM) $(DESTDIR)/etc/init/kimchi.conf; \ + fi; \ + if test -d /usr/lib/firewalld/services/; then \ + $(RM) $(DESTDIR)/usr/lib/firewalld/services/kimchid.xml; \ + fi; \ + $(RM) -rf $(DESTDIR)/var/lib/kimchi + $(RM) -rf $(DESTDIR)/var/log/kimchi + $(RM) -rf $(DESTDIR)/etc/kimchi + $(RM) $(DESTDIR)/etc/nginx/conf.d/kimchi.conf + VERSION: @if test -d .git; then \ git describe --abbrev=0 > $@; \ diff --git a/configure.ac b/configure.ac index f5091b8..0261b5f 100644 --- a/configure.ac +++ b/configure.ac @@ -64,6 +64,15 @@ else AC_SUBST([ENABLE_SAMPLE], [False]) fi +# check for systemd +PKG_PROG_PKG_CONFIG +AC_ARG_WITH([systemdsystemunitdir], + AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), + [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) +if test "x$with_systemdsystemunitdir" != xno; then + AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) +fi + AC_ARG_WITH( [spice-html5], [AS_HELP_STRING([--with-spice-html5], diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index 30f8417..dc5533a 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -85,22 +85,6 @@ make DESTDIR=%{buildroot} install %if 0%{?with_systemd} -# create /var/lib/kimchi structure -mkdir -p %{buildroot}/%{_sharedstatedir}/kimchi/{debugreports,screenshots,vnc-tokens,isos} -touch %{buildroot}/%{_sharedstatedir}/kimchi/objectstore - -# create /var/log/kimchi structure -mkdir -p %{buildroot}/%{_localstatedir}/log/kimchi/ -touch %{buildroot}/%{_localstatedir}/log/kimchi/kimchi-access.log -touch %{buildroot}/%{_localstatedir}/log/kimchi/kimchi-error.log - -# create /etc/kimchi structure -mkdir -p %{buildroot}/%{_sysconfdir}/kimchi/ -touch %{buildroot}/%{_sysconfdir}/nginx/conf.d/kimchi.conf - -# Install the systemd scripts -install -Dm 0644 contrib/kimchid.service.fedora %{buildroot}%{_unitdir}/kimchid.service -install -Dm 0640 src/firewalld.xml %{buildroot}%{_prefix}/lib/firewalld/services/kimchid.xml %endif %if 0%{?rhel} == 6 diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in index bf85661..5681a60 100644 --- a/contrib/kimchi.spec.suse.in +++ b/contrib/kimchi.spec.suse.in @@ -54,24 +54,6 @@ make rm -rf %{buildroot} make DESTDIR=%{buildroot} install -# create /var/lib/kimchi structure -mkdir -p %{buildroot}/%{_var}/lib/kimchi/{debugreports,screenshots,vnc-tokens,isos} -touch %{buildroot}/%{_var}/lib/kimchi/objectstore - -# create /var/log/kimchi structure -mkdir -p %{buildroot}/%{_localstatedir}/log/kimchi/ -touch %{buildroot}/%{_localstatedir}/log/kimchi/kimchi-access.log -touch %{buildroot}/%{_localstatedir}/log/kimchi/kimchi-error.log - -# create /etc/kimchi structure -mkdir -p %{buildroot}/%{_sysconfdir}/kimchi/ - -# create nginx configuration -touch %{buildroot}/%{_sysconfdir}/nginx/conf.d/kimchi.conf - -# Install the SysV init scripts -install -Dm 0755 contrib/kimchid.sysvinit %{buildroot}%{_initrddir}/kimchid - %post chkconfig kimchid on -- 2.1.0

2 10

Entering code freeze for Kimchi 1.5
by Aline Manera 09 Jun '15

09 Jun '15

Hi all, We are entering the code freeze phase for 1.5 release. That means only bug fixes will be merged from now on until the release announcement. Please, any help for testing Kimchi in the various Linux distributions is more than welcome. The test matrix is already updated: https://github.com/kimchi-project/kimchi/wiki/Testing-1.5 Please, update it according to your tests. I'd also want to ask your help to update the translations files. Regards, Aline Manera

2 2

[PATCH 0/4 v3][Memory HotPlug] Implements backend of memory device hotplug
by Rodrigo Trujillo 09 Jun '15

09 Jun '15

v3: * Implemented sugestions from Aline's review: - removed memory devices API; - Improved vm update function to check if vm is running and update memory accordingly; - moved xml function to xmlutils; - removed libvirt checking from attachDeviceFlags test function - moved maxMemory to osinfo.py * Fixed some issues with CPU update V2 - Fix erros in tests and add a test to slots number - Fix other minor issues with Libvirt < 1.2.14 V1 This patchset implements the backend part of memory hotplug functionality, including: - new feature test to check if libvirt supports memory devices - changes the way that memory is assigned or updated in the guest xml: * memory is now set in a basic NUMA node - includes maxMemory element in the XML: * which is equal the total memory of the host * sets memory device slots. The total number of slots are equal the maxMemory minus the memory assigned (1 slot == 1 GB ) - creates a new VM device, the memory device: * by default, a memory device will have 1GB * user can add the memory device with machine running or offline - memory devices are selected according to its position in the xml (the slot) 0, 1, 2, etc URL: - http://localhost:8010/vms/<VM>/memdevices - http://localhost:8010/vms/<VM>/memdevices/<MEM-DEV> Rodrigo Trujillo (4): [Memory HotPlug] Feature test to check support to memory devices [Memory HotPlug] Add maxMemory into templates [Memory HotPlug] Add maxMemory and numa configuration to guest xml [Memory HotPlug] Fix test and adds slot test src/kimchi/i18n.py | 7 ++ src/kimchi/model/config.py | 3 + src/kimchi/model/featuretests.py | 43 +++++++++++ src/kimchi/model/vms.py | 149 +++++++++++++++++++++++++++++++++++---- src/kimchi/osinfo.py | 4 ++ src/kimchi/vmtemplate.py | 28 +++++--- src/kimchi/xmlutils/cpu.py | 60 ++++++++++++++++ tests/test_model.py | 2 +- tests/test_rest.py | 4 +- tests/test_vmtemplate.py | 5 +- 10 files changed, 279 insertions(+), 26 deletions(-) create mode 100644 src/kimchi/xmlutils/cpu.py -- 2.1.0

3 7

[PATCH V2] Resize Actions button
by Socorro Stoppler 09 Jun '15

09 Jun '15

From: Socorro Stoppler <socorrob(a)us.ibm.com> V1 - V2: Changed Actions button width to span all 3 buttons above it Socorro Stoppler (1): Change button behavior for pause/resume VM ui/css/theme-default/list.css | 2 +- ui/js/src/kimchi.guest_main.js | 4 +++- ui/pages/guest.html.tmpl | 10 +++++----- 3 files changed, 9 insertions(+), 7 deletions(-) -- 1.9.1

2 3

[PATCH] Bug fix: Allow user creates multiple templates
by Aline Manera 09 Jun '15

09 Jun '15

While trying to create multiple templates I got the following error on console: [08/Jun/2015:12:57:23] HTTP Traceback (most recent call last): File "/usr/lib/python2.7/dist-packages/cherrypy/_cprequest.py", line 670, in respond response.body = self.handler() File "/usr/lib/python2.7/dist-packages/cherrypy/lib/encoding.py", line 217, in __call__ self.body = self.oldhandler(*args, **kwargs) File "/usr/lib/python2.7/dist-packages/cherrypy/_cpdispatch.py", line 61, in __call__ return self.callable(*self.args, **self.kwargs) File "/home/alinefm/kimchi/src/kimchi/control/base.py", line 330, in index return self.create(parse_request(), *args) File "/home/alinefm/kimchi/src/kimchi/control/base.py", line 262, in create name = create(*args) File "/home/alinefm/kimchi/src/kimchi/model/templates.py", line 48, in create user = UserTests().probe_user() File "/home/alinefm/kimchi/src/kimchi/kvmusertests.py", line 55, in probe_user flags=libvirt.VIR_DOMAIN_START_AUTODESTROY) File "/usr/lib/python2.7/dist-packages/libvirt.py", line 3424, in createXML if ret is None:raise libvirtError('virDomainCreateXML() failed', conn=self) libvirtError: operation failed: domain 'KVMUSERTEST_VM' already exists with uuid 2be4b2e8-f57a-4f87-8c24-5ac59d4bb4af The error happens because of a race condition while trying to get the kvm user (to validate the ISO file permissions). To avoid this problem, a lock was added to ensure the code is run once at a time. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/kvmusertests.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/kimchi/kvmusertests.py b/src/kimchi/kvmusertests.py index 37a80d7..315354e 100644 --- a/src/kimchi/kvmusertests.py +++ b/src/kimchi/kvmusertests.py @@ -18,6 +18,7 @@ import platform import psutil +import threading import libvirt @@ -36,18 +37,21 @@ class UserTests(object): <boot dev='hd'/> </os> </domain>""" + lock = threading.Lock() user = None @classmethod def probe_user(cls): - if cls.user: - return cls.user + with cls.lock: + if cls.user: + return cls.user arch = 'ppc64' if platform.machine() == 'ppc64le' \ else platform.machine() xml = cls.SIMPLE_VM_XML % {'name': KVMUSERTEST_VM_NAME, 'arch': arch} + cls.lock.acquire() with RollbackContext() as rollback: conn = libvirt.open(None) rollback.prependDefer(conn.close) @@ -67,6 +71,7 @@ class UserTests(object): else: cls.user = p.username + cls.lock.release() return cls.user -- 2.1.0

2 2

[PATCH] List IPs of VM Ifaces
by Christy Perez 09 Jun '15

09 Jun '15

Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- docs/API.md | 1 + src/kimchi/mockmodel.py | 9 +++++++++ src/kimchi/model/vmifaces.py | 28 ++++++++++++++++++++++++++++ tests/test_rest.py | 6 ++++++ 4 files changed, 44 insertions(+) diff --git a/docs/API.md b/docs/API.md index e022c9e..10e80ac 100644 --- a/docs/API.md +++ b/docs/API.md @@ -299,6 +299,7 @@ A interface represents available network interface on VM. * bridge *(optional)*: the name of resource bridge, only be available when the interface type is bridge. * mac: Media Access Control Address of the VM interface. + * ips: A list of IP addresses associated with this MAC. * model *(optional)*: model of emulated network interface card. It will be one of these models: ne2k_pci, i82551, i82557b, i82559er, rtl8139, e1000, pcnet and virtio. * network *(optional)*: the name of resource network, only be available when the diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index aaf1af2..3f74b80 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -24,6 +24,7 @@ import random import time import kimchi.model.cpuinfo +import kimchi.model.vmifaces from lxml import objectify from lxml.builder import E @@ -76,6 +77,7 @@ class MockModel(Model): kimchi.model.cpuinfo.get_topo_capabilities = \ MockModel.get_topo_capabilities + kimchi.model.vmifaces.getDHCPLeases = MockModel.getDHCPLeases libvirt.virConnect.defineXML = MockModel.domainDefineXML libvirt.virDomain.XMLDesc = MockModel.domainXMLDesc libvirt.virDomain.undefine = MockModel.undefineDomain @@ -235,6 +237,13 @@ class MockModel(Model): pool = vol.storagePoolLookupByVolume() pool.createXML(new_xml) + @staticmethod + def getDHCPLeases(net, mac): + return [{'iface': 'virbr1', 'ipaddr': '192.168.0.167', + 'hostname': 'kimchi', 'expirytime': 1433285036L, + 'prefix': 24, 'clientid': '01:%s' % mac, + 'mac': mac, 'iaid': None, 'type': 0}] + def _probe_image(self, path): return ('unknown', 'unknown') diff --git a/src/kimchi/model/vmifaces.py b/src/kimchi/model/vmifaces.py index 93a769b..630e4dc 100644 --- a/src/kimchi/model/vmifaces.py +++ b/src/kimchi/model/vmifaces.py @@ -29,6 +29,14 @@ from kimchi.model.vms import DOM_STATE_MAP, VMModel from kimchi.xmlutils.interface import get_iface_xml +def getDHCPLeases(net, mac): + try: + leases = net.DHCPLeases(mac) + return leases + except libvirt.libvirtError: + return [] + + class VMIfacesModel(object): def __init__(self, **kargs): self.conn = kargs['conn'] @@ -132,9 +140,29 @@ class VMIfaceModel(object): info['network'] = iface.source.get('network') if info['type'] == 'bridge': info['bridge'] = iface.source.get('bridge') + info['ips'] = self._get_ips(info['mac'], info['network']) return info + def _get_ips(self, mac, network): + ips = [] + conn = self.conn.get() + # An iface may have multiple IPs + # An IP could have been assigned without libvirt. + # First check the ARP cache. + with open('/proc/net/arp') as f: + ips = [line.split()[0] for line in f.xreadlines() if mac in line] + # Some ifaces may be inactive, so if the ARP cache didn't have them, + # and they happen to be assigned via DHCP, we can check there too. + net = conn.networkLookupByName(network) + leases = getDHCPLeases(net, mac) + for lease in leases: + ip = lease.get('ipaddr') + if ip not in ips: + ips.append(ip) + + return ips + def delete(self, vm, mac): dom = VMModel.get_vm(vm, self.conn) iface = self._get_vmiface(vm, mac) diff --git a/tests/test_rest.py b/tests/test_rest.py index 7fe6831..2145d00 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -707,6 +707,7 @@ class RestTests(unittest.TestCase): self.assertEquals(17, len(res['mac'])) self.assertEquals(get_template_default('old', 'nic_model'), res['model']) + self.assertTrue('ips' in res) # try to attach an interface without specifying 'model' req = json.dumps({'type': 'network'}) @@ -737,6 +738,11 @@ class RestTests(unittest.TestCase): newMacAddr).read()) self.assertEquals(newMacAddr, iface['mac']) + # Check for an IP address + iface = json.loads(self.request('/vms/test-vm/ifaces/%s' % + newMacAddr).read()) + self.assertTrue(len(iface['ips']) > 0) + # detach network interface from vm resp = self.request('/vms/test-vm/ifaces/%s' % iface['mac'], '{}', 'DELETE') -- 2.1.0

3 3

[PATCH 0/3 v3] Removing Yum API from Kimchi
by Daniel Henrique Barboza 09 Jun '15

09 Jun '15

x3: - skipping yumparser tests in Ubuntu - make check-local fixes The use of Yum API is causing a memory leak each time the Host tab is loaded. This can be verified by seeing the use of memory in $top. To remove the Yum API, a new module named 'yumparser' was created to manipulate Yum repositories directly from the filesystem and to return the software update list by parsing $yum check-update command. A new unit test file was created to verify the proper behavior of the yumparser module. Daniel Henrique Barboza (3): Adding yumparser module Unit tests for the yumparser module Changing repositories and swupdate to use yumparser module src/kimchi/repositories.py | 65 ++++------- src/kimchi/swupdate.py | 16 +-- src/kimchi/yumparser.py | 271 +++++++++++++++++++++++++++++++++++++++++++++ tests/test_yumparser.py | 111 +++++++++++++++++++ 4 files changed, 408 insertions(+), 55 deletions(-) create mode 100644 src/kimchi/yumparser.py create mode 100644 tests/test_yumparser.py -- 2.1.0

2 6

[PATCH] Change behavior of pause VM button
by Socorro Stoppler 08 Jun '15

08 Jun '15

From: Socorro Stoppler <socorrob(a)us.ibm.com> Make the Pause button behave like the Reset button Make the Resume icon in the tile more visible when hovering over it This addresses the following: https://github.com/kimchi-project/kimchi/issues/649#issuecomment-107569954 Socorro Stoppler (1): Change button behavior for pause/resume VM ui/css/theme-default/list.css | 2 +- ui/js/src/kimchi.guest_main.js | 4 +++- ui/pages/guest.html.tmpl | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) -- 1.9.1

3 5

[PATCH 0/4 v5] [Memory HotPlug] Implements backend of memory device hotplug
by Rodrigo Trujillo 05 Jun '15

05 Jun '15

v5: - Fix vmtemplate test in PPC v4: - Fix issues with tests - Add new memory hotplug test v3: * Implemented sugestions from Aline's review: - removed memory devices API; - Improved vm update function to check if vm is running and update memory accordingly; - moved xml function to xmlutils; - removed libvirt checking from attachDeviceFlags test function - moved maxMemory to osinfo.py * Fixed some issues with CPU update V2 - Fix erros in tests and add a test to slots number - Fix other minor issues with Libvirt < 1.2.14 V1 This patchset implements the backend part of memory hotplug functionality, including: - new feature test to check if libvirt supports memory devices - changes the way that memory is assigned or updated in the guest xml: * memory is now set in a basic NUMA node - includes maxMemory element in the XML: * which is equal the total memory of the host * sets memory device slots. The total number of slots are equal the maxMemory minus the memory assigned (1 slot == 1 GB ) - creates a new VM device, the memory device: * by default, a memory device will have 1GB * user can add the memory device with machine running or offline - memory devices are selected according to its position in the xml (the slot) 0, 1, 2, etc URL: - http://localhost:8010/vms/<VM>/memdevices - http://localhost:8010/vms/<VM>/memdevices/<MEM-DEV> Rodrigo Trujillo (4): [Memory HotPlug] Feature test to check support to memory devices [Memory HotPlug] Add maxMemory into templates [Memory HotPlug] Add maxMemory and numa configuration to guest xml [Memory HotPlug] Fix tests, adds slot and memory hotplug tests src/kimchi/i18n.py | 7 ++ src/kimchi/model/config.py | 3 + src/kimchi/model/featuretests.py | 50 +++++++++++++ src/kimchi/model/vms.py | 149 +++++++++++++++++++++++++++++++++++---- src/kimchi/osinfo.py | 4 ++ src/kimchi/vmtemplate.py | 28 +++++--- src/kimchi/xmlutils/cpu.py | 60 ++++++++++++++++ tests/test_model.py | 31 +++++++- tests/test_rest.py | 12 +++- tests/test_vmtemplate.py | 9 ++- 10 files changed, 326 insertions(+), 27 deletions(-) create mode 100644 src/kimchi/xmlutils/cpu.py -- 2.1.0

2 5

[PATCH 0/3 v2] Removing Yum API from Kimchi
by Daniel Henrique Barboza 05 Jun '15

05 Jun '15

The use of Yum API is causing a memory leak each time the Host tab is loaded. This can be verified by seeing the use of memory in $top. To remove the Yum API, a new module named 'yumparser' was created to manipulate Yum repositories directly from the filesystem and to return the software update list by parsing $yum check-update command. A new unit test file was created to verify the proper behavior of the yumparser module. Daniel Henrique Barboza (3): Adding yumparser module Unit tests for the yumparser module Changing repositories and swupdate to use yumparser module src/kimchi/repositories.py | 65 ++++------- src/kimchi/swupdate.py | 16 +-- src/kimchi/yumparser.py | 271 +++++++++++++++++++++++++++++++++++++++++++++ tests/test_yumparser.py | 109 ++++++++++++++++++ 4 files changed, 406 insertions(+), 55 deletions(-) create mode 100644 src/kimchi/yumparser.py create mode 100644 tests/test_yumparser.py -- 2.1.0

2 4

[PATCH] Fix issue: Kimchi always create qcow2 disk images
by Rodrigo Trujillo 05 Jun '15

05 Jun '15

If the user change disk format in template.conf, templates are going to be created correctly and vm xml as well. But, when the disk is created, the format is always qcow2. Removing the line: "fmt = 'raw' if self._get_storage_type() in ['logical'] else 'qcow2'" fixes the issue, since same checking is being done in __init__ in line 78. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/vmtemplate.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index e047228..e73c487 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -192,7 +192,6 @@ class VMTemplate(object): def to_volume_list(self, vm_uuid): storage_path = self._get_storage_path() - fmt = 'raw' if self._get_storage_type() in ['logical'] else 'qcow2' ret = [] for i, d in enumerate(self.info['disks']): index = d.get('index', i) @@ -200,11 +199,11 @@ class VMTemplate(object): info = {'name': volume, 'capacity': d['size'], - 'format': fmt, + 'format': d['format'], 'path': '%s/%s' % (storage_path, volume)} if 'logical' == self._get_storage_type() or \ - fmt not in ['qcow2', 'raw']: + d['format'] not in ['qcow2', 'raw']: info['allocation'] = info['capacity'] else: info['allocation'] = 0 -- 2.1.0

2 2

[PATCH 0/4 v4] [Memory HotPlug] Implements backend of memory device hotplug
by Rodrigo Trujillo 05 Jun '15

05 Jun '15

v4: - Fix issues with tests - Add new memory hotplug test v3: * Implemented sugestions from Aline's review: - removed memory devices API; - Improved vm update function to check if vm is running and update memory accordingly; - moved xml function to xmlutils; - removed libvirt checking from attachDeviceFlags test function - moved maxMemory to osinfo.py * Fixed some issues with CPU update V2 - Fix erros in tests and add a test to slots number - Fix other minor issues with Libvirt < 1.2.14 V1 This patchset implements the backend part of memory hotplug functionality, including: - new feature test to check if libvirt supports memory devices - changes the way that memory is assigned or updated in the guest xml: * memory is now set in a basic NUMA node - includes maxMemory element in the XML: * which is equal the total memory of the host * sets memory device slots. The total number of slots are equal the maxMemory minus the memory assigned (1 slot == 1 GB ) - creates a new VM device, the memory device: * by default, a memory device will have 1GB * user can add the memory device with machine running or offline - memory devices are selected according to its position in the xml (the slot) 0, 1, 2, etc URL: - http://localhost:8010/vms/<VM>/memdevices - http://localhost:8010/vms/<VM>/memdevices/<MEM-DEV> Rodrigo Trujillo (4): [Memory HotPlug] Feature test to check support to memory devices [Memory HotPlug] Add maxMemory into templates [Memory HotPlug] Add maxMemory and numa configuration to guest xml [Memory HotPlug] Fix tests, adds slot and memory hotplug tests src/kimchi/i18n.py | 7 ++ src/kimchi/model/config.py | 3 + src/kimchi/model/featuretests.py | 50 +++++++++++++ src/kimchi/model/vms.py | 149 +++++++++++++++++++++++++++++++++++---- src/kimchi/osinfo.py | 4 ++ src/kimchi/vmtemplate.py | 28 +++++--- src/kimchi/xmlutils/cpu.py | 60 ++++++++++++++++ tests/test_model.py | 31 +++++++- tests/test_rest.py | 12 +++- tests/test_vmtemplate.py | 5 +- 10 files changed, 322 insertions(+), 27 deletions(-) create mode 100644 src/kimchi/xmlutils/cpu.py -- 2.1.0

1 4

[PATCH] pep8 fixes
by Daniel Henrique Barboza 05 Jun '15

05 Jun '15

pep8 version 1.6.2 added a rule in which the logical operand must be before a line break, not after: "W503 line break before binary operator" Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> --- contrib/check_i18n.py | 4 ++-- src/kimchi/control/base.py | 4 ++-- src/kimchi/model/vms.py | 4 ++-- src/kimchi/model/vmstorages.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/check_i18n.py b/contrib/check_i18n.py index a7eeef6..6a2603c 100755 --- a/contrib/check_i18n.py +++ b/contrib/check_i18n.py @@ -55,8 +55,8 @@ def check_obsolete_messages(path, messages): for root, dirs, files in os.walk(path): for f in files: fname = os.path.join(root, f) - if (not fname.endswith("i18n.py") and fname.endswith(".py") - or fname.endswith(".json")): + if (not fname.endswith("i18n.py") and fname.endswith(".py") or + fname.endswith(".json")): with open(fname) as f: string = "".join(f.readlines()) if k in string: diff --git a/src/kimchi/control/base.py b/src/kimchi/control/base.py index b9520c0..006a6f7 100644 --- a/src/kimchi/control/base.py +++ b/src/kimchi/control/base.py @@ -112,8 +112,8 @@ class Resource(object): action_fn = getattr(self.model, model_fn(self, action_name)) action_result = action_fn(*model_args) if destructive is False or \ - ('persistent' in self.info.keys() - and self.info['persistent'] is True): + ('persistent' in self.info.keys() and + self.info['persistent'] is True): return render_fn(self, action_result) except MissingParameter, e: raise cherrypy.HTTPError(400, e.message) diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index ed1500e..2ef274c 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -598,8 +598,8 @@ class VMModel(object): expire = params['graphics'].get("passwdValidTo") to = graphics.attrib.get('passwdValidTo') if to is not None: - if (time.mktime(time.strptime(to, '%Y-%m-%dT%H:%M:%S')) - - time.time() <= 0): + if (time.mktime(time.strptime(to, '%Y-%m-%dT%H:%M:%S')) - + time.time() <= 0): expire = expire if expire is not None else 30 if expire is not None: diff --git a/src/kimchi/model/vmstorages.py b/src/kimchi/model/vmstorages.py index d3d4a8b..142b177 100644 --- a/src/kimchi/model/vmstorages.py +++ b/src/kimchi/model/vmstorages.py @@ -97,8 +97,8 @@ class VMStoragesModel(object): char = dev_list.pop()[2] params['index'] = string.ascii_lowercase.index(char) + 1 - if (params['bus'] not in HOTPLUG_TYPE - and DOM_STATE_MAP[dom.info()[0]] != 'shutoff'): + if (params['bus'] not in HOTPLUG_TYPE and + DOM_STATE_MAP[dom.info()[0]] != 'shutoff'): raise InvalidOperation('KCHVMSTOR0011E') if params.get('vol'): -- 2.1.0

2 1

[PATCH v3] UI-Template Edit: Enable user to change disk format
by Rodrigo Trujillo 05 Jun '15

05 Jun '15

v3: Implements suggestions from Aline: - Removed loops - Create IDs for SELECT elements v2: Implements suggestions from Cristian v1: Initial version Rodrigo Trujillo (1): UI-Template Edit: Enable user to change disk format ui/css/theme-default/template-edit.css | 8 ++++++-- ui/js/src/kimchi.template_edit_main.js | 37 ++++++++++++++++++++++++++++------ ui/pages/template-edit.html.tmpl | 18 ++++++++++++++++- 3 files changed, 54 insertions(+), 9 deletions(-) -- 2.1.0

2 2

[PATCH v4] Supress error messages while checking vm metadata
by Ramon Medeiros 05 Jun '15

05 Jun '15

The function FeatureTests.disable_libvirt_error_logging only removes the error message that will be displayed on the console. Libvirt also logs errors on messages log. To avoid flood messages log with metadata errors, it will be verified manually if the xml has the tag. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> Changes: v4: Fix make check-local errors v3: Discard all code writed before. Aline suggested me a nice workaround, check if the xml has metadata tag. --- src/kimchi/model/utils.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/kimchi/model/utils.py b/src/kimchi/model/utils.py index 0c9d519..7f27edd 100644 --- a/src/kimchi/model/utils.py +++ b/src/kimchi/model/utils.py @@ -22,7 +22,6 @@ from lxml import etree, objectify from lxml.builder import E, ElementMaker from kimchi.exception import OperationFailed -from kimchi.model.featuretests import FeatureTests KIMCHI_META_URL = "https://github.com/kimchi-project/kimchi" KIMCHI_NAMESPACE = "kimchi" @@ -84,7 +83,8 @@ def _kimchi_set_metadata_node(dom, node): def libvirt_get_kimchi_metadata_node(dom, mode="current"): - FeatureTests.disable_libvirt_error_logging() + if not metadata_exists(dom): + return None try: xml = dom.metadata(libvirt.VIR_DOMAIN_METADATA_ELEMENT, KIMCHI_META_URL, @@ -92,8 +92,6 @@ def libvirt_get_kimchi_metadata_node(dom, mode="current"): return etree.fromstring(xml) except libvirt.libvirtError: return None - finally: - FeatureTests.enable_libvirt_error_logging() def set_metadata_node(dom, node, metadata_support, mode="all"): @@ -151,3 +149,12 @@ def get_metadata_node(dom, tag, metadata_support, mode="current"): if node is not None: return etree.tostring(node) return "" + + +def metadata_exists(dom): + xml = dom.XMLDesc(libvirt.VIR_DOMAIN_XML_INACTIVE) + root = etree.fromstring(xml) + + if root.find("metadata") is None: + return False + return True -- 2.1.0

3 2

[PATCH 0/3] Removing Yum API from Kimchi
by Daniel Henrique Barboza 04 Jun '15

04 Jun '15

From: Daniel Henrique Barboza <dhbarboza82(a)gmmail.com> The use of Yum API is causing a memory leak each time the Host tab is loaded. This can be verified by seeing the use of memory in $top. To remove the Yum API, a new module named 'yumparser' was created to manipulate Yum repositories directly from the filesystem and to return the software update list by parsing $yum check-update command. A new unit test file was created to verify the proper behavior of the yumparser module. Daniel Henrique Barboza (3): Adding yumparser module Unit tests for the yumparser module Changing repositories and swupdate to use yumparser module src/kimchi/repositories.py | 65 ++++------- src/kimchi/swupdate.py | 16 +-- src/kimchi/yumparser.py | 271 +++++++++++++++++++++++++++++++++++++++++++++ tests/test_yumparser.py | 109 ++++++++++++++++++ 4 files changed, 406 insertions(+), 55 deletions(-) create mode 100644 src/kimchi/yumparser.py create mode 100644 tests/test_yumparser.py -- 2.1.0

1 4

[PATCH v3] Supress error messages while checking vm metadata
by Ramon Medeiros 04 Jun '15

04 Jun '15

The function FeatureTests.disable_libvirt_error_logging only removes the error message that will be displayed on the console. Libvirt also logs errors on messages log. To avoid flood messages log with metadata errors, it will be verified manually if the xml has the tag. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> Changes: v3: Discard all code writed before. Aline suggested me a nice workaround, check if the xml has metadata tag. --- src/kimchi/model/utils.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/kimchi/model/utils.py b/src/kimchi/model/utils.py index 0c9d519..d4994d5 100644 --- a/src/kimchi/model/utils.py +++ b/src/kimchi/model/utils.py @@ -84,7 +84,8 @@ def _kimchi_set_metadata_node(dom, node): def libvirt_get_kimchi_metadata_node(dom, mode="current"): - FeatureTests.disable_libvirt_error_logging() + if not metadata_exists(dom): + return None try: xml = dom.metadata(libvirt.VIR_DOMAIN_METADATA_ELEMENT, KIMCHI_META_URL, @@ -92,8 +93,6 @@ def libvirt_get_kimchi_metadata_node(dom, mode="current"): return etree.fromstring(xml) except libvirt.libvirtError: return None - finally: - FeatureTests.enable_libvirt_error_logging() def set_metadata_node(dom, node, metadata_support, mode="all"): @@ -151,3 +150,12 @@ def get_metadata_node(dom, tag, metadata_support, mode="current"): if node is not None: return etree.tostring(node) return "" + +def metadata_exists(dom): + xml = dom.XMLDesc(libvirt.VIR_DOMAIN_XML_INACTIVE) + root = etree.fromstring(xml) + + if root.find("metadata") == None: + return False + return True + -- 2.1.0

1 1

[PATCH V2]
by Socorro Stoppler 02 Jun '15

02 Jun '15

From: Socorro Stoppler <socorrob(a)us.ibm.com> V1 - V2: - The image in the tile section is no longer shifted down when VM is paused. - Removed tabs and replaced with spaces throughout the code. Socorro Stoppler (1): Add support for Pause/Resume UI ui/css/theme-default/button.css | 20 +++++ ui/css/theme-default/list.css | 24 +++++- ui/images/theme-default/ac22_pause.png | Bin 0 -> 1219 bytes ui/images/theme-default/ac22_pause_grey.png | Bin 0 -> 1175 bytes ui/images/theme-default/ac24_resume.png | Bin 0 -> 1341 bytes ui/images/theme-default/ac24_resume_grey.png | Bin 0 -> 1282 bytes ui/js/src/kimchi.api.js | 22 ++++++ ui/js/src/kimchi.guest_main.js | 109 +++++++++++++++++++++++---- ui/pages/guest.html.tmpl | 4 + 9 files changed, 161 insertions(+), 18 deletions(-) create mode 100644 ui/images/theme-default/ac22_pause.png create mode 100644 ui/images/theme-default/ac22_pause_grey.png create mode 100644 ui/images/theme-default/ac24_resume.png create mode 100644 ui/images/theme-default/ac24_resume_grey.png -- 1.9.1

3 7

[PATCH 0/2] Pause/resume support in UI
by Socorro Stoppler 02 Jun '15

02 Jun '15

From: Socorro Stoppler <socorrob(a)us.ibm.com> Add support for pause/resume VM via the UI Socorro Stoppler (2): First changes for pause/resume UI Add support for Pause/Resume UI ui/css/theme-default/button.css | 20 +++++ ui/css/theme-default/list.css | 6 ++ ui/images/theme-default/ac22_pause.png | Bin 0 -> 1219 bytes ui/images/theme-default/ac22_pause_grey.png | Bin 0 -> 1175 bytes ui/images/theme-default/ac24_resume.png | Bin 0 -> 1341 bytes ui/images/theme-default/ac24_resume_grey.png | Bin 0 -> 1282 bytes ui/js/src/kimchi.api.js | 23 ++++++ ui/js/src/kimchi.guest_main.js | 114 +++++++++++++++++++++++---- ui/pages/guest.html.tmpl | 4 + 9 files changed, 152 insertions(+), 15 deletions(-) create mode 100644 ui/images/theme-default/ac22_pause.png create mode 100644 ui/images/theme-default/ac22_pause_grey.png create mode 100644 ui/images/theme-default/ac24_resume.png create mode 100644 ui/images/theme-default/ac24_resume_grey.png -- 1.9.1

4 12

[PATCH 0/3 V2] Storage volume upload UI
by Aline Manera 01 Jun '15

01 Jun '15

V1 - V2: - Deal with non-existing file and read permission errors Aline Manera (3): Storage volume upload: Keep the task tracking to update the UI Storage volume upload: Let the 'format' parameter be an empty string Enable storage volume upload on UI src/kimchi/API.json | 2 +- src/kimchi/mockmodel.py | 3 +- src/kimchi/model/storagevolumes.py | 20 +++++-- tests/test_model_storagevolume.py | 2 +- ui/js/src/kimchi.api.js | 25 +++++++-- ui/js/src/kimchi.storagepool_add_volume_main.js | 73 ++++++++++++++++++++++--- ui/pages/i18n.json.tmpl | 2 + ui/pages/storagepool-add-volume.html.tmpl | 4 +- 8 files changed, 107 insertions(+), 24 deletions(-) -- 2.1.0

2 7

[PATCH v3] Does not list non-bootable images
by Ramon Medeiros 01 Jun '15

01 Jun '15

Also fix tests that were using non-bootable isos. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> Changes: v3: Fix errors listed by make check-local v2: Fix tests that were listing non-bootable isos --- src/kimchi/model/storagevolumes.py | 2 +- tests/test_rest.py | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/kimchi/model/storagevolumes.py b/src/kimchi/model/storagevolumes.py index 9165946..4cc3a0d 100644 --- a/src/kimchi/model/storagevolumes.py +++ b/src/kimchi/model/storagevolumes.py @@ -527,7 +527,7 @@ class IsoVolumesModel(object): for volume in volumes: res = self.storagevolume.lookup(pool_name, volume.decode("utf-8")) - if res['format'] == 'iso': + if res['format'] == 'iso' and res['bootable']: res['name'] = '%s' % volume iso_volumes.append(res) return iso_volumes diff --git a/tests/test_rest.py b/tests/test_rest.py index 72ff14f..7fe6831 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -61,12 +61,15 @@ def setUpModule(): # Create fake ISO to do the tests iso_gen.construct_fake_iso(fake_iso, True, '12.04', 'ubuntu') + iso_gen.construct_fake_iso("/var/lib/libvirt/images/fedora.iso", True, + "17", "fedora") def tearDownModule(): test_server.stop() os.unlink('/tmp/obj-store-test') os.unlink(fake_iso) + os.unlink("/var/lib/libvirt/images/fedora.iso") class RestTests(unittest.TestCase): @@ -928,9 +931,9 @@ class RestTests(unittest.TestCase): storagevolume['path']) self.assertEquals(1073741824, storagevolume['capacity']) # 1 GiB self.assertEquals(0, storagevolume['allocation']) - self.assertEquals('unknown', storagevolume['os_version']) - self.assertEquals('unknown', storagevolume['os_distro']) - self.assertEquals(False, storagevolume['bootable']) + self.assertEquals('17', storagevolume['os_version']) + self.assertEquals('fedora', storagevolume['os_distro']) + self.assertEquals(True, storagevolume['bootable']) # Create a template # In real model os distro/version can be omitted @@ -945,8 +948,8 @@ class RestTests(unittest.TestCase): # Verify the template t = json.loads(self.request('/templates/test').read()) self.assertEquals('test', t['name']) - self.assertEquals('unknown', t['os_distro']) - self.assertEquals('unknown', t['os_version']) + self.assertEquals('fedora', t['os_distro']) + self.assertEquals('17', t['os_version']) self.assertEquals(get_template_default('old', 'memory'), t['memory']) # Deactivate or destroy scan pool return 405 -- 2.1.0

2 1

[PATCH v2] Does not list non-bootable images
by Ramon Medeiros 01 Jun '15

01 Jun '15

Also fix tests that were using non-bootable isos. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> Changes v2: Fix tests that were listing non-bootable isos --- src/kimchi/model/storagevolumes.py | 2 +- tests/test_rest.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/kimchi/model/storagevolumes.py b/src/kimchi/model/storagevolumes.py index dc807e4..e88c2cb 100644 --- a/src/kimchi/model/storagevolumes.py +++ b/src/kimchi/model/storagevolumes.py @@ -530,7 +530,7 @@ class IsoVolumesModel(object): for volume in volumes: res = self.storagevolume.lookup(pool_name, volume.decode("utf-8")) - if res['format'] == 'iso': + if res['format'] == 'iso' and res['bootable']: res['name'] = '%s' % volume iso_volumes.append(res) return iso_volumes diff --git a/tests/test_rest.py b/tests/test_rest.py index 914b602..9e5988b 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -61,13 +61,14 @@ def setUpModule(): # Create fake ISO to do the tests iso_gen.construct_fake_iso(fake_iso, True, '12.04', 'ubuntu') - + iso_gen.construct_fake_iso("/var/lib/libvirt/images/fedora.iso", True, + "17", "fedora") def tearDownModule(): test_server.stop() os.unlink('/tmp/obj-store-test') os.unlink(fake_iso) - + os.unlink("/var/lib/libvirt/images/fedora.iso") class RestTests(unittest.TestCase): def _async_op(self, cb, opaque): @@ -926,9 +927,9 @@ class RestTests(unittest.TestCase): storagevolume['path']) self.assertEquals(1073741824, storagevolume['capacity']) # 1 GiB self.assertEquals(0, storagevolume['allocation']) - self.assertEquals('unknown', storagevolume['os_version']) - self.assertEquals('unknown', storagevolume['os_distro']) - self.assertEquals(False, storagevolume['bootable']) + self.assertEquals('17', storagevolume['os_version']) + self.assertEquals('fedora', storagevolume['os_distro']) + self.assertEquals(True, storagevolume['bootable']) # Create a template # In real model os distro/version can be omitted @@ -943,8 +944,8 @@ class RestTests(unittest.TestCase): # Verify the template t = json.loads(self.request('/templates/test').read()) self.assertEquals('test', t['name']) - self.assertEquals('unknown', t['os_distro']) - self.assertEquals('unknown', t['os_version']) + self.assertEquals('fedora', t['os_distro']) + self.assertEquals('17', t['os_version']) self.assertEquals(get_template_default('old', 'memory'), t['memory']) # Deactivate or destroy scan pool return 405 @@ -1187,7 +1188,6 @@ class RestTests(unittest.TestCase): resp = self.request('%s/fedora-fake' % base_uri, '{}', 'DELETE') self.assertEquals(204, resp.status) - class HttpsRestTests(RestTests): """ Run all of the same tests as above, but use https instead -- 2.1.0

3 5

[PATCH 0/3 V4] Storage volume upload UI
by Aline Manera 01 Jun '15

01 Jun '15

V3 - V4: - Rebase V2 - V3: - Adjust error handlers to work with Chrome V1 - V2: - Deal with non-existing file and read permission errors Aline Manera (3): Storage volume upload: Keep the task tracking to update the UI Storage volume upload: Let the 'format' parameter be an empty string Enable storage volume upload on UI src/kimchi/API.json | 2 +- src/kimchi/mockmodel.py | 3 +- src/kimchi/model/storagevolumes.py | 20 ++++-- tests/test_model_storagevolume.py | 2 +- ui/js/src/kimchi.api.js | 25 +++++-- ui/js/src/kimchi.storagepool_add_volume_main.js | 96 +++++++++++++++++++++---- ui/pages/i18n.json.tmpl | 2 + ui/pages/storagepool-add-volume.html.tmpl | 4 +- 8 files changed, 126 insertions(+), 28 deletions(-) -- 2.1.0

2 5

[PATCH] Add DESTDIR to make install
by Ramon Medeiros 01 Jun '15

01 Jun '15

Commit 04d29530 was incomplete by not using DESTDIR on installation. This can cause trouble when creating the rpm. Also, make install now is installing correctly service and firewall configuration files. --- Makefile.am | 54 +++++++++++++++++++++++++++++++------------ contrib/kimchi.spec.fedora.in | 3 --- 2 files changed, 39 insertions(+), 18 deletions(-) diff --git a/Makefile.am b/Makefile.am index 91a0fa2..46e0e0e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -116,26 +116,50 @@ ChangeLog: install-data-local: @if test -d /usr/lib/systemd/system/ ; then \ - $(INSTALL_DATA) contrib/kimchid.service.fedora /usr/lib/systemd/system/kimchid.service; \ - systemctl daemon-reload; \ + mkdir -p $(DESTDIR)/usr/lib/systemd/system/; \ + $(INSTALL_DATA) contrib/kimchid.service.fedora $(DESTDIR)/usr/lib/systemd/system/kimchid.service; \ elif test -d /etc/systemd/system; then \ - $(INSTALL_DATA) contrib/kimchid.service.fedora /etc/systemd/system/kimchid.service; \ - systemctl daemon-reload; \ - else \ - $(INSTALL_DATA) contrib/kimchid.sysvinit /etc/init.d/kimchid; \ - chmod +x /etc/init.d/kimchid; \ - fi + mkdir -p $(DESTDIR)/etc/systemd/system/; \ + $(INSTALL_DATA) contrib/kimchid.service.fedora $(DESTDIR)/etc/systemd/system/kimchid.service; \ + else \ + mkdir -p $(DESTDIR)/etc/init.d/ \ + $(INSTALL_DATA) contrib/kimchid.sysvinit $(DESTDIR)/etc/init.d/kimchid; \ + chmod +x $(DESTDIR)/etc/init.d/kimchid; \ + if test -f /etc/fedora-release || test -f /etc/redhat-release; then \ + $(INSTALL_DATA) contrib/kimchid-upstart.conf.fedora $(DESTDIR)/etc/init/kimchi.conf; \ + elif test -f /etc/debian_version; then \ + $(INSTALL_DATA) contrib/kimchid-upstart.conf.debian $(DESTDIR)/etc/init/kimchi.conf; \ + fi; \ + fi; \ + if test -d /usr/lib/firewalld/services/; then \ + mkdir -p $(DESTDIR)/usr/lib/firewalld/services/; \ + $(INSTALL_DATA) src/firewalld.xml $(DESTDIR)/usr/lib/firewalld/services/kimchid.xml; \ + fi; \ + mkdir -p $(DESTDIR)/var/lib/kimchi/{debugreports,screenshots,vnc-tokens,isos} + touch $(DESTDIR)/var/lib/kimchi/objectstore + mkdir -p $(DESTDIR)/var/log/kimchi/ + touch $(DESTDIR)/var/log/kimchi/kimchi-access.log + touch $(DESTDIR)/var/log/kimchi/kimchi-error.log + mkdir -p $(DESTDIR)/etc/kimchi/ + touch $(DESTDIR)/etc/nginx/conf.d/kimchi.conf uninstall-local: @if test -f /usr/lib/systemd/system/kimchid.service; then \ - $(RM) /usr/lib/systemd/system/kimchid.service; \ - systemctl daemon-reload; \ - elif test -f /etc/systemd/system/kimchid.service; then \ - $(RM) /etc/systemd/system/kimchid.service; \ + $(RM) $(DESTDIR)/usr/lib/systemd/system/kimchid.service; \ + elif test -f $(DESTDIR)/etc/systemd/system/kimchid.service; then \ + $(RM) $(DESTDIR)/etc/systemd/system/kimchid.service; \ elif test -f /etc/init.d/kimchid; then \ - $(RM) /etc/init.d/kimchid; \ - fi - + $(RM) $(DESTDIR)/etc/init.d/kimchid; \ + $(RM) $(DESTDIR)/etc/init/kimchi.conf; \ + fi; \ + if test -d /usr/lib/firewalld/services/; then \ + $(RM) $(DESTDIR)/usr/lib/firewalld/services/kimchid.xml; \ + fi; \ + $(RM) -rf $(DESTDIR)/var/lib/kimchi + $(RM) -rf $(DESTDIR)/var/log/kimchi + $(RM) -rf $(DESTDIR)/etc/kimchi + $(RM) $(DESTDIR)/etc/nginx/conf.d/kimchi.conf + VERSION: @if test -d .git; then \ git describe --abbrev=0 > $@; \ diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index 30f8417..4e12327 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -98,9 +98,6 @@ touch %{buildroot}/%{_localstatedir}/log/kimchi/kimchi-error.log mkdir -p %{buildroot}/%{_sysconfdir}/kimchi/ touch %{buildroot}/%{_sysconfdir}/nginx/conf.d/kimchi.conf -# Install the systemd scripts -install -Dm 0644 contrib/kimchid.service.fedora %{buildroot}%{_unitdir}/kimchid.service -install -Dm 0640 src/firewalld.xml %{buildroot}%{_prefix}/lib/firewalld/services/kimchid.xml %endif %if 0%{?rhel} == 6 -- 2.1.0

3 6