November 2014 - Kimchi-devel - oVirt List Archives

[RFC] New API to create a random guest console password
by Aline Manera 02 Apr '15

02 Apr '15

Today user may set/change the guest console password and also its expiration time through Kimchi API. When passing an empty password, a random password is automatically generated. curl -u <user:password> -H "Content-Type: application/json" -H "Accept: application/json" http://localhost:8010/vms/blah -X PUT -d'{"graphics": {"passwd": ""}}' That way is difficult to handle when user wants to reset the guest password. We have a similar issue when we automatically change the passwdValidTo when it is expired - increasing it in 30 seconds. My proposal is simple: only change "passwd" and "passwdValidTo" when user wants to do it. curl -u <user:password> -H "Content-Type: application/json" -H "Accept: application/json" http://localhost:8010/vms/blah -X PUT -d'{"graphics": {"passwd": "123456", "passwdValidTo": "<some datetime format>"}}' curl -u <user:password> -H "Content-Type: application/json" -H "Accept: application/json" http://localhost:8010/vms/blah -X PUT -d'{"graphics": {"passwdValidTo": "<some datetime format>"}}' And make sure the passwdValidTo is only acceptable when there is a passwd set. And to reset those values, we only need to send an empty string: curl -u <user:password> -H "Content-Type: application/json" -H "Accept: application/json" http://localhost:8010/vms/blah -X PUT -d'{"graphics": {"password": "", "passwdValidTo": ""}}' And create a new API: POST /vms/blah/ticket to automatically generate a random password valid only for 30 seconds. curl -u <user:password> -H "Content-Type: application/json" -H "Accept: application/json" http://localhost:8010/vms/blah/ticket -X POST -d'{}' What do you think about it? Regards, Aline Manera

2 3

CPU discussion (RE: psutil.NUM_CPUS)
by Christy Perez 29 Jan '15

29 Jan '15

After my confusion on Paulo's patch a few weeks ago, I thought I had just gotten confused, and so I put psutil.NUM_CPUS in my SMT/HT patch. However, testing now on x86, I'm noticing a difference in the way Power and x86 report CPUS. On my laptop: <cpu> <arch>x86_64</arch> <model>SandyBridge</model> <vendor>Intel</vendor> <topology sockets='1' cores='2' threads='2'/> psutil.NUM_CPUS returns 4 On a Power7 system with 16 cores, 4 threads/core (so 64 total threads), psutil.NUM_CPUS returns 16. And this is, it turns out, because (and this sounds odd) for *guests* to be able to do SMT on Power, SMT has to be disabled. So, psutil.NUM_CPUS will not report the number of vCPUs that are available to guests. The same change would happen on x86 if you disabled HT, I assume. So, revisiting this difference that I noticed but wasn't able to articulate very well last time, do we want to make a change to the host code to use ppc64_cpu if the arch is Power, instead of psutil.NUM_CPUS? SMT *is* off, so, technically this isn't correct, but I think we should provide this information with guests in mind since we are a virtualization platform. Regards, - Christy

2 1

[PATCH] UI: Use capabilities cached values on 'Host PCI Device' tab
by Aline Manera 05 Dec '14

05 Dec '14

Kimchi capabilities are cached on UI to avoid multiples request to it as those values does not change with high frequency. So use the cached values to check host has kernel_vfio capability. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 132 ++++++++++++++++++------------------ 1 file changed, 65 insertions(+), 67 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 9d87a73..359add8 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -360,77 +360,75 @@ kimchi.guest_edit_main = function() { var setupPCIDevice = function(){ kimchi.getHostPCIDevices(function(hostPCIs){ kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs){ - kimchi.getCapabilities(function(result) { - var pciEnabled = result.kernel_vfio; - for(var i=0; i<hostPCIs.length; i++){ - var itemNode = $.parseHTML(kimchi.substitute($('#pci-tmpl').html(),{ - name: hostPCIs[i].name, - product: hostPCIs[i].product.description, - vendor: hostPCIs[i].vendor.description - })); - $(".body", "#form-guest-edit-pci").append(itemNode); - var iconClass = "ui-icon-plus"; - for(var j=0; j<vmPCIs.length; j++){ - if(hostPCIs[i].name==vmPCIs[j].name){ - iconClass = "ui-icon-minus"; - break; - } + var pciEnabled = kimchi.capabilities.kernel_vfio; + for(var i=0; i<hostPCIs.length; i++){ + var itemNode = $.parseHTML(kimchi.substitute($('#pci-tmpl').html(),{ + name: hostPCIs[i].name, + product: hostPCIs[i].product.description, + vendor: hostPCIs[i].vendor.description + })); + $(".body", "#form-guest-edit-pci").append(itemNode); + var iconClass = "ui-icon-plus"; + for(var j=0; j<vmPCIs.length; j++){ + if(hostPCIs[i].name==vmPCIs[j].name){ + iconClass = "ui-icon-minus"; + break; } - pciEnabled || $("button", itemNode).remove(); - $("button", itemNode).button({ - icons: { primary: iconClass }, - text: false - }).click(function(){ - var obj = $(this); - if(obj.button("option", "icons").primary == "ui-icon-minus"){ - kimchi.removeVMPCIDevice(kimchi.selectedGuest, obj.parent().prop("id"), function(){ - kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs1){ - for(var k=0; k<hostPCIs.length; k++) { - $("button", "#" + hostPCIs[k].name).button("option", "icons", {primary: "ui-icon-plus"}); - } - for(var k=0; k<vmPCIs1.length; k++) { - $("button", "#" + vmPCIs1[k].name).button("option", "icons", {primary: "ui-icon-minus"}); - } - }); - filterNodes($("select", "#form-guest-edit-pci").val(), $("input", "#form-guest-edit-pci").val()); + } + pciEnabled || $("button", itemNode).remove(); + $("button", itemNode).button({ + icons: { primary: iconClass }, + text: false + }).click(function(){ + var obj = $(this); + if(obj.button("option", "icons").primary == "ui-icon-minus"){ + kimchi.removeVMPCIDevice(kimchi.selectedGuest, obj.parent().prop("id"), function(){ + kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs1){ + for(var k=0; k<hostPCIs.length; k++) { + $("button", "#" + hostPCIs[k].name).button("option", "icons", {primary: "ui-icon-plus"}); + } + for(var k=0; k<vmPCIs1.length; k++) { + $("button", "#" + vmPCIs1[k].name).button("option", "icons", {primary: "ui-icon-minus"}); + } }); - }else{ - kimchi.addVMPCIDevice(kimchi.selectedGuest, { name: obj.parent().prop("id") }, function(){ - kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs1){ - for(var k=0; k<vmPCIs1.length; k++) { - $("button", "#" + vmPCIs1[k].name).button("option", "icons", {primary: "ui-icon-minus"}); - } - }); - filterNodes($("select", "#form-guest-edit-pci").val(), $("input", "#form-guest-edit-pci").val()); + filterNodes($("select", "#form-guest-edit-pci").val(), $("input", "#form-guest-edit-pci").val()); + }); + } else { + kimchi.addVMPCIDevice(kimchi.selectedGuest, { name: obj.parent().prop("id") }, function(){ + kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs1){ + for(var k=0; k<vmPCIs1.length; k++) { + $("button", "#" + vmPCIs1[k].name).button("option", "icons", {primary: "ui-icon-minus"}); + } }); + filterNodes($("select", "#form-guest-edit-pci").val(), $("input", "#form-guest-edit-pci").val()); + }); + } + }); + kimchi.getPCIDeviceCompanions(hostPCIs[i].name, function(infoData) { + var pciTitle = i18n["KCHVMED6007M"] + "\n"; + var haveCompanions = false; + for(var p=0; p<infoData.length; p++) { + if(infoData[p].device_type === "net") { + haveCompanions = true; + pciTitle += " " + infoData[p].name + "\n"; + pciTitle += " " + i18n["KCHVMED6001M"] + " " + infoData[p].interface; + pciTitle += ", " + i18n["KCHVMED6002M"] + " " + infoData[p].address; + pciTitle += ", " + i18n["KCHVMED6003M"] + " " + infoData[p].link_type + "\n"; + } else if(infoData[p].device_type === "storage") { + haveCompanions = true; + pciTitle += " " + infoData[p].name + "\n"; + pciTitle += " " + i18n["KCHVMED6004M"] + " " + infoData[p].block; + pciTitle += ", " + i18n["KCHVMED6005M"] + " " + infoData[p].drive_type; + pciTitle += ", " + i18n["KCHVMED6006M"] + " " + infoData[p].model + "\n"; } - }); - kimchi.getPCIDeviceCompanions(hostPCIs[i].name, function(infoData) { - var pciTitle = i18n["KCHVMED6007M"] + "\n"; - var haveCompanions = false; - for(var p=0; p<infoData.length; p++) { - if(infoData[p].device_type === "net") { - haveCompanions = true; - pciTitle += " " + infoData[p].name + "\n"; - pciTitle += " " + i18n["KCHVMED6001M"] + " " + infoData[p].interface; - pciTitle += ", " + i18n["KCHVMED6002M"] + " " + infoData[p].address; - pciTitle += ", " + i18n["KCHVMED6003M"] + " " + infoData[p].link_type + "\n"; - } else if(infoData[p].device_type === "storage") { - haveCompanions = true; - pciTitle += " " + infoData[p].name + "\n"; - pciTitle += " " + i18n["KCHVMED6004M"] + " " + infoData[p].block; - pciTitle += ", " + i18n["KCHVMED6005M"] + " " + infoData[p].drive_type; - pciTitle += ", " + i18n["KCHVMED6006M"] + " " + infoData[p].model + "\n"; - } - } - for(var q=0; q<infoData.length; q++) { - haveCompanions && $(".name", "#" + infoData[q].parent).attr("title", pciTitle); - haveCompanions && $(".product", "#" + infoData[q].parent).attr("title", pciTitle); - haveCompanions && $(".vendor", "#" + infoData[q].parent).attr("title", pciTitle); - } - }); - } - }); + } + for(var q=0; q<infoData.length; q++) { + haveCompanions && $(".name", "#" + infoData[q].parent).attr("title", pciTitle); + haveCompanions && $(".product", "#" + infoData[q].parent).attr("title", pciTitle); + haveCompanions && $(".vendor", "#" + infoData[q].parent).attr("title", pciTitle); + } + }); + } }); }); var filterNodes = function(group, text){ -- 1.9.3

3 3

[PATCH] Bugfix: Disable actions not supported by non-persistent VMs
by Wen Wang 04 Dec '14

04 Dec '14

1) Disable "Reset" and "Delete" buttons when using non-persistent VMs 2) Disable "Reset" button when VM is shutdown Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/list.css | 11 +++++++++++ ui/js/src/kimchi.guest_main.js | 7 +++++-- ui/pages/guest.html.tmpl | 10 +++++----- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/ui/css/theme-default/list.css b/ui/css/theme-default/list.css index ded18eb..52cccc4 100644 --- a/ui/css/theme-default/list.css +++ b/ui/css/theme-default/list.css @@ -228,6 +228,17 @@ padding: 7px 10px; } +.guest-actions .top button { + display: inline-block; + width: 42px; + height: 42px; +} + +.guest-actions .top button span { + margin-left: -3px; + margin-top: -1px; +} + .guest-actions .bottom { padding: 0 10px; } diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index 2fd5c55..21caf1b 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -252,6 +252,7 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { //Setup the VM list entry var vmRunningBool=(vmObject.state=="running"); + var vmPersistent = (vmObject.persistent == true); result.attr('id',vmObject.name); result.data(vmObject); @@ -302,8 +303,10 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { //Setup the VM Actions var guestActions=result.find("div[name=guest-actions]"); - guestActions.find(".shutoff-disabled").prop('disabled', !vmRunningBool ); - guestActions.find(".running-disabled").prop('disabled', vmRunningBool ); + guestActions.find(".shutoff-disabled").prop("disabled", !vmRunningBool); + guestActions.find(".running-disabled").prop("disabled", vmRunningBool); + guestActions.find(".non-persistent-disabled").prop("disabled", !vmPersistent); + guestActions.find(".reset-disabled").prop("disabled", !vmRunningBool || !vmPersistent); if (vmRunningBool) { guestActions.find(".running-hidden").hide(); diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl index ebb5e86..3cc2fad 100644 --- a/ui/pages/guest.html.tmpl +++ b/ui/pages/guest.html.tmpl @@ -50,9 +50,9 @@ </div> <div class="sortable guest-actions" name="guest-actions"> <div class="top"> - <a class="btn shutoff-disabled" name="vm-reset" href="javascript:void(0);" title="$_("Reset")"><span class="icon reset"></span></a> - <a class="btn running-hidden" name="vm-start" href="javascript:void(0);" title="$_("Start")"><span class="icon power-down"></span></a> - <a class="btn shutoff-hidden" name="vm-poweroff" href="javascript:void(0);" title="$_("Power Off")"><span class="icon power-up"></span></a> + <button class="btn reset-disabled" name="vm-reset" href="javascript:void(0);" title="$_("Reset")"><span class="icon reset"></span></button> + <button class="btn running-hidden" name="vm-start" href="javascript:void(0);" title="$_("Start")"><span class="icon power-down"></span></button> + <button class="btn shutoff-hidden" name="vm-poweroff" href="javascript:void(0);" title="$_("Power Off")"><span class="icon power-up"></span></button> </div> <div class="bottom"> <div name="actionmenu" class="btn dropdown popable vm-action" style="width: 70px"> @@ -61,11 +61,11 @@ <button class="button-big shutoff-disabled" name="vm-console" ><span class="text">$_("Connect")</span></button> <button class="button-big running-disabled" name="vm-clone"><span class="text">$_("Clone")</span></button> <button class="button-big" name="vm-edit"><span class="text">$_("Edit")</span></button> - <button class="button-big shutoff-hidden" name="vm-reset"><span class="text">$_("Reset")</span></button> + <button class="button-big shutoff-hidden non-persistent-disabled" name="vm-reset"><span class="text">$_("Reset")</span></button> <button class="button-big shutoff-hidden" name="vm-shutdown"><span class="text">$_("Shut Down")</span></button> <button class="button-big running-hidden" name="vm-start"><span class="text">$_("Start")</span></button> <button class="button-big shutoff-hidden" name="vm-poweroff"><span class="text">$_("Power Off")</span></button> - <a class="button-big red " name="vm-delete">$_("Delete")</a> + <button class="button-big red non-persistent-disabled" name="vm-delete">$_("Delete")</button> </div> </div> </div> -- 1.9.3

2 1

[PATCH] Change pattern match in pep8 filtering
by lvroyce＠linux.vnet.ibm.com 04 Dec '14

04 Dec '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Files like "./src/kimchi/i18n.py" will be warned with error by pep8 because pep8 uses wildcard searching instead of interpreting path of file. So change pattern to fix this problem. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index ec88787..62b10fc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,7 +34,7 @@ EXTRA_DIST = \ $(NULL) -PEP8_BLACKLIST = src/kimchi/config.py,src/kimchi/i18n.py,tests/test_config.py +PEP8_BLACKLIST = *src/kimchi/config.py,*src/kimchi/i18n.py,*tests/test_config.py SKIP_PYFLAKES_ERR = "\./src/kimchi/websocket\.py" -- 1.8.3.2

4 3

[PATCH 0/2] More snapshot bugfixes
by Crístian Viana 04 Dec '14

04 Dec '14

Crístian Viana (2): Only allow VM snapshots to be taken on 'qcow2' disks Revert "snapshot: Clone snapshots when cloning a VM" src/kimchi/i18n.py | 1 + src/kimchi/model/vms.py | 29 +---------------------------- src/kimchi/model/vmsnapshots.py | 17 +++++++++++++++-- tests/test_model.py | 11 ----------- tests/test_rest.py | 19 ++----------------- 5 files changed, 19 insertions(+), 58 deletions(-) -- 1.9.3

2 3

[PATCH V2] Add sos (sosreport) plugin for kimchi
by Rodrigo Trujillo 03 Dec '14

03 Dec '14

This patches adds a sos plugin to collect kimchi's configuration, log files and other information for diagnosis. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> Signed-off-by: Eli Qiao <taget(a)linux.vnet.ibm.com> Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- Makefile.am | 3 +++ contrib/kimchi.spec.fedora.in | 3 +++ src/Makefile.am | 1 + src/sos.py | 43 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+) create mode 100644 src/sos.py diff --git a/Makefile.am b/Makefile.am index ec88787..53b6b40 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,10 +70,13 @@ install-deb: install cp -R $(top_srcdir)/contrib/DEBIAN $(DESTDIR)/ $(MKDIR_P) $(DESTDIR)/etc/init $(MKDIR_P) $(DESTDIR)/usr/lib/firewalld/services + $(MKDIR_P) $(DESTDIR)/usr/share/sosreport/sos/plugins cp -R $(top_srcdir)/contrib/kimchid-upstart.conf.debian \ $(DESTDIR)/etc/init/kimchid.conf cp -R $(top_srcdir)/src/firewalld.xml \ $(DESTDIR)/usr/lib/firewalld/services/kimchid.xml + cp -R $(top_srcdir)/src/sos.py \ + $(DESTDIR)/usr/share/sosreport/sos/plugins/kimchi.py deb: contrib/make-deb.sh diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index 236c862..4d23ad0 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -80,6 +80,8 @@ make %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install +install -Dm 0644 src/sos.py \ + %{buildroot}/%{python_sitelib}/sos/plugins/kimchi.py %if 0%{?with_systemd} # Install the systemd scripts @@ -161,6 +163,7 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/kimchi/xmlutils/*.py* %{python_sitelib}/kimchi/API.json %{python_sitelib}/kimchi/plugins/*.py* +%{python_sitelib}/sos/plugins/kimchi.py* %{_datadir}/kimchi/doc/API.md %{_datadir}/kimchi/doc/README.md %{_datadir}/kimchi/doc/README-federation.md diff --git a/src/Makefile.am b/src/Makefile.am index dfeb24e..46ca1ab 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,6 +23,7 @@ EXTRA_DIST = kimchid.in \ kimchi.conf.in \ nginx.conf.in \ firewalld.xml \ + sos.py \ $(NULL) bin_SCRIPTS = kimchid diff --git a/src/sos.py b/src/sos.py new file mode 100644 index 0000000..5d1fa3f --- /dev/null +++ b/src/sos.py @@ -0,0 +1,43 @@ +# +# Project Kimchi +# +# Copyright IBM, Corp. 2014 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin +from sos.utilities import sos_get_command_output + + +class Kimchi(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): + """ + kimchi-related information + """ + + plugin_name = 'kimchi' + + def setup(self): + self.add_copy_specs([ + "/etc/kimchi/", + "/var/log/kimchi*" + ]) + self.add_cmd_output("virsh pool-list --details") + rc, out, _ = sos_get_command_output('virsh pool-list') + if rc == 0: + for pool in out.splitlines()[2:]: + if pool: + pool_name = pool.split()[0] + self.add_cmd_output("virsh vol-list --pool %s --details" + % pool_name) -- 1.9.3

2 2

[PATCH] RHEL7: Guide user to subscribe to "RHEL Server Optional" channel
by Aline Manera 01 Dec '14

01 Dec '14

python-cheetah requires python-pygments package that is only available for RHEL7 system in the "RHEL Server Optional" channel at RHN Classic or Red Hat Satellite. So guide user to subscribe to this channel in order to install and run Kimchi. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- docs/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/README.md b/docs/README.md index 555ce89..ed3d489 100644 --- a/docs/README.md +++ b/docs/README.md @@ -74,6 +74,9 @@ EPEL repositories. See [this FAQ](http://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.… for more information on how to configure your system to access this repository. +And for RHEL7 systems, you also need to subscribe to the "RHEL Server Optional" +channel at RHN Classic or Red Hat Satellite. + **For debian:** $ sudo apt-get install gcc make autoconf automake gettext git \ -- 1.9.3

3 3

Fwd: [WIP] ISSUE 372Re: UI developmet help to fix bug
by Wen Wang 27 Nov '14

27 Nov '14

FYI, This is the back-end patch of Issue372

1 0

kimchi-1.4.0-rc1 is available for testing!
by Aline Manera 26 Nov '14

26 Nov '14

Hi all, As planned, I've just tagged 1.4.0-rc1 in git: https://github.com/kimchi-project/kimchi/releases/tag/1.4.0-rc1 Feel free to update the test matrix according to your tests: https://github.com/kimchi-project/kimchi/wiki/Testing-1.4 I suggest to go thorough all the test cases first and fill the test matrix with PASS (when the test passed) or with the bug # (when it failed). And once finished all tests, focus on bug fixes. Regards, Aline Manera

1 0

[PATCH 0/2] UI: support ldap permission tag
by lvroyce＠linux.vnet.ibm.com 26 Nov '14

26 Nov '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Users added will be validated when press save permission button, invalid user will be labled as notice icon. update vm request with invalid user will be rejected. only user tag is supported for ldap. This is tested agaist ldap integration v2. Note: Due to capabilities query of authentication type is not added. This patch simply hided PAM permission tag part. Will address this issue after backend changed. Royce Lv (2): UI: support ldap vm permission tag Change guest edit permission logic ui/css/theme-default/guest-edit.css | 79 ++++++++++++++----- ui/js/src/kimchi.api.js | 13 +++- ui/js/src/kimchi.guest_edit_main.js | 146 ++++++++++++++++++++++++++++++------ ui/pages/guest-edit.html.tmpl | 28 ++++++- 4 files changed, 218 insertions(+), 48 deletions(-) -- 1.8.3.2

2 4

[PATCH 0/2 V6] UI for LDAP
by Aline Manera 26 Nov '14

26 Nov '14

v5 < v6, Remove scroll bar in Permission Tab for PAM authentication Royce Lv (2): UI: support ldap vm permission tag Change guest edit permission logic ui/css/theme-default/guest-edit.css | 96 +++++++++++++++++-------- ui/js/src/kimchi.api.js | 23 ++++-- ui/js/src/kimchi.guest_edit_main.js | 140 +++++++++++++++++++++++++++++------- ui/pages/guest-edit.html.tmpl | 22 +++++- 4 files changed, 218 insertions(+), 63 deletions(-) -- 1.9.3

2 4

[PATCH 0/2 V5] UI for LDAP
by Aline Manera 26 Nov '14

26 Nov '14

v1 > v2, Change according to LDAP backend api change. v2 > v3, Change alert icon to red border of input box to be more clear, commented by YuXin v3 > v4, Fix alignment and use place holder to inform user what to fill. commented by Aline. v4 > v5, Use cached capabilities values and rename functions Royce Lv (2): UI: support ldap vm permission tag Change guest edit permission logic ui/css/theme-default/guest-edit.css | 94 ++++++++++++++++-------- ui/js/src/kimchi.api.js | 23 ++++-- ui/js/src/kimchi.guest_edit_main.js | 140 +++++++++++++++++++++++++++++------- ui/pages/guest-edit.html.tmpl | 22 +++++- 4 files changed, 217 insertions(+), 62 deletions(-) -- 1.9.3

2 3

[PATCHv4 0/2] UI for LDAP
by lvroyce0210＠gmail.com 26 Nov '14

26 Nov '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v1>v2, Change according to LDAP backend api change. v2>v3, Change alert icon to red border of input box to be more clear, commented by YuXin v3>v4, Fix alignment and use place holder to inform user what to fill. commented by Aline. Royce Lv (2): UI: support ldap vm permission tag Change guest edit permission logic ui/css/theme-default/guest-edit.css | 83 ++++++++--- ui/js/src/kimchi.api.js | 15 +- ui/js/src/kimchi.guest_edit_main.js | 289 ++++++++++++++++++++++++------------ ui/pages/guest-edit.html.tmpl | 22 ++- 4 files changed, 284 insertions(+), 125 deletions(-) -- 1.8.3.2

2 3

[PATCH] vmtemplate: allow allocation = 0 for type 'raw'
by Daniel Henrique Barboza 25 Nov '14

25 Nov '14

Kimchi was allocating the entire disk when the disk image type wasn't 'qcow2'. Adding 'raw' to this exception list because raw images can be created as sparse (= size in bytes when creating the disk is less than its total capacity) too. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- src/kimchi/vmtemplate.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 5dbbdd4..6c449f2 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -197,7 +197,8 @@ class VMTemplate(object): 'capacity': d['size'], 'format': fmt, 'path': '%s/%s' % (storage_path, volume)} - info['allocation'] = 0 if fmt == 'qcow2' else info['capacity'] + info['allocation'] = 0 if fmt in ['qcow2', 'raw'] \ + else info['capacity'] if 'base' in d: info['base'] = dict() -- 1.9.3

3 2

[v5 1/1] Virtual machine migration
by simonjin＠linux.vnet.ibm.com 25 Nov '14

25 Nov '14

From: Simon Jin <simonjin(a)linux.vnet.ibm.com> v5-v4:check whether the vm is already in migration. Signed-off-by: Simon Jin <simonjin(a)linux.vnet.ibm.com> --- docs/API.md | 5 ++ src/kimchi/control/vms.py | 1 + src/kimchi/i18n.py | 8 +++ src/kimchi/model/vms.py | 170 +++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 182 insertions(+), 2 deletions(-) diff --git a/docs/API.md b/docs/API.md index 9b866f3..eb02e80 100644 --- a/docs/API.md +++ b/docs/API.md @@ -132,6 +132,11 @@ the following general conventions: It emulates the power reset button on a machine. Note that there is a risk of data loss caused by reset without the guest OS shutdown. * connect: Prepare the connection for spice or vnc +* migrate: Migrate a virtual machine to a remote server, only support live mode without block migration. + * remoteHost: IP address or hostname of the remote server. + * user: User of the remote server. + * passwd: Passwd of user on remote server. + * secure: Migrate in P2P secure tunel mode.(optional) * clone: Create a new VM identical to this VM. The new VM's name, UUID and network MAC addresses will be generated automatically. Each existing diff --git a/src/kimchi/control/vms.py b/src/kimchi/control/vms.py index a1589ef..e6870e0 100644 --- a/src/kimchi/control/vms.py +++ b/src/kimchi/control/vms.py @@ -42,6 +42,7 @@ class VM(Resource): for ident, node in sub_nodes.items(): setattr(self, ident, node(model, self.ident)) self.start = self.generate_action_handler('start') + self.migrate = self.generate_action_handler_task('migrate', ['remoteHost', 'user', 'passwd', 'secure']) self.poweroff = self.generate_action_handler('poweroff') self.shutdown = self.generate_action_handler('shutdown') self.reset = self.generate_action_handler('reset') diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index e823f2b..ffd8e98 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -105,6 +105,14 @@ messages = { "KCHVM0033E": _("Virtual machine '%(name)s' must be stopped before cloning it."), "KCHVM0034E": _("Insufficient disk space to clone virtual machine '%(name)s'"), "KCHVM0035E": _("Unable to clone VM '%(name)s'. Details: %(err)s"), + "KCHVM0036E": _("Migrate %(name)s to localhost %(remoteHost)s is not allowed."), + "KCHVM0037E": _("vm %(name)s is already in migrating, can not perform migrate on it again."), + "KCHVM0038E": _("Can't migrate vm %(name)s on Hypervisor arch %(srcarch)s.to a different Hypervisor arch %(destarch)s."), + "KCHVM0039E": _("Can't migrate %(name)s from %(srchyp)s to a different Hypervisor type %(desthyp)s."), + "KCHVM0040E": _("Can't migrate vm %(name)s, vm has passthrough device %(hostdevs)s."), + "KCHVM0041E": _("Can not migrate vm %(name)s when its in %(state)s state."), + "KCHVM0042E": _("Failed Migrate vm %(name)s due error: %(err)s"), + "KCHVM0043E": _("Failed to destroy vm %(name)s from migration recover. Details: %(err)s"), "KCHVMHDEV0001E": _("VM %(vmid)s does not contain directly assigned host device %(dev_name)s."), "KCHVMHDEV0002E": _("The host device %(dev_name)s is not allowed to directly assign to VM."), diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index d194049..2f934a4 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -33,9 +33,9 @@ from cherrypy.process.plugins import BackgroundTask from kimchi import model, vnc from kimchi.config import READONLY_POOL_TYPE from kimchi.exception import InvalidOperation, InvalidParameter -from kimchi.exception import NotFoundError, OperationFailed +from kimchi.exception import NotFoundError, OperationFailed, KimchiException from kimchi.model.config import CapabilitiesModel -from kimchi.model.tasks import TaskModel +from kimchi.model.tasks import TaskModel, TasksModel from kimchi.model.templates import TemplateModel from kimchi.model.utils import get_vm_name from kimchi.model.utils import get_metadata_node @@ -265,6 +265,7 @@ class VMModel(object): self.groups = import_class('kimchi.model.host.GroupsModel')(**kargs) self.vms = VMsModel(**kargs) self.task = TaskModel(**kargs) + self.tasks = TasksModel(**kargs) self.storagepool = model.storagepools.StoragePoolModel(**kargs) self.storagevolume = model.storagevolumes.StorageVolumeModel(**kargs) self.storagevolumes = model.storagevolumes.StorageVolumesModel(**kargs) @@ -790,6 +791,171 @@ class VMModel(object): except libvirt.libvirtError as e: raise OperationFailed("KCHVM0019E", {'name': name, 'err': e.get_error_message()}) + + def _preCheck(self, name, destConn, remoteHost): + """Pre check before migration""" + + kimchi_log.debug('precheck migrate %s' % name) + _destConn = destConn.get() + if remoteHost in ['localhost', '127.0.0.1']: + kimchi_log.debug('vm %s Can not migrate to localhost.' % name) + raise OperationFailed("KCHVM0036E", {'name': name, + 'remoteHost': remoteHost}) + #check if the vm already in migration + try: + alltasks = self.tasks.get_list() + for taskid in alltasks: + taskobj = self.task.lookup(taskid) + if taskobj['target_uri'] == "/vms/%s/migrate" % name \ + and taskobj['status'] == "running": + kimchi_log.debug('vm %s is already in migrating.' % name) + raise OperationFailed("KCHVM0037E", {'name': name}) + except NotFoundError as e: + kimchi_log.debug('No migrate on vm %s.' % name) + + srcarch = self.conn.get().getInfo()[0] + destarch = _destConn.getInfo()[0] + if srcarch != destarch: + kimchi_log.debug('vm %s can not migrate to different arch server.' % (name, destarch)) + raise OperationFailed("KCHVM0038E", {'name': name, + 'srcarch': srcarch, + 'destarch': destarch}) + srchyp = self.conn.get().getType() + desthyp = _destConn.getType() + if srchyp != desthyp: + kimchi_log.debug('vm %s can not migrate to a different hypervisor' % name) + raise OperationFailed("KCHVM0039E", {'name': name, + 'srchyp': srchyp, + 'desthyp':desthyp}) + + #model.host import DOM_STATE_MAP, vmhostdevs import host, + #to void loop import DOM_STATE_MAP, move import VMHostDevsModel here + from kimchi.model.vmhostdevs import VMHostDevsModel + #check if there is any passthrough devices belong to this vm + vmhostdevs = VMHostDevsModel(conn = self.conn) + hostdevs = vmhostdevs.get_list(name) + if hostdevs: + raise OperationFailed("KCHVM0040E", {'name' : name, + 'hostdevs': hostdevs}) + @staticmethod + def _getRemoteConn(remoteHost, user, passwd, transport = 'ssh'): + """open destination connect to migrate""" + + duri = 'qemu+%s://%s@%s/system' % (transport, user,remoteHost) + conn = LibvirtConnection(duri) + return conn + + def _do_migrate(self, cb, params): + """Asynchronous function which performs the migrate operation. + + Arguments: + cb -- A callback function to signal the Task's progress. + params -- A dict with the following values: + "name": Name of the virtual machine to be migrated. + "destConn": A LibvirtConnection to destination server. + "remoteHost": The migration destination server. + "secure": Migrate in P2P secure tunel mode.(optional) + """ + + name = params['name'].decode('utf-8') + destConn = params['destConn'] + remoteHost = params['remoteHost'] + secure = params['secure'] + _destConn = destConn.get() + + cb('starting a migration') + kimchi_log.debug('migrate %s start' % name) + dom = self.get_vm(name, self.conn) + flag = 0 + if secure: + flag |= (libvirt.VIR_MIGRATE_PEER2PEER | + libvirt.VIR_MIGRATE_TUNNELLED) + + state = DOM_STATE_MAP[dom.info()[0]] + if state in ['running','paused']: + flag |= libvirt.VIR_MIGRATE_LIVE + elif state == 'shutoff': + flag |= (libvirt.VIR_MIGRATE_OFFLINE| + libvirt.VIR_MIGRATE_PERSIST_DEST) + else: + kimchi_log.debug('Can not migrate vm %s when its in %s.' % (name, state)) + raise OperationFailed("KCHVM0041E", {'name': name, + 'state': state}) + try: + dom.migrate(_destConn, flag, None, None, 0) + except libvirt.libvirtError as e: + kimchi_log.error('migrate %s to %s failed' % (name, remoteHost)) + self._recover(name, destConn, cb) + self._finish(name, False, cb) + raise OperationFailed('KCHVM0042E', {'err': e.message, + 'name': name}) + self._finish(name, True, cb) + + def migrate(self, name, remoteHost, user, passwd = None, secure = False): + """Migrate a virtual machine to a remote server. + + Arguments: + name -- The name of the virtual machine to be migrated. + remoteHost -- Remote server that the VM will be migrated to. + user -- Login user on remote server,prefer root. + passwd -- The password of the user on remote server, if the local server + has ssk key exchanged, then this param can be NULL. + secure -- Migrate in P2P secure tunel mode.(optional) + + Return: + A Task running the clone operation. + """ + name = name.decode('utf-8') + remoteHost = remoteHost.decode('utf-8') + user = user.decode('utf-8') + + destConn = self._getRemoteConn(remoteHost, user, passwd) + self._preCheck(name, destConn, remoteHost) + + params = {'name': name, + 'destConn': destConn, + 'remoteHost': remoteHost, + 'secure': secure} + task_id = add_task('/vms/%s/migrate' % name, self._do_migrate, + self.objstore, params) + + return self.task.lookup(task_id) + + def _recover(self, name, destconn, cb): + """Recover from a failed migration. + + Arguments: + "cb": A callback function to signal the Task's progress. + "name": Name of the virtual machine to be migrated. + "destConn": A LibvirtConnection to destination server. + """ + try: + destvm = self.get_vm(name, destconn) + except KimchiException as e: + if type(e) == NotFoundError: + return + + cb('recover from a failed migration',False) + kimchi_log.debug('recover from a failed migrate %s' % name) + try: + destvm.destroy() + kimchi_log.error("Failed to destory migrate vm %s on \ + destination server" % name) + except libvirt.libvirtError as e: + raise OperationFailed('KCHVM0043E', {'name' : name, + 'err': e.message}) + + def _finish(self, name, success, cb): + """Clean up after a migration finished and set the task finished. + + Arguments: + "name": Name of the virtual machine to be migrated. + "success": Whether the migration successed or faild and set the tast + finish state according to it. + "cb": A callback function to signal the Task's progress. + """ + kimchi_log.debug('finished migrate %s' % name) + cb('Migrate finished', success) def poweroff(self, name): dom = self.get_vm(name, self.conn) -- 1.8.3.1

3 2

[PATCHv2 0/2] UI for LDAP support
by lvroyce＠linux.vnet.ibm.com 25 Nov '14

25 Nov '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v1>v2, Change according to backend API change. Royce Lv (2): UI: support ldap vm permission tag Change guest edit permission logic ui/css/theme-default/guest-edit.css | 79 +++++++--- ui/js/src/kimchi.api.js | 15 +- ui/js/src/kimchi.guest_edit_main.js | 300 ++++++++++++++++++++++++------------ ui/pages/guest-edit.html.tmpl | 28 +++- 4 files changed, 299 insertions(+), 123 deletions(-) -- 1.8.3.2

2 6

[v3] UI: CPU Topology
by huoyuxin＠linux.vnet.ibm.com 24 Nov '14

24 Nov '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/template-edit.css | 28 ++++++++++++++++- ui/js/src/kimchi.api.js | 14 ++++++++ ui/js/src/kimchi.template_edit_main.js | 52 ++++++++++++++++++++++++++++++- ui/pages/template-edit.html.tmpl | 19 +++++++---- 4 files changed, 103 insertions(+), 10 deletions(-) diff --git a/ui/css/theme-default/template-edit.css b/ui/css/theme-default/template-edit.css index 094e909..7abee7c 100644 --- a/ui/css/theme-default/template-edit.css +++ b/ui/css/theme-default/template-edit.css @@ -142,4 +142,30 @@ #edit-template-tabs .hide { display: none; -} \ No newline at end of file +} + +#form-template-processor select, +#form-template-processor input[type="text"] { + margin-left: 10px; +} + +#form-template-processor input[type="checkbox"] { + margin-right: 5px; +} + +#form-template-processor .manual { + margin-top: 10px; + margin-left: -3px; +} + +#form-template-processor .topology { + margin: 10px 30px; +} + +#form-template-processor .topology div { + margin-bottom: 10px; +} + +#form-template-processor .topology select { + width: 80px; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 78c6d66..7a239c0 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -1260,5 +1260,19 @@ var kimchi = { kimchi.message.error(data.responseJSON.reason); } }); + }, + + getCPUInfo : function(suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'host/cpuinfo', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); } }; diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index d4e19c2..1149541 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -200,14 +200,51 @@ kimchi.template_edit_main = function() { }); }); }; + var initProcessor = function(){ + var setCPUValue = function(){ + if(!$('#cores').hasClass("invalid-field")&&$('#cores').val()!=""){ + $("#cpus").val(parseInt($("#cores").val())*parseInt($("#threads").val())); + }else{ + $("#cpus").val(''); + } + }; + $("input:text", "#form-template-processor").on('keyup', function(){ + $(this).toggleClass("invalid-field", !$(this).val().match('^[0-9]*$')); + if($(this).prop('id')=='cores') setCPUValue(); + }); + $("input:checkbox", "#form-template-processor").click(function(){ + $(".topology", "#form-template-processor").toggleClass("hide", !$(this).prop("checked")); + $("#cpus").attr("disabled", $(this).prop("checked")); + setCPUValue(); + }); + $('select', '#form-template-processor').change(function(){ + setCPUValue(); + }); + kimchi.getCPUInfo(function(data){ + var options = ""; + for(var i=0;Math.pow(2,i)<=data.threads_per_core;i++){ + var lastOne = Math.pow(2,i+1)>data.threads_per_core?" selected":""; + options += "<option"+lastOne+">"+Math.pow(2,i)+"</option>"; + } + $('select', '#form-template-processor').append(options); + if(template.cpus) $("#cpus").val(template.cpus); + var topo = template.cpu_info.topology; + if(topo&&topo.cores) $("#cores").val(topo.cores); + if(topo&&topo.threads){ + $('select', '#form-template-processor').val(topo.threads); + $("input:checkbox", "#form-template-processor").trigger('click'); + } + }); + }; kimchi.listNetworks(initInterface); kimchi.listStoragePools(initStorage); + initProcessor(); }; kimchi.retrieveTemplate(kimchi.selectedTemplate, initTemplate); $('#tmpl-edit-button-save').on('click', function() { - var editableFields = [ 'name', 'cpus', 'memory', 'disks', 'graphics']; + var editableFields = [ 'name', 'memory', 'disks', 'graphics']; var data = {}; //Fix me: Only support one storage pool now var storages = $('.template-tab-body .item', '#form-template-storage'); @@ -241,7 +278,18 @@ kimchi.template_edit_main = function() { } }); data['memory'] = Number(data['memory']); - data['cpus'] = Number(data['cpus']); + data['cpus'] = parseInt($('#cpus').val()); + if($("input:checkbox", "#form-template-processor").prop("checked")){ + data['cpu_info'] = { + topology: { + sockets: 1, + cores: parseInt($("#cores").val()), + threads: parseInt($("#threads").val()) + } + }; + }else{ + data['cpu_info'] = {}; + } var networks = $('.template-tab-body .item', '#form-template-interface'); var networkForUpdate = new Array(); $.each(networks, function(index, networkEntities) { diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 90a6256..7177bf0 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -40,6 +40,9 @@ <li> <a href="#form-template-interface">$_("Interface")</a> </li> + <li> + <a href="#form-template-processor">$_("Processor")</a> + </li> </ul> <form id="form-template-general"> <div class="form-template-inline-wrapper"> @@ -53,9 +56,6 @@ <label for="template-edit-version-textbox">$_("Version")</label> </div> <div class="template-edit-wrapper-label"> - <label for="template-edit-cpu-textbox">$_("CPU Number")</label> - </div> - <div class="template-edit-wrapper-label"> <label for="template-edit-memory-textbox">$_("Memory (MB)")</label> </div> <div class="template-edit-wrapper-label templ-edit-cdrom"> @@ -79,9 +79,6 @@ <input id="template-edit-version-textbox" name="os_version" type="text" disabled="disabled" /> </div> <div class="template-edit-wrapper-controls"> - <input id="template-edit-cpu-textbox" name="cpus" type="text" /> - </div> - <div class="template-edit-wrapper-controls"> <input id="template-edit-memory-textbox" name="memory" type="text" /> </div> <div class="template-edit-wrapper-controls templ-edit-cdrom"> @@ -120,6 +117,14 @@ </div> <div class="template-tab-body"></div> </form> + <form id="form-template-processor"> + <div>$_("CPU Number"):<input type="text" value="1" id="cpus"></div> + <div class="manual"><input type="checkbox">$_("Manually set CPU topology")</div> + <div class="topology hide"> + <div>$_("Cores"):<input type="text" value="1" id="cores"></div> + <div>$_("Threads"):<select id="threads"></select></div> + </div> + </form> </div> </div> <footer> @@ -157,4 +162,4 @@ <button class="delete"></button> </span> </div> -</script> \ No newline at end of file +</script> -- 1.7.1

3 2

[PATCH v8 0/2] Auto Topology for Guest Templates
by Christy Perez 24 Nov '14

24 Nov '14

By this point, the subject isn't exactly accurate, but since v 1-6 had it, I'm not changing it now. As the commit message says, this feature is no longer an "auto topology" feature, but instead just a feature to allow users to configure topology for a vm template should they so desire. If we ever want to add an auto-configure option, then version 5 of this patchset can be resurrected. I would recommend re-adding the auto-element of the cpu_info for a template, instead of passing in threads=0, however. New to v8: - A try/except block in cpuinfo __init__ has been removed - The license file was fixed in /model/cpuinfo.py Christy Perez (2): Parts to allow Kimchi to configure the cpu topology. Mockmodel test for cpuinfo docs/API.md | 24 ++++++++ src/kimchi/control/cpuinfo.py | 37 +++++++++++++ src/kimchi/control/host.py | 2 + src/kimchi/i18n.py | 5 ++ src/kimchi/mockmodel.py | 10 ++++ src/kimchi/model/cpuinfo.py | 124 ++++++++++++++++++++++++++++++++++++++++++ src/kimchi/model/templates.py | 10 ++-- 7 files changed, 208 insertions(+), 4 deletions(-) create mode 100644 src/kimchi/control/cpuinfo.py create mode 100644 src/kimchi/model/cpuinfo.py -- 1.9.3

2 3

[v3] UI: Guest Snapshot
by huoyuxin＠linux.vnet.ibm.com 24 Nov '14

24 Nov '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/guest-edit.css | 35 +++++++++++- ui/js/src/kimchi.api.js | 68 ++++++++++++++++++++++ ui/js/src/kimchi.guest_edit_main.js | 106 +++++++++++++++++++++++++++++++++++ ui/pages/guest-edit.html.tmpl | 27 +++++++++ 4 files changed, 235 insertions(+), 1 deletions(-) diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index b1d3931..74d72f2 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -96,6 +96,7 @@ } #form-guest-edit-storage .header, +.guest-edit-snapshot .header, .guest-edit-interface .header { margin-bottom: 8px; padding-bottom: 2px; @@ -105,6 +106,8 @@ } #form-guest-edit-storage .body .item, +.guest-edit-snapshot .body .item, +.guest-edit-snapshot .task .item, .guest-edit-interface .body .item { margin: 5px 0; } @@ -115,6 +118,32 @@ width: 250px; } +.guest-edit-snapshot .cell { + display: inline-block; +} + +.guest-edit-snapshot .sel { + width: 35px; + vertical-align: top; +} + +.guest-edit-snapshot .icon { + background: url('../../images/theme-default/kimchi-loading15x15.gif') no-repeat; + display: block; + width: 16px; + height: 16px; + vertical-align: middle; + margin-left: 2px; +} + +.guest-edit-snapshot .name { + width: 400px; +} + +.guest-edit-snapshot .created { + width: 250px; +} + #form-guest-edit-storage .cell.dev { width: 60px; } @@ -135,6 +164,7 @@ } #form-guest-edit-storage .action-area, +.guest-edit-snapshot .action-area, .guest-edit-interface .action-area { float: right; } @@ -144,12 +174,14 @@ } #form-guest-edit-storage button, +.guest-edit-snapshot button, .guest-edit-interface button { width: 20px; height: 20px; } #form-guest-edit-storage .header button, +.guest-edit-snapshot .header button, .guest-edit-interface .header button { margin-bottom: 1px; } @@ -159,8 +191,9 @@ margin-right: 2px; } +.guest-edit-snapshot .hide, .guest-edit-interface .hide { - display: none; + display: none!important; } .guest-edit-permission { diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 78c6d66..8e21d4c 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -1260,5 +1260,73 @@ var kimchi = { kimchi.message.error(data.responseJSON.reason); } }); + }, + + listSnapshots : function(vm, suc, err) { + kimchi.requestJSON({ + url : kimchi.url+'vms/'+encodeURIComponent(vm)+'/snapshots', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + + getCurrentSnapshot : function(vm, suc, err, sync) { + kimchi.requestJSON({ + url : kimchi.url+'vms/'+encodeURIComponent(vm)+'/snapshots/current', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + async : !sync, + resend : true, + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + + revertSnapshot : function(vm, snapshot, suc, err) { + kimchi.requestJSON({ + url : kimchi.url+'vms/'+encodeURIComponent(vm)+'/snapshots/'+encodeURIComponent(snapshot)+'/revert', + type : 'POST', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + + createSnapshot : function(vm, suc, err) { + kimchi.requestJSON({ + url : kimchi.url+'vms/'+encodeURIComponent(vm)+'/snapshots', + type : 'POST', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + + deleteSnapshot : function(vm, snapshot, suc, err) { + kimchi.requestJSON({ + url : kimchi.url+'vms/'+encodeURIComponent(vm)+'/snapshots/'+encodeURIComponent(snapshot), + type : 'DELETE', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); } }; diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 9d87a73..e033743 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -461,6 +461,111 @@ kimchi.guest_edit_main = function() { }); }; + var setupSnapshot = function() { + var currentSnapshot; + var setCurrentSnapshot = function(aSnapshot){ + if(!aSnapshot) + kimchi.getCurrentSnapshot(kimchi.selectedGuest, function(snapshot){ + if(snapshot&&snapshot.name) aSnapshot = snapshot.name; + }, null, true); + if(aSnapshot){ + if(currentSnapshot) $(".ui-icon-check", "#"+currentSnapshot).addClass("hide"); + $(".ui-icon-check", "#"+aSnapshot).removeClass("hide"); + currentSnapshot = aSnapshot; + } + }; + var addItem = function(data, container) { + var itemNode = $.parseHTML(kimchi.substitute($('#snapshot-tmpl').html(),data)); + $("."+container, "#form-guest-edit-snapshot").append(itemNode); + $(".delete", itemNode).button({ + icons: { primary: "ui-icon-trash" }, + text: false + }).click(function(evt){ + evt.preventDefault(); + var item = $(this).parent().parent(); + $("button", "#form-guest-edit-snapshot").button("disable"); + kimchi.deleteSnapshot(kimchi.selectedGuest, item.prop("id"), function(){ + item.remove(); + setCurrentSnapshot(); + $("button", "#form-guest-edit-snapshot").button("enable"); + }, function(data){ + kimchi.message.error(data.responseJSON.reason); + $("button", "#form-guest-edit-snapshot").button("enable"); + }); + }); + $(".revert", itemNode).button({ + icons: { primary: "ui-icon-arrowthick-1-ne" }, + text: false + }).click(function(evt){ + evt.preventDefault(); + var item = $(this).parent().parent(); + $(".ui-icon-check", item).addClass("hide"); + $(".icon", item).removeClass("hide"); + $("button", "#form-guest-edit-snapshot").button("disable"); + kimchi.revertSnapshot(kimchi.selectedGuest, item.prop("id"), function(){ + $(".icon", item).addClass("hide"); + $("button", "#form-guest-edit-snapshot").button("enable"); + setCurrentSnapshot(item.prop("id")); + }, function(data){ + kimchi.message.error(data.responseJSON.reason); + $(".icon", item).addClass("hide"); + $("button", "#form-guest-edit-snapshot").button("enable"); + }); + }); + }; + var addOngoingItem = function(task){ + var uri = task.target_uri; + addItem({ + name: uri.substring(uri.lastIndexOf('/')+1, uri.length), + created: "", + listMode: "hide", + createMode: "" + }, 'task'); + if(kimchi.trackingTasks.indexOf(task.id)==-1) + kimchi.trackTask(task.id, function(task){ + listGeneratingSnapshots(); + $("button", "#form-guest-edit-snapshot").button("enable"); + }, function(err){ + kimchi.message.error(err.message); + listGeneratingSnapshots(); + $("button", "#form-guest-edit-snapshot").button("enable"); + }); + }; + var listGeneratingSnapshots = function(){ + kimchi.getTasksByFilter('status=running&target_uri='+encodeURIComponent('^/snapshots/*'), function(tasks) { + $(".task", "#form-guest-edit-snapshot").empty(); + for(var i=0;i<tasks.length;i++){ + addOngoingItem(tasks[i]); + } + if(tasks.length==0) listSnapshots(); + }); + }; + var listSnapshots = function(){ + kimchi.listSnapshots(kimchi.selectedGuest, function(data){ + $(".body", "#form-guest-edit-snapshot").empty(); + for(var i=0;i<data.length;i++){ + data[i].created = new Date(data[i].created*1000).toLocaleString(); + data[i].createMode = "hide"; + data[i].listMode = ""; + addItem(data[i], 'body'); + } + setCurrentSnapshot(); + }); + }; + listGeneratingSnapshots(); + $(".add", "#form-guest-edit-snapshot").button({ + icons: { primary: "ui-icon-plusthick" }, + text: false + }).click(function(evt){ + evt.preventDefault(); + kimchi.createSnapshot(kimchi.selectedGuest, function(task){ + $("button", "#form-guest-edit-snapshot").button("disable"); + addOngoingItem(task); + }); + }); + if(kimchi.thisVMState=="running") $("button", "#form-guest-edit-snapshot").remove(); + }; + var initContent = function(guest) { guest['icon'] = guest['icon'] || 'images/icon-vm.png'; $('#form-guest-edit-general').fillWithObject(guest); @@ -496,6 +601,7 @@ kimchi.guest_edit_main = function() { setupInterface(); setupPermission(); setupPCIDevice(); + setupSnapshot(); kimchi.topic('kimchi/vmCDROMAttached').subscribe(onAttached); kimchi.topic('kimchi/vmCDROMReplaced').subscribe(onReplaced); diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 512909a..6233884 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -44,6 +44,9 @@ <li> <a href="#form-guest-edit-pci">$_("Host PCI Device")</a> </li> + <li> + <a href="#form-guest-edit-snapshot">$_("Snapshot")</a> + </li> </ul> <form id="form-guest-edit-general"> <fieldset class="guest-edit-fieldset"> @@ -160,6 +163,16 @@ <div class="body"></div> </div> </form> + <form id="form-guest-edit-snapshot" class="guest-edit-snapshot"> + <div class="header"> + <span class="cell sel"></span> + <span class="cell name">$_("Name")</span> + <span class="cell created">$_("Created")</span> + <button class="add action-area"></button> + </div> + <div class="task"></div> + <div class="body"></div> + </form> </div> </div> <footer> @@ -251,6 +264,20 @@ <button></button> </div> </script> +<script id="snapshot-tmpl" type="text/html"> + <div class="item" id="{name}"> + <span class="cell sel"> + <span class="icon {createMode}"></span> + <span class="ui-icon ui-icon-check hide"></span> + </span> + <span class="cell name">{name}</span> + <span class="cell created">{created}</span> + <span class="action-area"> + <button class="revert {listMode}" title="$_("revert")"></button> + <button class="delete {listMode}"></button> + </span> + <div> +</script> <script type="text/javascript"> kimchi.guest_edit_main(); </script> -- 1.7.1

3 3

[PATCH v7 0/2] Auto Topology for Guest Templates
by Christy Perez 24 Nov '14

24 Nov '14

By this point, the subject isn't exactly accurate, but since v 1-6 had it, I'm not changing it now. As the commit message says, this feature is no longer an "auto topology" feature, but instead just a feature to allow users to configure topology for a vm template should they so desire. If we ever want to add an auto-configure option, then version 5 of this patchset can be resurrected. I would recommend re-adding the auto-element of the cpu_info for a template, instead of passing in threads=0, however. New to version 7: A near complete re-write that only does some checking in the backend, adds appropriate error messages, a mockmodel test, and a little tweaking so that the mockmodel tests pass. Christy Perez (2): Parts to allow Kimchi to configure the cpu topology. Mockmodel test for cpuinfo docs/API.md | 24 ++++++++ src/kimchi/control/cpuinfo.py | 37 ++++++++++++ src/kimchi/control/host.py | 2 + src/kimchi/i18n.py | 5 ++ src/kimchi/mockmodel.py | 10 ++++ src/kimchi/model/cpuinfo.py | 128 ++++++++++++++++++++++++++++++++++++++++++ src/kimchi/model/templates.py | 10 ++-- 7 files changed, 212 insertions(+), 4 deletions(-) create mode 100644 src/kimchi/control/cpuinfo.py create mode 100644 src/kimchi/model/cpuinfo.py -- 1.9.3

2 4

[PATCH] Pass through libvirt error if storage create fails
by Christy Perez 24 Nov '14

24 Nov '14

A user experienced an error while creating a VM using logical storage. If a disk size greater than the available capacity of a pool is requested, the pool.createXML fails, but the user gets the generic kimchi "unexpected error" message. This patch puts a try block around the createXML call, and catches the libvirt error so it can be shown to the user. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- src/kimchi/model/templates.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/kimchi/model/templates.py b/src/kimchi/model/templates.py index 6e1a571..475f878 100644 --- a/src/kimchi/model/templates.py +++ b/src/kimchi/model/templates.py @@ -290,7 +290,10 @@ def fork_vm_storage(self, vm_uuid): # TODO: Rebase on the storage API once upstream pool = self._storage_validate() vol_list = self.to_volume_list(vm_uuid) - for v in vol_list: - # outgoing text to libvirt, encode('utf-8') - pool.createXML(v['xml'].encode('utf-8'), 0) + try: + for v in vol_list: + # outgoing text to libvirt, encode('utf-8') + pool.createXML(v['xml'].encode('utf-8'), 0) + except libvirt.libvirtError as e: + raise OperationFailed("KCHVMSTOR0008E", {'error': e.message}) return vol_list -- 1.9.3

2 1

[PATCH] Remove README statement that advises user does not use Kimchi in production
by Aline Manera 24 Nov '14

24 Nov '14

PowerKVM is a good example that Kimchi can be used in production environment. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- docs/README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/README.md b/docs/README.md index de6db91..555ce89 100644 --- a/docs/README.md +++ b/docs/README.md @@ -169,9 +169,7 @@ pool (default path is: /var/lib/kimchi/isos). Known Issues ------------ -1. Kimchi is still experimental and should not be used in a production -environment. -2. When you are using NFS as storage pool, check the nfs export path permission +1. When you are using NFS as storage pool, check the nfs export path permission is configured as: (1) export path need to be squashed as kvm gid and libvirt uid: /my_export_path *(all_squash,anongid=<kvm-gid>, anonuid=<libvirt-uid>,rw,sync) -- 1.9.3

2 2

[PATCH] Return empty dict when VM doesn't have current snasphot
by Crístian Viana 24 Nov '14

24 Nov '14

The current API design is to return an error 404 when a current snapshot doesn't exist on a virtual machine. But it was decided that the best approach is to return an empty structure instead. Return an empty dict instead of raising an error when a VM doesn't have a current snapshot. Also, update the tests accordingly. Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- src/kimchi/model/vmsnapshots.py | 2 +- tests/test_model.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/kimchi/model/vmsnapshots.py b/src/kimchi/model/vmsnapshots.py index ad8460e..0da9dc3 100644 --- a/src/kimchi/model/vmsnapshots.py +++ b/src/kimchi/model/vmsnapshots.py @@ -177,7 +177,7 @@ class CurrentVMSnapshotModel(object): snap_name = vir_snap.getName().decode('utf-8') except libvirt.libvirtError, e: if e.get_error_code() == libvirt.VIR_ERR_NO_DOMAIN_SNAPSHOT: - raise NotFoundError('KCHSNAP0007E', {'vm': vm_name}) + return {} raise OperationFailed('KCHSNAP0008E', {'vm': vm_name, 'err': e.message}) diff --git a/tests/test_model.py b/tests/test_model.py index c68b01f..0681be9 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -124,8 +124,8 @@ class ModelTests(unittest.TestCase): inst.vm_poweroff(u'kimchi-vm') vm = inst.vm_lookup(u'kimchi-vm') - self.assertRaises(NotFoundError, inst.currentvmsnapshot_lookup, - u'kimchi-vm') + empty_snap = inst.currentvmsnapshot_lookup(u'kimchi-vm') + self.assertEquals({}, empty_snap) # this snapshot should be deleted when its VM is deleted params = {'name': u'mysnap'} -- 1.9.3

3 2

[PATCHv7 0/4] LDAP authorization support
by lvroyce＠linux.vnet.ibm.com 24 Nov '14

24 Nov '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v1>v4, split user and group and be compatible to previous access tagging v5>v7, Update testcases. Royce Lv (4): Split users and groups for permission query Move validation to authorizaiton change vm permission tag Update test model for authentication and authorization docs/API.md | 19 ++++++---- src/kimchi/control/groups.py | 28 ++++++++++++++ src/kimchi/control/host.py | 14 ------- src/kimchi/control/users.py | 35 +++++++++++++++++ src/kimchi/i18n.py | 1 + src/kimchi/mockmodel.py | 4 ++ src/kimchi/model/groups.py | 67 +++++++++++++++++++++++++++++++++ src/kimchi/model/host.py | 19 ---------- src/kimchi/model/users.py | 90 ++++++++++++++++++++++++++++++++++++++++++++ src/kimchi/model/vms.py | 65 ++++++++++++++++++++------------ tests/test_authorization.py | 3 +- tests/test_model.py | 3 +- tests/test_rest.py | 4 +- tests/utils.py | 3 +- 14 files changed, 284 insertions(+), 71 deletions(-) create mode 100644 src/kimchi/control/groups.py create mode 100644 src/kimchi/control/users.py create mode 100644 src/kimchi/model/groups.py create mode 100644 src/kimchi/model/users.py -- 1.8.3.2

2 5

[PATCHv3 0/2] UI: LDAP integration of VM permission
by lvroyce＠linux.vnet.ibm.com 24 Nov '14

24 Nov '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v1>v3, Delete useless elements according to YuXin's comments. Royce Lv (2): UI: support ldap vm permission tag Change guest edit permission logic ui/css/theme-default/guest-edit.css | 81 +++++++--- ui/js/src/kimchi.api.js | 15 +- ui/js/src/kimchi.guest_edit_main.js | 289 ++++++++++++++++++++++++------------ ui/pages/guest-edit.html.tmpl | 22 ++- 4 files changed, 284 insertions(+), 123 deletions(-) -- 1.8.3.2

1 2

[v2] UI: CPU Topology
by huoyuxin＠linux.vnet.ibm.com 21 Nov '14

21 Nov '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/template-edit.css | 28 ++++++++++++++++++- ui/js/src/kimchi.api.js | 14 +++++++++ ui/js/src/kimchi.template_edit_main.js | 47 +++++++++++++++++++++++++++++++- ui/pages/template-edit.html.tmpl | 16 ++++++++--- 4 files changed, 99 insertions(+), 6 deletions(-) diff --git a/ui/css/theme-default/template-edit.css b/ui/css/theme-default/template-edit.css index 094e909..7abee7c 100644 --- a/ui/css/theme-default/template-edit.css +++ b/ui/css/theme-default/template-edit.css @@ -142,4 +142,30 @@ #edit-template-tabs .hide { display: none; -} \ No newline at end of file +} + +#form-template-processor select, +#form-template-processor input[type="text"] { + margin-left: 10px; +} + +#form-template-processor input[type="checkbox"] { + margin-right: 5px; +} + +#form-template-processor .manual { + margin-top: 10px; + margin-left: -3px; +} + +#form-template-processor .topology { + margin: 10px 30px; +} + +#form-template-processor .topology div { + margin-bottom: 10px; +} + +#form-template-processor .topology select { + width: 80px; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 78c6d66..7a239c0 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -1260,5 +1260,19 @@ var kimchi = { kimchi.message.error(data.responseJSON.reason); } }); + }, + + getCPUInfo : function(suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'host/cpuinfo', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); } }; diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index d4e19c2..9536ab7 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -200,8 +200,44 @@ kimchi.template_edit_main = function() { }); }); }; + var initProcessor = function(){ + var setCPUValue = function(){ + if(!$('#cores').hasClass("invalid-field")&&$('#cores').val()!=""){ + $("#cpus").val(parseInt($("#cores").val())*parseInt($("#threads").val())); + }else{ + $("#cpus").val(''); + } + }; + $("input:text", "#form-template-processor").on('keyup', function(){ + $(this).toggleClass("invalid-field", !$(this).val().match('^[0-9]*$')); + if($(this).prop('id')=='cores') setCPUValue(); + }); + $("input:checkbox", "#form-template-processor").click(function(){ + $(".topology", "#form-template-processor").toggleClass("hide", !$(this).prop("checked")); + $("#cpus").attr("disabled", $(this).prop("checked")); + setCPUValue(); + }); + $('select', '#form-template-processor').change(function(){ + setCPUValue(); + }); + kimchi.getCPUInfo(function(data){ + var options = ""; + for(var i=0;Math.pow(2,i)<=data.threads_per_core;i++){ + var lastOne = Math.pow(2,i+1)>data.threads_per_core?" selected":""; + options += "<option"+lastOne+">"+Math.pow(2,i)+"</option>"; + } + $('select', '#form-template-processor').append(options); + if(template.cpus) $("#cpus").val(template.cpus); + if(template.cpu_info.cores) $("#cores").val(template.cpu_info.cores); + if(template.cpu_info.threads){ + $('select', '#form-template-processor').val(template.cpu_info.threads); + $("input:checkbox", "#form-template-processor").trigger('click'); + } + }); + }; kimchi.listNetworks(initInterface); kimchi.listStoragePools(initStorage); + initProcessor(); }; kimchi.retrieveTemplate(kimchi.selectedTemplate, initTemplate); @@ -241,7 +277,16 @@ kimchi.template_edit_main = function() { } }); data['memory'] = Number(data['memory']); - data['cpus'] = Number(data['cpus']); + data['cpus'] = parseInt($('#cpus').val()); + if($("input:checkbox", "#form-template-processor").prop("checked")){ + data['cpu_info'] = { + sockets: 1, + cores: parseInt($("#cores").val()), + threads: parseInt($("#threads").val()), + }; + }else{ + data['cpu_info'] = {}; + } var networks = $('.template-tab-body .item', '#form-template-interface'); var networkForUpdate = new Array(); $.each(networks, function(index, networkEntities) { diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 90a6256..f43b9c0 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -40,6 +40,9 @@ <li> <a href="#form-template-interface">$_("Interface")</a> </li> + <li> + <a href="#form-template-processor">$_("Processor")</a> + </li> </ul> <form id="form-template-general"> <div class="form-template-inline-wrapper"> @@ -53,9 +56,6 @@ <label for="template-edit-version-textbox">$_("Version")</label> </div> <div class="template-edit-wrapper-label"> - <label for="template-edit-cpu-textbox">$_("CPU Number")</label> - </div> - <div class="template-edit-wrapper-label"> <label for="template-edit-memory-textbox">$_("Memory (MB)")</label> </div> <div class="template-edit-wrapper-label templ-edit-cdrom"> @@ -120,6 +120,14 @@ </div> <div class="template-tab-body"></div> </form> + <form id="form-template-processor"> + <div>$_("CPU Number"):<input type="text" value="1" id="cpus"></div> + <div class="manual"><input type="checkbox">$_("Manually set CPU topology")</div> + <div class="topology hide"> + <div>$_("Cores"):<input type="text" value="1" id="cores"></div> + <div>$_("Threads"):<select id="threads"></select></div> + </div> + </form> </div> </div> <footer> @@ -157,4 +165,4 @@ <button class="delete"></button> </span> </div> -</script> \ No newline at end of file +</script> -- 1.7.1

2 1

[PATCH] UI: CPU Topology
by huoyuxin＠linux.vnet.ibm.com 20 Nov '14

20 Nov '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/template-edit.css | 24 ++++++++++++++++++++++- ui/js/src/kimchi.api.js | 14 +++++++++++++ ui/js/src/kimchi.template_edit_main.js | 33 +++++++++++++++++++++++++++++++- ui/pages/template-edit.html.tmpl | 17 ++++++++++++--- 4 files changed, 82 insertions(+), 6 deletions(-) diff --git a/ui/css/theme-default/template-edit.css b/ui/css/theme-default/template-edit.css index 094e909..2231dc6 100644 --- a/ui/css/theme-default/template-edit.css +++ b/ui/css/theme-default/template-edit.css @@ -142,4 +142,26 @@ #edit-template-tabs .hide { display: none; -} \ No newline at end of file +} + +#form-template-processor select, +#form-template-processor input[type="text"] { + margin-left: 10px; +} + +#form-template-processor input[type="checkbox"] { + margin-right: 5px; +} + +#form-template-processor .manual { + margin-top: 10px; + margin-left: -3px; +} + +#form-template-processor .topology { + margin: 10px 30px; +} + +#form-template-processor .topology div { + margin-bottom: 10px; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 78c6d66..7a239c0 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -1260,5 +1260,19 @@ var kimchi = { kimchi.message.error(data.responseJSON.reason); } }); + }, + + getCPUInfo : function(suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'host/cpuinfo', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); } }; diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index d4e19c2..bba4415 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -200,8 +200,33 @@ kimchi.template_edit_main = function() { }); }); }; + var initProcessor = function(){ + $("input:text", "#form-template-processor").on('keyup', function(){ + $(this).toggleClass("invalid-field", !$(this).val().match('^[0-9]*$')); + }); + $("input:checkbox", "#form-template-processor").click(function(){ + $(".topology", "#form-template-processor").toggleClass("hide", !$(this).prop("checked")); + $("#cpu").attr("disabled", $(this).prop("checked")); + }); + kimchi.getCPUInfo(function(data){ + var options = ""; + for(var i=0;Math.pow(2,i)<=data.threads_per_core;i++){ + var lastOne = Math.pow(2,i+1)>data.threads_per_core?" selected":""; + options += "<option"+lastOne+">"+Math.pow(2,i)+"</option>"; + } + $('select', '#form-template-processor').append(options); + if(template.cpus) $("#cpu").val(template.cpus); + if(template.cpu_info.sockets) $("#sockets").val(template.cpu_info.sockets); + if(template.cpu_info.cores) $("#cores").val(template.cpu_info.cores); + if(template.cpu_info.threads){ + $('select', '#form-template-processor').val(template.cpu_info.threads); + $("input:checkbox", "#form-template-processor").trigger('click'); + } + }); + }; kimchi.listNetworks(initInterface); kimchi.listStoragePools(initStorage); + initProcessor(); }; kimchi.retrieveTemplate(kimchi.selectedTemplate, initTemplate); @@ -241,7 +266,13 @@ kimchi.template_edit_main = function() { } }); data['memory'] = Number(data['memory']); - data['cpus'] = Number(data['cpus']); + data['cpus'] = parseInt($('#cpu').val()); + if($("input:checkbox", "#form-template-processor").prop("checked")) + data['cpu_info'] = { + sockets: parseInt($("#sockets").val()), + cores: parseInt($("#cores").val()), + threads: parseInt($("#threads").val()), + }; var networks = $('.template-tab-body .item', '#form-template-interface'); var networkForUpdate = new Array(); $.each(networks, function(index, networkEntities) { diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 90a6256..47c3979 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -40,6 +40,9 @@ <li> <a href="#form-template-interface">$_("Interface")</a> </li> + <li> + <a href="#form-template-processor">$_("Processor")</a> + </li> </ul> <form id="form-template-general"> <div class="form-template-inline-wrapper"> @@ -53,9 +56,6 @@ <label for="template-edit-version-textbox">$_("Version")</label> </div> <div class="template-edit-wrapper-label"> - <label for="template-edit-cpu-textbox">$_("CPU Number")</label> - </div> - <div class="template-edit-wrapper-label"> <label for="template-edit-memory-textbox">$_("Memory (MB)")</label> </div> <div class="template-edit-wrapper-label templ-edit-cdrom"> @@ -120,6 +120,15 @@ </div> <div class="template-tab-body"></div> </form> + <form id="form-template-processor"> + <div>$_("CPU Number"):<input type="text" value="1" id="cpu"></div> + <div class="manual"><input type="checkbox">$_("Manually set CPU topology")</div> + <div class="topology hide"> + <div>$_("Sockets"):<input type="text" value="1" id="sockets"></div> + <div>$_("Cores"):<input type="text" value="1" id="cores"></div> + <div>$_("Threads"):<select id="threads"></select></div> + </div> + </form> </div> </div> <footer> @@ -157,4 +166,4 @@ <button class="delete"></button> </span> </div> -</script> \ No newline at end of file +</script> -- 1.7.1

3 3

[PATCHv6 0/4] LDAP authorization
by lvroyce0210＠gmail.com 20 Nov '14

20 Nov '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v1>v4, split user and group and be compatible to previous access tagging v5>v6, Update testcases. Royce Lv (4): Split users and groups for permission query Move validation to authorizaiton change vm permission tag Update test model for authentication and authorization docs/API.md | 19 ++++++---- src/kimchi/control/groups.py | 28 ++++++++++++++ src/kimchi/control/host.py | 14 ------- src/kimchi/control/users.py | 35 +++++++++++++++++ src/kimchi/i18n.py | 1 + src/kimchi/mockmodel.py | 4 ++ src/kimchi/model/groups.py | 67 +++++++++++++++++++++++++++++++++ src/kimchi/model/host.py | 19 ---------- src/kimchi/model/users.py | 90 ++++++++++++++++++++++++++++++++++++++++++++ src/kimchi/model/vms.py | 65 ++++++++++++++++++++------------ tests/test_authorization.py | 3 +- tests/test_model.py | 3 +- tests/test_rest.py | 4 +- tests/utils.py | 3 +- 14 files changed, 284 insertions(+), 71 deletions(-) create mode 100644 src/kimchi/control/groups.py create mode 100644 src/kimchi/control/users.py create mode 100644 src/kimchi/model/groups.py create mode 100644 src/kimchi/model/users.py -- 1.8.3.2

3 6

[PATCH v6] Auto Topology for Guest Templates
by Christy Perez 19 Nov '14

19 Nov '14

This should be the final major revision for this. After more discussion with Aline, it seems we've moved very far from "no input from users" to "let users input the numbers, with some small restrctions." Aline said she would talk with the UI team, but I'll still put a small description here: 1. UI adds a new section on the template panel near vcpus. There's a checkbox with the text, "Manually configure guest CPU topology." If the users checks it - The UI calls GET /host/cpuinfo - The CPUs field becomes inactive, and will now be populated by the UI based on the sockets & cores (next item): CPUS = cores * threads - Two fields appear: A selection field for threads (powers of 2 : 0...log(threads_per_core, 2)). This section should be called either SMT (Power), or Threads (x86). The 2nd field is a plain text box titled Cores that takes any integer. Note: no 'automatic' option for threads/SMT. - The UI calls POST template with the topology. 2. If the user doesn't check the checkbox, there's nothing new to pass in for the template create. Note: Currently there is a failing test in mockmodel, due to the nature of the libvirt test driver. I'm looking into a workaround for the getCapabilities function. Christy Perez (1): Parts to allow Kimchi to configure the cpu topology. docs/API.md | 24 ++++++++ src/kimchi/control/cpuinfo.py | 37 ++++++++++++ src/kimchi/control/host.py | 2 + src/kimchi/i18n.py | 5 ++ src/kimchi/model/cpuinfo.py | 128 ++++++++++++++++++++++++++++++++++++++++++ src/kimchi/model/templates.py | 10 ++-- 6 files changed, 202 insertions(+), 4 deletions(-) create mode 100644 src/kimchi/control/cpuinfo.py create mode 100644 src/kimchi/model/cpuinfo.py -- 1.9.3

2 3

[PATCH] Bugfix: UI Disable button "Create" when adding a VM
by Wen Wang 19 Nov '14

19 Nov '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> This patch fixed the bug when creating a VM user can still click on "Create" button for multiple create which is not appropriate. Now the button is disabled and show "Creating..." instead of "Create" indicate user that the creating is in progress. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_add_main.js | 8 ++++++-- ui/pages/guest-add.html.tmpl | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.guest_add_main.js b/ui/js/src/kimchi.guest_add_main.js index f4affbc..df76975 100644 --- a/ui/js/src/kimchi.guest_add_main.js +++ b/ui/js/src/kimchi.guest_add_main.js @@ -55,17 +55,21 @@ kimchi.guest_add_main = function() { $('#form-vm-add').change(function() { if (validateForm()) { - $('#vm-doAdd').removeAttr('disabled'); + $('#vm-doAdd').attr('disabled', false); } }); var addGuest = function(event) { + $('#vm-doAdd').attr('disabled', true); + $('#vm-doAdd').attr('style', 'display:none'); + $('#vm-doAdding').attr('style', 'display'); var formData = $('#form-vm-add').serializeObject(); - kimchi.createVM(formData, function() { kimchi.listVmsAuto(); kimchi.window.close(); }, function(jqXHR, textStatus, errorThrown) { + $('#vm-doAdd').attr('style', 'display'); + $('#vm-doAdding').attr('style', 'display:none'); var reason = jqXHR && jqXHR['responseJSON'] && jqXHR['responseJSON']['reason']; diff --git a/ui/pages/guest-add.html.tmpl b/ui/pages/guest-add.html.tmpl index e3270fb..ab26c1e 100644 --- a/ui/pages/guest-add.html.tmpl +++ b/ui/pages/guest-add.html.tmpl @@ -82,6 +82,7 @@ <footer> <div class="btn-group"> <button id="vm-doAdd" class="btn-normal" disabled="disabled" href="javascript:void(0);"><span class="text">$_("Create")</span></button> + <button id="vm-doAdding" class="btn-normal" disabled="disabled" style="display:none" href="javascript:void(0);"><span class="text">$_("Creating...")</span></button> </div> </footer> </div> -- 1.7.1

2 1

[PATCH V5] Edit Template redefined
by Wen Wang 19 Nov '14

19 Nov '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V4 -> V5: Add support of duplicated-interface configuration in template. V3 -> V4: 1) Deleted "save" icon for storage & interface tab. 2) Fix the bug when submitting multiple network error. Filter the duplicated submission. V2 -> V3: Fix the bug that iscsi and scsi disk size won't change automatically V1 -> V2: 1) Enable "iSCSI" and "SCSI" for storage. 2) Changed the storage tab from "storage" to "Storage". 3) Fix the defect that when editing/adding "Storage" or "Interface" line went down issue. 4) "Storage" and "Interface" content can display properly on Remote and Image created template. 5) Fix the defect that "Image" didn't show properly when using a Image created template. This patch redesigned "Edit Template" diaguage in "Templates". New "Edit Template" will display all the related information into tabs of "General", "Storage" and "Interface". Due to unfinished back-end work, functions are not fully supported, which will be finished in the future work. Temporary disabled functions: 1) Multiple disk operation with multiple storage pools edit in template for which reason the add button in "Storage" tab is disabled. 2) iSCSI and SCSI storage pool add is removed since we are going to allow this kind of operation in the process of creating a VM. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- src/kimchi/API.json | 2 - ui/css/theme-default/template-edit.css | 116 +++++++++----- ui/js/src/kimchi.template_edit_main.js | 280 ++++++++++++++++++++------------ ui/pages/template-edit.html.tmpl | 158 ++++++++++--------- 4 files changed, 339 insertions(+), 217 deletions(-) diff --git a/src/kimchi/API.json b/src/kimchi/API.json index 0ad36ab..c5d7bdb 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -470,7 +470,6 @@ "description": "list of which networks will be assigned to the new VM.", "type": "array", "items": { "type": "string" }, - "uniqueItems": true, "error": "KCHTMPL0017E" }, "folder": { @@ -641,7 +640,6 @@ "description": "list of which networks will be assigned to the new VM.", "type": "array", "items": { "type": "string" }, - "uniqueItems": true, "error": "KCHTMPL0017E" }, "folder": { diff --git a/ui/css/theme-default/template-edit.css b/ui/css/theme-default/template-edit.css index 4975f1b..094e909 100644 --- a/ui/css/theme-default/template-edit.css +++ b/ui/css/theme-default/template-edit.css @@ -17,24 +17,33 @@ */ #template-edit-window { font-size: 13px; - height: 600px; - width: 1000px; + height: 500px; + width: 800px; } -.template-edit-fieldset { - float: left; - padding: 1em; +#edit-template-tabs { + background: none repeat scroll 0 0 transparent; + border: medium none; + height: 100%; + padding: 0; } -.template-edit-wrapper-label, .template-edit-wrapper-controls { +#edit-template-tabs .form-template-inline-wrapper { + display: inline-block; vertical-align: top; - width: 470px; } .template-edit-wrapper-label { - height: 18px; - line-height: 18px; - margin-top: 8px; + vertical-align: top; + min-width: 100px; + height: 35px; + line-height: 35px; + margin: 7px 0 8px; +} + +.template-edit-wrapper-controls { + vertical-align: top; + width: 400px; } .template-edit-wrapper-controls input[type="text"] { @@ -56,7 +65,7 @@ .template-edit-wrapper-controls > .dropdown { margin: 5px 0 0 1px; - width: 440px; + width: 372px; } .template-edit-wrapper-controls input[type="text"][disabled] { @@ -65,41 +74,72 @@ cursor: not-allowed; } -.hidden-area { - display: none; +#edit-template-tabs .template-tab-header { + margin-bottom: 8px; + padding-bottom: 2px; + font-weight: bold; + border-bottom: 1px solid #999999; + overflow: hidden; } -.template-edit-wrapper-controls .select-list-box { - width: 464px; - max-height: 168px; - overflow: auto; - margin-top: 5px; - border: 1px solid #ccc; +#edit-template-tabs .template-tab-header .action-area { + float: right; + height: 20px; + width: 20px; } -.template-edit-wrapper-controls .select-list-box>li>label { - display: block; +#edit-template-tabs .template-interface-cell { + display: inline-block; + width: 250px; } -.template-edit-wrapper-controls .select-list-box>li>label> -input[type="checkbox"] { - display: none; +#edit-template-tabs .template-storage-cell{ + display: inline-block; + width: 230px; +} + +#edit-template-tabs .template-storage-cell label { + height: 25px; + padding: 2px; + border: 1px; } -.template-edit-wrapper-controls .select-list-box>li>label>.item { - display: block; - height: 41px; - line-height: 41px; - padding: 0 20px 0 40px; - border-bottom: 1px solid #ccc; - box-shadow: 0px 1px 1px #fff; - text-shadow: -1px -1px 1px #ddd, 1px 1px 1px #fff; - color: #222; - font-size: 12px; +#form-template-storage .template-tab-body select { + width: 140px; } -.template-edit-wrapper-controls .select-list-box>li>label> -input[type="checkbox"]:CHECKED+.item { - background: #f8f8f8 url(../images/theme-default/check-green.png) no-repeat - 10px center; +#form-template-storage .template-tab-body input { + width: 56px; + height: 17px; } + +#form-template-storage .template-tab-body .template-storage-name { + width: 220px; +} + +#edit-template-tabs .template-tab-body input[readonly] { + background: none repeat scroll 0 0 rgba(0, 0, 0, 0); + border-color: transparent; + text-overflow: ellipsis; +} + +#edit-template-tabs .template-tab-body .item { + height: 25px; +} + +#form-template-interface .template-tab-body select { + width: 180px; +} + +#edit-template-tabs .template-tab-body .action-area { + float: right; +} + +#edit-template-tabs .template-tab-body .action-area button { + width: 20px; + height: 20px; +} + +#edit-template-tabs .hide { + display: none; +} \ No newline at end of file diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index 2f4cc9a..d4e19c2 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -16,19 +16,23 @@ * limitations under the License. */ kimchi.template_edit_main = function() { - var templateEditForm = $('#form-template-edit'); + var templateEditMain = $('#edit-template-tabs'); var origDisks; var origPool; + var origNetworks; var templateDiskSize; - $('#template-name', templateEditForm).val(kimchi.selectedTemplate); - kimchi.retrieveTemplate(kimchi.selectedTemplate, function(template) { + $('#template-name', templateEditMain).val(kimchi.selectedTemplate); + templateEditMain.tabs(); + + var initTemplate = function(template) { origDisks = template.disks; origPool = template.storagepool; + origNetworks = template.networks; for(var i=0;i<template.disks.length;i++){ if(template.disks[i].base){ template["vm-image"] = template.disks[i].base; - $('#templ-edit-cdrom').addClass('hide-content'); - $('#templ-edit-vm-image').removeClass('hide-content'); + $('.templ-edit-cdrom').addClass('hide'); + $('.templ-edit-vm-image').removeClass('hide'); break; } } @@ -37,18 +41,12 @@ kimchi.template_edit_main = function() { if (prop == 'graphics') { value = value["type"]; } - $('input[name="' + prop + '"]', templateEditForm).val(value); - } - var disks = template.disks; - $('input[name="disks"]').val(disks[0].size); - templateDiskSize = $('input[name="disks"]').val(); - if (disks[0].volume) { - var spool_value = $('#form-template-edit [name="storagepool"]').val(); - $('input[name="storagepool"]', templateEditForm).val(spool_value + '/' + disks[0].volume); - $('input[name="disks"]', templateEditForm).attr('disabled','disabled'); + $('input[name="' + prop + '"]', templateEditMain).val(value); } var vncOpt = [{label: 'VNC', value: 'vnc'}]; + $('#template-edit-graphics').append('<option selected>VNC</option>'); + $('#template-edit-graphics').append('<option>Spice</option>'); kimchi.select('template-edit-graphics-list', vncOpt); var enableSpice = function() { if (kimchi.capabilities == undefined) { @@ -61,119 +59,199 @@ kimchi.template_edit_main = function() { } }; enableSpice(); - - var scsipools = {}; - kimchi.listStoragePools(function(result) { - var options = []; - if (result && result.length) { - $.each(result, function(index, storagePool) { - if ((storagePool.state=="active") && (storagePool.type !== 'kimchi-iso')) { - if ((storagePool.type == 'iscsi') || (storagePool.type == 'scsi')){ - scsipools[storagePool.name] = []; - kimchi.listStorageVolumes(storagePool.name, function(result) { - if (result && result.length) { - $.each(result, function(index, storageVolume) { - options.push({ - label: storagePool.name + '/' + storageVolume.name, - value: '/storagepools/' + storagePool.name + '/' + storageVolume.name - }); - scsipools[storagePool.name].push(storageVolume) - }); - } - kimchi.select('template-edit-storagePool-list', options); - }); + var initStorage = function(result) { + var scsipools = {}; + var addStorageItem = function(storageData) { + var thisName = storageData.storageName; + var nodeStorage = $.parseHTML(kimchi.substitute($('#template-storage-pool-tmpl').html(), storageData)); + $('.template-tab-body', '#form-template-storage').append(nodeStorage); + var storageOptions = ''; + var scsiOptions = ''; + $('select', '#form-template-storage').find('option').remove(); + $.each(result, function(index, storageEntities) { + if((storageEntities.state === 'active') && (storageEntities.type != 'kimchi-iso')) { + if(storageEntities.type === 'iscsi' || storageEntities.type === 'scsi') { + kimchi.listStorageVolumes(storageEntities.name, function(currentVolume) { + $.each(currentVolume, function(indexSCSI, scsiEntities) { + var tmpPath = storageEntities.name + '/' + scsiEntities.name; + var isSlected = tmpPath === thisName ? ' selected' : ''; + scsiOptions += '<option' + isSlected + '>' + tmpPath + '</option>'; + }); + $('select', '#form-template-storage').append(scsiOptions); + }, function() {}); + } else { + var isSlected = storageEntities.name === thisName ? ' selected' : ''; + storageOptions += '<option' + isSlected + '>' + storageEntities.name + '</option>'; } - else { - options.push({ - label: storagePool.name, - value: '/storagepools/' + storagePool.name - }); + } + }); + $('select', '#form-template-storage').append(storageOptions); + $('select', '#form-template-storage').change(function() { + var selectedItem = $(this).parent().parent(); + var tempStorageNameFull = $(this).val(); + var tempType; + var tempStorageName =tempStorageNameFull.split('/')[0]; + var scsiCap; + $.each(result, function(index, storageEntities) { + if (tempStorageName === storageEntities.name) { + selectedItem.find('.template-storage-type').val(storageEntities.type); + scsiCap = storageEntities.capacity / Math.pow(1024, 3); + tempType = storageEntities.type; } + }); + if (tempType === 'iscsi' || tempType === 'scsi') { + $('.template-storage-disk', selectedItem).attr('readonly', true).val(scsiCap); + } else { + $('.template-storage-disk', selectedItem).attr('readonly', false).val('10'); } + $('.template-storage-name').val(tempStorageNameFull); }); + }; + + if ((origDisks && origDisks.length) && (origPool && origPool.length)) { + splitPool = origPool.split('/'); + var defaultPool; + var defaultType; + $.each(result, function(index, poolEntities) { + if (poolEntities.name === splitPool[splitPool.length-1]) { + defaultType = poolEntities.type; + defaultPool = splitPool[splitPool.length-1] + } + }); + if (origDisks[0]['volume']) { + defaultPool = defaultPool + '/' + origDisks[0]['volume']; + } + $.each(origDisks, function(index, diskEntities) { + var storageNodeData = { + viewMode : '', + editMode : 'hide', + storageName : defaultPool, + storageType : defaultType, + storageDisk : diskEntities.size + } + addStorageItem(storageNodeData); + }); + if(defaultType === 'iscsi' || defaultType === 'scsi') { + $('.template-storage-disk').attr('readonly', true); + } } - if ($.isEmptyObject(scsipools)) { - kimchi.select('template-edit-storagePool-list', options); - } - }); - kimchi.listNetworks(function(result) { - if(result && result.length > 0) { - var html = ''; - var tmpl = $('#tmpl-network').html(); - $.each(result, function(index, network) { - if (result[index].state === 'active') - html += kimchi.substitute(tmpl, network); + + $('#template-edit-storage-add-button').button({ + icons: { + primary: "ui-icon-plusthick" + }, + text: false, + disabled: true + }).click(function(event) { + event.preventDefault(); + var storageNodeData = { + viewMode : 'hide', + editMode : '', + storageName : 'null', + storageType : 'dir', + storageDisk : '10' + } + addStorageItem(storageNodeData); + }); + }; + var initInterface = function(result) { + var networkItemNum = 0; + var addInterfaceItem = function(networkData) { + var networkName = networkData.networkV; + var nodeInterface = $.parseHTML(kimchi.substitute($('#template-interface-tmpl').html(), networkData)); + $('.template-tab-body', '#form-template-interface').append(nodeInterface); + $('.delete', '#form-template-interface').button({ + icons : {primary : 'ui-icon-trash'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + $(this).parent().parent().remove(); }); - $('#template-edit-network-list').html(html).show(); - if(template.networks && template.networks.length > 0) { - $('input[name="networks"]', templateEditForm).each(function(index, element) { - var value = $(element).val(); - if(template.networks.indexOf(value) >= 0) { - $(element).prop('checked', true); - } + var networkOptions = ''; + for(var i=0;i<result.length;i++){ + if(result[i].state === "active") { + var isSlected = networkName===result[i].name ? ' selected' : ''; + networkOptions += '<option' + isSlected + '>' + result[i].name + '</option>'; + } + } + $('select', '#form-template-interface #networkID' + networkItemNum).append(networkOptions); + networkItemNum += 1; + }; + if(result && result.length > 0) { + for(var i=0;i<origNetworks.length;i++) { + addInterfaceItem({ + networkID : 'networkID' + networkItemNum, + networkV : origNetworks[i], + type : 'network' }); } - } else { - $('#template-edit-network-list').hide(); } - }); - }); - - $('#template-edit-storagePool').change(function() { - storagepool = $(this).val(); - var storageArray = storagepool.split("/"); - if (storageArray.length > 3) { - volumeName = storageArray.pop(); - poolName = storageArray.pop(); - kimchi.getStoragePoolVolume(poolName, volumeName, function(result) { - $('input[name="disks"]', templateEditForm).val(result.capacity / Math.pow(1024,3)); - $('input[name="disks"]', templateEditForm).attr('disabled','disabled'); - return false; - }, function (err) { - kimchi.message.error(err.responseJSON.reason); + $('#template-edit-interface-add-button').button({ + icons: { + primary: 'ui-icon-plusthick' + }, + text: false + }).click(function(evt) { + evt.preventDefault(); + addInterfaceItem({ + networkID : 'networkID' + networkItemNum, + networkV : 'default', + type : 'network' + }); }); - } else { - $('input[name="disks"]', templateEditForm).removeAttr('disabled'); - $('input[name="disks"]', templateEditForm).val(templateDiskSize); - } - }); - $('input[name="disks"]', templateEditForm).keyup(function() { - templateDiskSize = $('input[name="disks"]', templateEditForm).val(); - }); + }; + kimchi.listNetworks(initInterface); + kimchi.listStoragePools(initStorage); + }; + kimchi.retrieveTemplate(kimchi.selectedTemplate, initTemplate); + $('#tmpl-edit-button-save').on('click', function() { - var editableFields = [ 'name', 'cpus', 'memory', 'storagepool', 'disks', 'graphics']; + var editableFields = [ 'name', 'cpus', 'memory', 'disks', 'graphics']; var data = {}; + //Fix me: Only support one storage pool now + var storages = $('.template-tab-body .item', '#form-template-storage'); + var tempName = $('.template-storage-name', storages).val(); + tempName = tempName.split('/'); + var tempNameHead =tempName[0]; + var tempNameTail = tempNameHead; + if(tempNameHead === 'iscsi' || tempNameHead =='scsi') { + tempNameTail = tempName[tempName.length-1]; + } + tempName = '/storagepools/' + tempNameHead; + data['storagepool'] = tempName; $.each(editableFields, function(i, field) { /* Support only 1 disk at this moment */ if (field == 'disks') { - origDisks[0].size = Number($('#form-template-edit [name="' + field + '"]').val()); + var tmpItem = $('#form-template-storage .item'); + origDisks[0].size = Number($('.template-storage-disk', tmpItem).val()); + if($('.template-storage-type', tmpItem).val() === 'iscsi' || $('.template-storage-type', tmpItem).val() =='scsi') { + origDisks[0]['volume'] = tempNameTail; + } else { + origDisks[0]['volume'] && delete origDisks[0]['volume']; + } data[field] = origDisks; } else if (field == 'graphics') { - var type = $('#form-template-edit [name="' + field + '"]').val(); + var type = $('#form-template-general [name="' + field + '"]').val(); data[field] = {'type': type}; } else { - data[field] = $('#form-template-edit [name="' + field + '"]').val(); + data[field] = $('#form-template-general [name="' + field + '"]').val(); } }); data['memory'] = Number(data['memory']); data['cpus'] = Number(data['cpus']); - storagepool = data['storagepool']; - storageArray = storagepool.split("/"); - if (storageArray.length > 3){ - /* Support only 1 disk at this moment */ - data["disks"][0].volume = storageArray.pop(); - data['storagepool'] = storageArray.join("/"); - } else if (data["disks"][0].volume) { - delete data["disks"][0].volume; - } - var networks = templateEditForm.serializeObject().networks; - if (networks instanceof Array) { - data.networks = networks; - } else if (networks != null) { - data.networks = [networks]; + var networks = $('.template-tab-body .item', '#form-template-interface'); + var networkForUpdate = new Array(); + $.each(networks, function(index, networkEntities) { + var thisValue = $('select', networkEntities).val(); + networkForUpdate.push(thisValue); + }); + if (networkForUpdate instanceof Array) { + data.networks = networkForUpdate; + } else if (networkForUpdate != null) { + data.networks = [networkForUpdate]; } else { data.networks = []; } diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 5a71d91..3515546 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -28,74 +28,67 @@ <div class="close">X</div> </header> <div class="content"> - <form id="form-template-edit"> + <div id="edit-template-tabs"> <input type="hidden" id="template-name" name="templateName" /> - <fieldset class="template-edit-fieldset"> - <div> + <ul> + <li> + <a href="#form-template-general">$_("General")</a> + </li> + <li> + <a href="#form-template-storage">$_("Storage")</a> + </li> + <li> + <a href="#form-template-interface">$_("Interface")</a> + </li> + </ul> + <form id="form-template-general"> + <div class="form-template-inline-wrapper"> <div class="template-edit-wrapper-label"> <label for="template-edit-id-textbox">$_("Name")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-id-textbox" name="name" type="text" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-vendor-textbox">$_("Vendor")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-vendor-textbox" name="os_distro" type="text" disabled="disabled" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-version-textbox">$_("Version")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-version-textbox" name="os_version" type="text" disabled="disabled" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-cpu-textbox">$_("CPU Number")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-cpu-textbox" name="cpus" type="text" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-memory-textbox">$_("Memory (MB)")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-memory-textbox" name="memory" type="text" /> + <div class="template-edit-wrapper-label templ-edit-cdrom"> + <label for="template-edit-cdrom-textbox">$_("CDROM")</label> + </div> + <div class="template-edit-wrapper-label templ-edit-vm-image hide"> + <label for="template-edit-vmimage-textbox">$_("Image File")</label> </div> - </div> - <div> <div class="template-edit-wrapper-label"> - <label for="template-edit-disk-textbox">$_("Disk (GB)")</label> + <label>$_("Graphics")</label> </div> + </div> + <div class="form-template-inline-wrapper"> <div class="template-edit-wrapper-controls"> - <input id="template-edit-disk-textbox" name="disks" type="text" /> + <input id="template-edit-id-textbox" name="name" type="text" /> </div> - </div> - </fieldset> - <fieldset class="template-edit-fieldset"> - <div id="templ-edit-cdrom"> - <div class="template-edit-wrapper-label"> - <label for="template-edit-cdrom-textbox">$_("CDROM")</label> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-vendor-textbox" name="os_distro" type="text" disabled="disabled" /> </div> <div class="template-edit-wrapper-controls"> - <input id="template-edit-cdrom-textbox" name="cdrom" type="text" disabled="disabled"/> + <input id="template-edit-version-textbox" name="os_version" type="text" disabled="disabled" /> </div> - </div> - <div id="templ-edit-vm-image" class="hide-content"> - <div class="template-edit-wrapper-label">$_("Image File")</div> - <div class="template-edit-wrapper-controls"><input name="vm-image" type="text" disabled/></div> - </div> - <div> - <div class="template-edit-wrapper-label"> - <label>$_("Graphics")</label> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-cpu-textbox" name="cpus" type="text" /> + </div> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-memory-textbox" name="memory" type="text" /> + </div> + <div class="template-edit-wrapper-controls templ-edit-cdrom"> + <input id="template-edit-cdrom-textbox" name="cdrom" type="text" disabled="disabled" /> + </div> + <div class="template-edit-wrapper-controls templ-edit-vm-image hide"> + <input id="template-edit-vmimage-textbox" name="vm-image" type="text" disabled="disabled" /> </div> <div class="template-edit-wrapper-controls"> <div class="btn dropdown popable"> @@ -108,40 +101,26 @@ </div> </div> </div> - <div> - <div class="template-edit-wrapper-label"> - <label>$_("Storage Pool")</label> - </div> - <div class="template-edit-wrapper-controls"> - <div class="btn dropdown popable"> - <input id="template-edit-storagePool" name="storagepool" type="hidden" /> - <span class="text" id="template-edit-storage-label"></span><span class="arrow"></span> - <div class="popover" style="width: 100%"> - <ul class="select-list" id="template-edit-storagePool-list" data-target="template-edit-storagePool" data-label="template-edit-storage-label"> - </ul> - </div> - </div> - </div> + </form> + <form id="form-template-storage"> + <div class="template-tab-header"> + <span class="template-storage-cell">$_("Storage Pool")</span> + <span class="template-storage-cell">$_("Type")</span> + <span class="template-storage-cell">$_("Disk(GB)")</span> + <button type="button" id="template-edit-storage-add-button" class="action-area"></button> </div> - <div> - <div class="template-edit-wrapper-label"> - <label>$_("Network")</label> - </div> - <div class="template-edit-wrapper-controls"> - <ul class="select-list-box" id="template-edit-network-list"> - </ul> - <script id="tmpl-network" type="text/html"> - <li> - <label> - <input name="networks" type="checkbox" value="{name}" /> - <span class="item">{name}</span> - </label> - </li> - </script> - </div> + <div class="template-tab-body"> </div> - </fieldset> - </form> + </form> + <form id="form-template-interface"> + <div class="template-tab-header"> + <span class="template-interface-cell">$_("Network")</span> + <span class="template-interface-cell">$_("Type")</span> + <button type="button" id="template-edit-interface-add-button" class="action-area"></button> + </div> + <div class="template-tab-body"></div> + </form> + </div> </div> <footer> <div class="btn-group"> @@ -152,3 +131,30 @@ <script> kimchi.template_edit_main(); </script> +<script id="template-storage-pool-tmpl" type="text/html"> + <div class='item'> + <span class="template-storage-cell"> + <input class="template-storage-name" value={storageName} type="text" style="display:none" /> + <select></select> + </span> + <span class="template-storage-cell"> + <input class="template-storage-type" value={storageType} readonly=true type="text" /> + </span> + <span class="template-storage-cell"> + <input class="template-storage-disk" value={storageDisk} type="text" /> + </span> + </div> +</script> +<script id="template-interface-tmpl" type="text/html"> + <div class="item" id={networkID}> + <span class="template-interface-cell"> + <select></select> + </span> + <span class="template-interface-cell"> + <input value={type} readonly=true type="text" /> + </span> + <span class="action-area"> + <button class="delete"></button> + </span> + </div> +</script> \ No newline at end of file -- 1.7.1

2 1

[PATCH 0/2] Snapshot bugfixes
by Crístian Viana 19 Nov '14

19 Nov '14

Crístian Viana (2): Return empty dict when request body is empty bugfix: Use correct error code when current snapshot does not exist src/kimchi/control/utils.py | 3 +++ src/kimchi/model/vmsnapshots.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) -- 1.9.3

2 3

[PATCH V4] Edit Template redefined
by Wen Wang 19 Nov '14

19 Nov '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V3 -> V4: 1) Deleted "save" icon for storage & interface tab. 2) Fix the bug when submitting multiple network error. Filter the duplicated submission. V2 -> V3: Fix the bug that iscsi and scsi disk size won't change automatically V1 -> V2: 1) Enable "iSCSI" and "SCSI" for storage. 2) Changed the storage tab from "storage" to "Storage". 3) Fix the defect that when editing/adding "Storage" or "Interface" line went down issue. 4) "Storage" and "Interface" content can display properly on Remote and Image created template. 5) Fix the defect that "Image" didn't show properly when using a Image created template. This patch redesigned "Edit Template" diaguage in "Templates". New "Edit Template" will display all the related information into tabs of "General", "Storage" and "Interface". Due to unfinished back-end work, functions are not fully supported, which will be finished in the future work. Temporary disabled functions: 1) Multiple disk operation with multiple storage pools edit in template for which reason the add button in "Storage" tab is disabled. 2) iSCSI and SCSI storage pool add is removed since we are going to allow this kind of operation in the process of creating a VM. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/template-edit.css | 116 +++++++++----- ui/js/src/kimchi.template_edit_main.js | 286 ++++++++++++++++++++----------- ui/pages/template-edit.html.tmpl | 158 +++++++++--------- 3 files changed, 344 insertions(+), 216 deletions(-) diff --git a/ui/css/theme-default/template-edit.css b/ui/css/theme-default/template-edit.css index 4975f1b..094e909 100644 --- a/ui/css/theme-default/template-edit.css +++ b/ui/css/theme-default/template-edit.css @@ -17,24 +17,33 @@ */ #template-edit-window { font-size: 13px; - height: 600px; - width: 1000px; + height: 500px; + width: 800px; } -.template-edit-fieldset { - float: left; - padding: 1em; +#edit-template-tabs { + background: none repeat scroll 0 0 transparent; + border: medium none; + height: 100%; + padding: 0; } -.template-edit-wrapper-label, .template-edit-wrapper-controls { +#edit-template-tabs .form-template-inline-wrapper { + display: inline-block; vertical-align: top; - width: 470px; } .template-edit-wrapper-label { - height: 18px; - line-height: 18px; - margin-top: 8px; + vertical-align: top; + min-width: 100px; + height: 35px; + line-height: 35px; + margin: 7px 0 8px; +} + +.template-edit-wrapper-controls { + vertical-align: top; + width: 400px; } .template-edit-wrapper-controls input[type="text"] { @@ -56,7 +65,7 @@ .template-edit-wrapper-controls > .dropdown { margin: 5px 0 0 1px; - width: 440px; + width: 372px; } .template-edit-wrapper-controls input[type="text"][disabled] { @@ -65,41 +74,72 @@ cursor: not-allowed; } -.hidden-area { - display: none; +#edit-template-tabs .template-tab-header { + margin-bottom: 8px; + padding-bottom: 2px; + font-weight: bold; + border-bottom: 1px solid #999999; + overflow: hidden; } -.template-edit-wrapper-controls .select-list-box { - width: 464px; - max-height: 168px; - overflow: auto; - margin-top: 5px; - border: 1px solid #ccc; +#edit-template-tabs .template-tab-header .action-area { + float: right; + height: 20px; + width: 20px; } -.template-edit-wrapper-controls .select-list-box>li>label { - display: block; +#edit-template-tabs .template-interface-cell { + display: inline-block; + width: 250px; } -.template-edit-wrapper-controls .select-list-box>li>label> -input[type="checkbox"] { - display: none; +#edit-template-tabs .template-storage-cell{ + display: inline-block; + width: 230px; +} + +#edit-template-tabs .template-storage-cell label { + height: 25px; + padding: 2px; + border: 1px; } -.template-edit-wrapper-controls .select-list-box>li>label>.item { - display: block; - height: 41px; - line-height: 41px; - padding: 0 20px 0 40px; - border-bottom: 1px solid #ccc; - box-shadow: 0px 1px 1px #fff; - text-shadow: -1px -1px 1px #ddd, 1px 1px 1px #fff; - color: #222; - font-size: 12px; +#form-template-storage .template-tab-body select { + width: 140px; } -.template-edit-wrapper-controls .select-list-box>li>label> -input[type="checkbox"]:CHECKED+.item { - background: #f8f8f8 url(../images/theme-default/check-green.png) no-repeat - 10px center; +#form-template-storage .template-tab-body input { + width: 56px; + height: 17px; } + +#form-template-storage .template-tab-body .template-storage-name { + width: 220px; +} + +#edit-template-tabs .template-tab-body input[readonly] { + background: none repeat scroll 0 0 rgba(0, 0, 0, 0); + border-color: transparent; + text-overflow: ellipsis; +} + +#edit-template-tabs .template-tab-body .item { + height: 25px; +} + +#form-template-interface .template-tab-body select { + width: 180px; +} + +#edit-template-tabs .template-tab-body .action-area { + float: right; +} + +#edit-template-tabs .template-tab-body .action-area button { + width: 20px; + height: 20px; +} + +#edit-template-tabs .hide { + display: none; +} \ No newline at end of file diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index 2f4cc9a..070ba20 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -16,19 +16,23 @@ * limitations under the License. */ kimchi.template_edit_main = function() { - var templateEditForm = $('#form-template-edit'); + var templateEditMain = $('#edit-template-tabs'); var origDisks; var origPool; + var origNetworks; var templateDiskSize; - $('#template-name', templateEditForm).val(kimchi.selectedTemplate); - kimchi.retrieveTemplate(kimchi.selectedTemplate, function(template) { + $('#template-name', templateEditMain).val(kimchi.selectedTemplate); + templateEditMain.tabs(); + + var initTemplate = function(template) { origDisks = template.disks; origPool = template.storagepool; + origNetworks = template.networks; for(var i=0;i<template.disks.length;i++){ if(template.disks[i].base){ template["vm-image"] = template.disks[i].base; - $('#templ-edit-cdrom').addClass('hide-content'); - $('#templ-edit-vm-image').removeClass('hide-content'); + $('.templ-edit-cdrom').addClass('hide'); + $('.templ-edit-vm-image').removeClass('hide'); break; } } @@ -37,18 +41,12 @@ kimchi.template_edit_main = function() { if (prop == 'graphics') { value = value["type"]; } - $('input[name="' + prop + '"]', templateEditForm).val(value); - } - var disks = template.disks; - $('input[name="disks"]').val(disks[0].size); - templateDiskSize = $('input[name="disks"]').val(); - if (disks[0].volume) { - var spool_value = $('#form-template-edit [name="storagepool"]').val(); - $('input[name="storagepool"]', templateEditForm).val(spool_value + '/' + disks[0].volume); - $('input[name="disks"]', templateEditForm).attr('disabled','disabled'); + $('input[name="' + prop + '"]', templateEditMain).val(value); } var vncOpt = [{label: 'VNC', value: 'vnc'}]; + $('#template-edit-graphics').append('<option selected>VNC</option>'); + $('#template-edit-graphics').append('<option>Spice</option>'); kimchi.select('template-edit-graphics-list', vncOpt); var enableSpice = function() { if (kimchi.capabilities == undefined) { @@ -61,119 +59,203 @@ kimchi.template_edit_main = function() { } }; enableSpice(); - - var scsipools = {}; - kimchi.listStoragePools(function(result) { - var options = []; - if (result && result.length) { - $.each(result, function(index, storagePool) { - if ((storagePool.state=="active") && (storagePool.type !== 'kimchi-iso')) { - if ((storagePool.type == 'iscsi') || (storagePool.type == 'scsi')){ - scsipools[storagePool.name] = []; - kimchi.listStorageVolumes(storagePool.name, function(result) { - if (result && result.length) { - $.each(result, function(index, storageVolume) { - options.push({ - label: storagePool.name + '/' + storageVolume.name, - value: '/storagepools/' + storagePool.name + '/' + storageVolume.name - }); - scsipools[storagePool.name].push(storageVolume) - }); - } - kimchi.select('template-edit-storagePool-list', options); - }); - } - else { - options.push({ - label: storagePool.name, - value: '/storagepools/' + storagePool.name - }); + var initStorage = function(result) { + var scsipools = {}; + var addStorageItem = function(storageData) { + var thisName = storageData.storageName; + var nodeStorage = $.parseHTML(kimchi.substitute($('#template-storage-pool-tmpl').html(), storageData)); + $('.template-tab-body', '#form-template-storage').append(nodeStorage); + var storageOptions = ''; + var scsiOptions = ''; + $('select', '#form-template-storage').find('option').remove(); + $.each(result, function(index, storageEntities) { + if((storageEntities.state === 'active') && (storageEntities.type != 'kimchi-iso')) { + if(storageEntities.type === 'iscsi' || storageEntities.type === 'scsi') { + kimchi.listStorageVolumes(storageEntities.name, function(currentVolume) { + $.each(currentVolume, function(indexSCSI, scsiEntities) { + var tmpPath = storageEntities.name + '/' + scsiEntities.name; + var isSlected = tmpPath === thisName ? ' selected' : ''; + scsiOptions += '<option' + isSlected + '>' + tmpPath + '</option>'; + }); + $('select', '#form-template-storage').append(scsiOptions); + }, function() {}); + } else { + var isSlected = storageEntities.name === thisName ? ' selected' : ''; + storageOptions += '<option' + isSlected + '>' + storageEntities.name + '</option>'; } } }); - } - if ($.isEmptyObject(scsipools)) { - kimchi.select('template-edit-storagePool-list', options); - } - }); - kimchi.listNetworks(function(result) { - if(result && result.length > 0) { - var html = ''; - var tmpl = $('#tmpl-network').html(); - $.each(result, function(index, network) { - if (result[index].state === 'active') - html += kimchi.substitute(tmpl, network); - }); - $('#template-edit-network-list').html(html).show(); - if(template.networks && template.networks.length > 0) { - $('input[name="networks"]', templateEditForm).each(function(index, element) { - var value = $(element).val(); - if(template.networks.indexOf(value) >= 0) { - $(element).prop('checked', true); + $('select', '#form-template-storage').append(storageOptions); + $('select', '#form-template-storage').change(function() { + var selectedItem = $(this).parent().parent(); + var tempStorageNameFull = $(this).val(); + var tempType; + var tempStorageName =tempStorageNameFull.split('/')[0]; + var scsiCap; + $.each(result, function(index, storageEntities) { + if (tempStorageName === storageEntities.name) { + selectedItem.find('.template-storage-type').val(storageEntities.type); + scsiCap = storageEntities.capacity / Math.pow(1024, 3); + tempType = storageEntities.type; } }); + if (tempType === 'iscsi' || tempType === 'scsi') { + $('.template-storage-disk', selectedItem).attr('readonly', true).val(scsiCap); + } else { + $('.template-storage-disk', selectedItem).attr('readonly', false).val('10'); + } + $('.template-storage-name').val(tempStorageNameFull); + }); + }; + + if ((origDisks && origDisks.length) && (origPool && origPool.length)) { + splitPool = origPool.split('/'); + var defaultPool; + var defaultType; + $.each(result, function(index, poolEntities) { + if (poolEntities.name === splitPool[splitPool.length-1]) { + defaultType = poolEntities.type; + defaultPool = splitPool[splitPool.length-1] + } + }); + if (origDisks[0]['volume']) { + defaultPool = defaultPool + '/' + origDisks[0]['volume']; + } + $.each(origDisks, function(index, diskEntities) { + var storageNodeData = { + viewMode : '', + editMode : 'hide', + storageName : defaultPool, + storageType : defaultType, + storageDisk : diskEntities.size + } + addStorageItem(storageNodeData); + }); + if(defaultType === 'iscsi' || defaultType === 'scsi') { + $('.template-storage-disk').attr('readonly', true); } - } else { - $('#template-edit-network-list').hide(); } - }); - }); - $('#template-edit-storagePool').change(function() { - storagepool = $(this).val(); - var storageArray = storagepool.split("/"); - if (storageArray.length > 3) { - volumeName = storageArray.pop(); - poolName = storageArray.pop(); - kimchi.getStoragePoolVolume(poolName, volumeName, function(result) { - $('input[name="disks"]', templateEditForm).val(result.capacity / Math.pow(1024,3)); - $('input[name="disks"]', templateEditForm).attr('disabled','disabled'); - return false; - }, function (err) { - kimchi.message.error(err.responseJSON.reason); + $('#template-edit-storage-add-button').button({ + icons: { + primary: "ui-icon-plusthick" + }, + text: false, + disabled: true + }).click(function(event) { + event.preventDefault(); + var storageNodeData = { + viewMode : 'hide', + editMode : '', + storageName : 'null', + storageType : 'dir', + storageDisk : '10' + } + addStorageItem(storageNodeData); }); - } else { - $('input[name="disks"]', templateEditForm).removeAttr('disabled'); - $('input[name="disks"]', templateEditForm).val(templateDiskSize); - } - }); - $('input[name="disks"]', templateEditForm).keyup(function() { - templateDiskSize = $('input[name="disks"]', templateEditForm).val(); - }); + }; + var initInterface = function(result) { + var networkItemNum = 0; + var addInterfaceItem = function(networkData) { + var networkName = networkData.networkV; + var nodeInterface = $.parseHTML(kimchi.substitute($('#template-interface-tmpl').html(), networkData)); + $('.template-tab-body', '#form-template-interface').append(nodeInterface); + $('.delete', '#form-template-interface').button({ + icons : {primary : 'ui-icon-trash'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + $(this).parent().parent().remove(); + }); + var networkOptions = ''; + for(var i=0;i<result.length;i++){ + if(result[i].state === "active") { + var isSlected = networkName===result[i].name ? ' selected' : ''; + networkOptions += '<option' + isSlected + '>' + result[i].name + '</option>'; + } + } + $('select', '#form-template-interface #networkID' + networkItemNum).append(networkOptions); + networkItemNum += 1; + }; + if(result && result.length > 0) { + $.each(result, function(index, data) { + if($.inArray(data.name, origNetworks) > -1) { + addInterfaceItem({ + networkID : 'networkID' + networkItemNum, + networkV : data.name, + type : 'network' + }); + } + }); + } + $('#template-edit-interface-add-button').button({ + icons: { + primary: 'ui-icon-plusthick' + }, + text: false + }).click(function(evt) { + evt.preventDefault(); + addInterfaceItem({ + networkID : 'networkID' + networkItemNum, + networkV : 'default', + type : 'network' + }); + }); + }; + kimchi.listNetworks(initInterface); + kimchi.listStoragePools(initStorage); + }; + kimchi.retrieveTemplate(kimchi.selectedTemplate, initTemplate); + $('#tmpl-edit-button-save').on('click', function() { - var editableFields = [ 'name', 'cpus', 'memory', 'storagepool', 'disks', 'graphics']; + var editableFields = [ 'name', 'cpus', 'memory', 'disks', 'graphics']; var data = {}; + //Fix me: Only support one storage pool now + var storages = $('.template-tab-body .item', '#form-template-storage'); + var tempName = $('.template-storage-name', storages).val(); + tempName = tempName.split('/'); + var tempNameHead =tempName[0]; + var tempNameTail = tempNameHead; + if(tempNameHead === 'iscsi' || tempNameHead =='scsi') { + tempNameTail = tempName[tempName.length-1]; + } + tempName = '/storagepools/' + tempNameHead; + data['storagepool'] = tempName; $.each(editableFields, function(i, field) { /* Support only 1 disk at this moment */ if (field == 'disks') { - origDisks[0].size = Number($('#form-template-edit [name="' + field + '"]').val()); + var tmpItem = $('#form-template-storage .item'); + origDisks[0].size = Number($('.template-storage-disk', tmpItem).val()); + if($('.template-storage-type', tmpItem).val() === 'iscsi' || $('.template-storage-type', tmpItem).val() =='scsi') { + origDisks[0]['volume'] = tempNameTail; + } else { + origDisks[0]['volume'] && delete origDisks[0]['volume']; + } data[field] = origDisks; } else if (field == 'graphics') { - var type = $('#form-template-edit [name="' + field + '"]').val(); + var type = $('#form-template-general [name="' + field + '"]').val(); data[field] = {'type': type}; } else { - data[field] = $('#form-template-edit [name="' + field + '"]').val(); + data[field] = $('#form-template-general [name="' + field + '"]').val(); } }); data['memory'] = Number(data['memory']); data['cpus'] = Number(data['cpus']); - storagepool = data['storagepool']; - storageArray = storagepool.split("/"); - if (storageArray.length > 3){ - /* Support only 1 disk at this moment */ - data["disks"][0].volume = storageArray.pop(); - data['storagepool'] = storageArray.join("/"); - } else if (data["disks"][0].volume) { - delete data["disks"][0].volume; - } - var networks = templateEditForm.serializeObject().networks; - if (networks instanceof Array) { - data.networks = networks; - } else if (networks != null) { - data.networks = [networks]; + var networks = $('.template-tab-body .item', '#form-template-interface'); + var networkForUpdate = new Array(); + $.each(networks, function(index, networkEntities) { + var thisValue = $('select', networkEntities).val(); + if($.inArray(thisValue, networkForUpdate) === -1) { + networkForUpdate.push(thisValue); + } + }); + if (networkForUpdate instanceof Array) { + data.networks = networkForUpdate; + } else if (networkForUpdate != null) { + data.networks = [networkForUpdate]; } else { data.networks = []; } diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 5a71d91..3515546 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -28,74 +28,67 @@ <div class="close">X</div> </header> <div class="content"> - <form id="form-template-edit"> + <div id="edit-template-tabs"> <input type="hidden" id="template-name" name="templateName" /> - <fieldset class="template-edit-fieldset"> - <div> + <ul> + <li> + <a href="#form-template-general">$_("General")</a> + </li> + <li> + <a href="#form-template-storage">$_("Storage")</a> + </li> + <li> + <a href="#form-template-interface">$_("Interface")</a> + </li> + </ul> + <form id="form-template-general"> + <div class="form-template-inline-wrapper"> <div class="template-edit-wrapper-label"> <label for="template-edit-id-textbox">$_("Name")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-id-textbox" name="name" type="text" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-vendor-textbox">$_("Vendor")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-vendor-textbox" name="os_distro" type="text" disabled="disabled" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-version-textbox">$_("Version")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-version-textbox" name="os_version" type="text" disabled="disabled" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-cpu-textbox">$_("CPU Number")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-cpu-textbox" name="cpus" type="text" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-memory-textbox">$_("Memory (MB)")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-memory-textbox" name="memory" type="text" /> + <div class="template-edit-wrapper-label templ-edit-cdrom"> + <label for="template-edit-cdrom-textbox">$_("CDROM")</label> + </div> + <div class="template-edit-wrapper-label templ-edit-vm-image hide"> + <label for="template-edit-vmimage-textbox">$_("Image File")</label> </div> - </div> - <div> <div class="template-edit-wrapper-label"> - <label for="template-edit-disk-textbox">$_("Disk (GB)")</label> + <label>$_("Graphics")</label> </div> + </div> + <div class="form-template-inline-wrapper"> <div class="template-edit-wrapper-controls"> - <input id="template-edit-disk-textbox" name="disks" type="text" /> + <input id="template-edit-id-textbox" name="name" type="text" /> </div> - </div> - </fieldset> - <fieldset class="template-edit-fieldset"> - <div id="templ-edit-cdrom"> - <div class="template-edit-wrapper-label"> - <label for="template-edit-cdrom-textbox">$_("CDROM")</label> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-vendor-textbox" name="os_distro" type="text" disabled="disabled" /> </div> <div class="template-edit-wrapper-controls"> - <input id="template-edit-cdrom-textbox" name="cdrom" type="text" disabled="disabled"/> + <input id="template-edit-version-textbox" name="os_version" type="text" disabled="disabled" /> </div> - </div> - <div id="templ-edit-vm-image" class="hide-content"> - <div class="template-edit-wrapper-label">$_("Image File")</div> - <div class="template-edit-wrapper-controls"><input name="vm-image" type="text" disabled/></div> - </div> - <div> - <div class="template-edit-wrapper-label"> - <label>$_("Graphics")</label> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-cpu-textbox" name="cpus" type="text" /> + </div> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-memory-textbox" name="memory" type="text" /> + </div> + <div class="template-edit-wrapper-controls templ-edit-cdrom"> + <input id="template-edit-cdrom-textbox" name="cdrom" type="text" disabled="disabled" /> + </div> + <div class="template-edit-wrapper-controls templ-edit-vm-image hide"> + <input id="template-edit-vmimage-textbox" name="vm-image" type="text" disabled="disabled" /> </div> <div class="template-edit-wrapper-controls"> <div class="btn dropdown popable"> @@ -108,40 +101,26 @@ </div> </div> </div> - <div> - <div class="template-edit-wrapper-label"> - <label>$_("Storage Pool")</label> - </div> - <div class="template-edit-wrapper-controls"> - <div class="btn dropdown popable"> - <input id="template-edit-storagePool" name="storagepool" type="hidden" /> - <span class="text" id="template-edit-storage-label"></span><span class="arrow"></span> - <div class="popover" style="width: 100%"> - <ul class="select-list" id="template-edit-storagePool-list" data-target="template-edit-storagePool" data-label="template-edit-storage-label"> - </ul> - </div> - </div> - </div> + </form> + <form id="form-template-storage"> + <div class="template-tab-header"> + <span class="template-storage-cell">$_("Storage Pool")</span> + <span class="template-storage-cell">$_("Type")</span> + <span class="template-storage-cell">$_("Disk(GB)")</span> + <button type="button" id="template-edit-storage-add-button" class="action-area"></button> </div> - <div> - <div class="template-edit-wrapper-label"> - <label>$_("Network")</label> - </div> - <div class="template-edit-wrapper-controls"> - <ul class="select-list-box" id="template-edit-network-list"> - </ul> - <script id="tmpl-network" type="text/html"> - <li> - <label> - <input name="networks" type="checkbox" value="{name}" /> - <span class="item">{name}</span> - </label> - </li> - </script> - </div> + <div class="template-tab-body"> </div> - </fieldset> - </form> + </form> + <form id="form-template-interface"> + <div class="template-tab-header"> + <span class="template-interface-cell">$_("Network")</span> + <span class="template-interface-cell">$_("Type")</span> + <button type="button" id="template-edit-interface-add-button" class="action-area"></button> + </div> + <div class="template-tab-body"></div> + </form> + </div> </div> <footer> <div class="btn-group"> @@ -152,3 +131,30 @@ <script> kimchi.template_edit_main(); </script> +<script id="template-storage-pool-tmpl" type="text/html"> + <div class='item'> + <span class="template-storage-cell"> + <input class="template-storage-name" value={storageName} type="text" style="display:none" /> + <select></select> + </span> + <span class="template-storage-cell"> + <input class="template-storage-type" value={storageType} readonly=true type="text" /> + </span> + <span class="template-storage-cell"> + <input class="template-storage-disk" value={storageDisk} type="text" /> + </span> + </div> +</script> +<script id="template-interface-tmpl" type="text/html"> + <div class="item" id={networkID}> + <span class="template-interface-cell"> + <select></select> + </span> + <span class="template-interface-cell"> + <input value={type} readonly=true type="text" /> + </span> + <span class="action-area"> + <button class="delete"></button> + </span> + </div> +</script> \ No newline at end of file -- 1.7.1

2 3

[PATCH] UI: Enable Upload function in UI
by Wen Wang 19 Nov '14

19 Nov '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> After testing, upload funcion works and this patch did the ui change that enable upload a volume in storage Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storagepool_add_volume_main.js | 2 +- ui/pages/storagepool-add-volume.html.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.storagepool_add_volume_main.js b/ui/js/src/kimchi.storagepool_add_volume_main.js index 590ccde..05c7bb1 100644 --- a/ui/js/src/kimchi.storagepool_add_volume_main.js +++ b/ui/js/src/kimchi.storagepool_add_volume_main.js @@ -88,12 +88,12 @@ kimchi.sp_add_volume_main = function() { sp: kimchi.selectedSP, formData: fd }, function(result) { - kimchi.window.close(); kimchi.topic('kimchi/storageVolumeAdded').publish(); }, onError); }; $(addButton).on('click', function(event) { + kimchi.window.close(); $(this).prop('disabled', true); $(typeRadios).prop('disabled', true); if(type === 'download') { diff --git a/ui/pages/storagepool-add-volume.html.tmpl b/ui/pages/storagepool-add-volume.html.tmpl index 573a764..298a565 100644 --- a/ui/pages/storagepool-add-volume.html.tmpl +++ b/ui/pages/storagepool-add-volume.html.tmpl @@ -47,7 +47,7 @@ </div> <div class="form-section"> <h2> - <input type="radio" id="volume-type-upload" class="volume-type" name="volumeType" value="upload" disabled/> + <input type="radio" id="volume-type-upload" class="volume-type" name="volumeType" value="upload"/> <label for="volume-type-upload"> $_("Upload an file") </label> -- 1.7.1

2 2

[PATCHv5 0/4] LDAP authorization
by lvroyce0210＠gmail.com 19 Nov '14

19 Nov '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Royce Lv (4): Split users and groups for permission query Move validation to authorizaiton change vm permission tag Update test model to fix user/group listing docs/API.md | 19 ++++++---- src/kimchi/control/groups.py | 28 ++++++++++++++ src/kimchi/control/host.py | 14 ------- src/kimchi/control/users.py | 35 +++++++++++++++++ src/kimchi/i18n.py | 1 + src/kimchi/model/groups.py | 68 +++++++++++++++++++++++++++++++++ src/kimchi/model/host.py | 19 ---------- src/kimchi/model/users.py | 90 ++++++++++++++++++++++++++++++++++++++++++++ src/kimchi/model/vms.py | 62 +++++++++++++++++++++--------- tests/test_model.py | 3 +- tests/test_rest.py | 4 +- 11 files changed, 281 insertions(+), 62 deletions(-) create mode 100644 src/kimchi/control/groups.py create mode 100644 src/kimchi/control/users.py create mode 100644 src/kimchi/model/groups.py create mode 100644 src/kimchi/model/users.py -- 1.8.3.2

3 6

[v2] UI: Guest Snapshot
by huoyuxin＠linux.vnet.ibm.com 18 Nov '14

18 Nov '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/guest-edit.css | 34 +++++++++++- ui/js/src/kimchi.api.js | 69 ++++++++++++++++++++++ ui/js/src/kimchi.guest_edit_main.js | 107 +++++++++++++++++++++++++++++++++++ ui/pages/guest-edit.html.tmpl | 27 +++++++++ 4 files changed, 236 insertions(+), 1 deletions(-) diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index b1d3931..a565c99 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -96,6 +96,7 @@ } #form-guest-edit-storage .header, +.guest-edit-snapshot .header, .guest-edit-interface .header { margin-bottom: 8px; padding-bottom: 2px; @@ -105,6 +106,7 @@ } #form-guest-edit-storage .body .item, +.guest-edit-snapshot .body .item, .guest-edit-interface .body .item { margin: 5px 0; } @@ -115,6 +117,32 @@ width: 250px; } +.guest-edit-snapshot .cell { + display: inline-block; +} + +.guest-edit-snapshot .sel { + width: 35px; + vertical-align: top; +} + +.guest-edit-snapshot .icon { + background: url('../../images/theme-default/kimchi-loading15x15.gif') no-repeat; + display: inline-block; + width: 20px; + height: 20px; + vertical-align: middle; + margin-left: 2px; +} + +.guest-edit-snapshot .name { + width: 400px; +} + +.guest-edit-snapshot .created { + width: 250px; +} + #form-guest-edit-storage .cell.dev { width: 60px; } @@ -135,6 +163,7 @@ } #form-guest-edit-storage .action-area, +.guest-edit-snapshot .action-area, .guest-edit-interface .action-area { float: right; } @@ -144,12 +173,14 @@ } #form-guest-edit-storage button, +.guest-edit-snapshot button, .guest-edit-interface button { width: 20px; height: 20px; } #form-guest-edit-storage .header button, +.guest-edit-snapshot .header button, .guest-edit-interface .header button { margin-bottom: 1px; } @@ -159,8 +190,9 @@ margin-right: 2px; } +.guest-edit-snapshot .hide, .guest-edit-interface .hide { - display: none; + display: none!important; } .guest-edit-permission { diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 78c6d66..a592298 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -1260,5 +1260,74 @@ var kimchi = { kimchi.message.error(data.responseJSON.reason); } }); + }, + + listSnapshots : function(vm, suc, err) { + kimchi.requestJSON({ + url : kimchi.url+'vms/'+encodeURIComponent(vm)+'/snapshots', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + + getCurrentSnapshot : function(vm, suc, err, sync) { + kimchi.requestJSON({ + url : kimchi.url+'vms/'+encodeURIComponent(vm)+'/snapshots/current', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + async : !sync, + resend : true, + success : suc, + error : err ? err : function(data) { + if(data.status!=404) kimchi.message.error(data.responseJSON.reason); + } + }); + }, + + revertSnapshot : function(vm, snapshot, suc, err) { + kimchi.requestJSON({ + url : kimchi.url+'vms/'+encodeURIComponent(vm)+'/snapshots/'+encodeURIComponent(snapshot)+'/revert', + type : 'POST', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + + createSnapshot : function(vm, suc, err) { + kimchi.requestJSON({ + url : kimchi.url+'vms/'+encodeURIComponent(vm)+'/snapshots', + type : 'POST', + contentType : 'application/json', + dataType : 'json', + data : JSON.stringify({}), + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + + deleteSnapshot : function(vm, snapshot, suc, err) { + kimchi.requestJSON({ + url : kimchi.url+'vms/'+encodeURIComponent(vm)+'/snapshots/'+encodeURIComponent(snapshot), + type : 'DELETE', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); } }; diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 9d87a73..0dc3a31 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -461,6 +461,112 @@ kimchi.guest_edit_main = function() { }); }; + var setupSnapshot = function() { + var currentSnapshot; + var postTask = function(){ + listGeneratingSnapshots(); + $("button", "#form-guest-edit-snapshot").button("enable"); + }; + var addItem = function(data, container) { + var itemNode = $.parseHTML(kimchi.substitute($('#snapshot-tmpl').html(),data)); + $("."+container, "#form-guest-edit-snapshot").append(itemNode); + if(kimchi.thisVMState === "running") { + $("button", itemNode).remove(); + }else{ + $(".delete", itemNode).button({ + icons: { primary: "ui-icon-trash" }, + text: false + }).click(function(evt){ + evt.preventDefault(); + var item = $(this).parent().parent(); + kimchi.deleteSnapshot(kimchi.selectedGuest, item.prop("id"), function(){ + item.remove(); + }); + }); + $(".revert", itemNode).button({ + icons: { primary: "ui-icon-arrowthick-1-ne" }, + text: false + }).click(function(evt){ + evt.preventDefault(); + var item = $(this).parent().parent(); + $(".ui-icon-check", item).addClass("hide"); + $(".icon", item).removeClass("hide"); + $("button", "#form-guest-edit-snapshot").button("disable"); + kimchi.revertSnapshot(kimchi.selectedGuest, item.prop("id"), function(){ + currentSnapshot = item.prop("id"); + $(".ui-icon-check", $(".body", "#form-guest-edit-snapshot")).addClass("hide"); + $(".ui-icon-check", item).removeClass("hide"); + $(".icon", item).addClass("hide"); + $("button", "#form-guest-edit-snapshot").button("enable"); + }, function(data){ + kimchi.message.error(data.responseJSON.reason); + $(".icon", item).addClass("hide"); + if(currentSnapshot) $(".ui-icon-check", currentSnapshot).removeClass("hide"); + $("button", "#form-guest-edit-snapshot").button("enable"); + }); + }); + } + return itemNode; + }; + var addOngoingItem = function(task){ + var uri = task.target_uri; + addItem({ + name: uri.substring(uri.lastIndexOf('/')+1, uri.length), + created: "", + current: "hide", + listMode: "hide", + createMode: "" + }, 'task'); + if(kimchi.trackingTasks.indexOf(task.id)==-1) + kimchi.trackTask(task.id, function(task){ + postTask(); + }, function(err){ + kimchi.message.error(err.message); + postTask(); + }); + }; + var listGeneratingSnapshots = function(){ + $(".task", "#form-guest-edit-snapshot").empty(); + kimchi.getTasksByFilter('status=running&target_uri='+encodeURIComponent('^/snapshots/*'), function(tasks) { + for(var i=0;i<tasks.length;i++){ + addOngoingItem(tasks[i]); + } + if(tasks.length==0) listSnapshots(); + }); + }; + var listSnapshots = function(){ + $(".body", "#form-guest-edit-snapshot").empty(); + kimchi.getCurrentSnapshot(kimchi.selectedGuest, function(snapshot){ + currentSnapshot = snapshot.name; + }); + kimchi.listSnapshots(kimchi.selectedGuest, function(data){ + for(var i=0;i<data.length;i++){ + data[i].created = new Date(data[i].created*1000).toLocaleString(); + data[i].current = data[i].name==currentSnapshot?"":"hide"; + data[i].createMode = "hide"; + data[i].listMode = ""; + var item = addItem(data[i], 'body'); + } + }); + }; + listGeneratingSnapshots(); + if(kimchi.thisVMState === "running") { + $("#form-guest-edit-snapshot .revert").remove(); + $("#form-guest-edit-snapshot .add").remove(); + }else{ + $(".add", "#form-guest-edit-snapshot").button({ + icons: { primary: "ui-icon-plusthick" }, + text: false + }).click(function(evt){ + evt.preventDefault(); + $("button", "#form-guest-edit-snapshot").button("disable"); + kimchi.createSnapshot(kimchi.selectedGuest, function(task){ + addOngoingItem(task); + }); + }); + } + }; + var initContent = function(guest) { guest['icon'] = guest['icon'] || 'images/icon-vm.png'; $('#form-guest-edit-general').fillWithObject(guest); @@ -496,6 +602,7 @@ kimchi.guest_edit_main = function() { setupInterface(); setupPermission(); setupPCIDevice(); + setupSnapshot(); kimchi.topic('kimchi/vmCDROMAttached').subscribe(onAttached); kimchi.topic('kimchi/vmCDROMReplaced').subscribe(onReplaced); diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 512909a..dd320b9 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -44,6 +44,9 @@ <li> <a href="#form-guest-edit-pci">$_("Host PCI Device")</a> </li> + <li> + <a href="#form-guest-edit-snapshot">$_("Snapshot")</a> + </li> </ul> <form id="form-guest-edit-general"> <fieldset class="guest-edit-fieldset"> @@ -160,6 +163,16 @@ <div class="body"></div> </div> </form> + <form id="form-guest-edit-snapshot" class="guest-edit-snapshot"> + <div class="header"> + <span class="cell sel"></span> + <span class="cell name">$_("Name")</span> + <span class="cell created">$_("Created")</span> + <button class="add action-area"></button> + </div> + <div class="task"></div> + <div class="body"></div> + </form> </div> </div> <footer> @@ -251,6 +264,20 @@ <button></button> </div> </script> +<script id="snapshot-tmpl" type="text/html"> + <div class="item" id="{name}"> + <span class="cell sel"> + <span class="icon {createMode}"></span> + <span class="ui-icon ui-icon-check {current}"></span> + </span> + <span class="cell name">{name}</span> + <span class="cell created">{created}</span> + <span class="action-area"> + <button class="revert {listMode}" title="$_("revert")"></button> + <button class="delete {listMode}"></button> + </span> + <div> +</script> <script type="text/javascript"> kimchi.guest_edit_main(); </script> -- 1.7.1

2 1

[PATCH v5] Auto Topology for Guest Templates
by Christy Perez 18 Nov '14

18 Nov '14

1. UI calls GET host/cpuinfo curl -k -u user -H 'Content-Type: application/json' \ -H 'Accept: application/json' https://localhost:8001/host/cpuinfo { "cores":2, "threading_enabled":true, "sockets":1, "threads_per_core":2 } 2. UI displays appropriate title and checkboxes - For both arches (based on Aline's suggestion), include a checkbox that says, "Configure vCPU topology manually." If checked, two fields appear, labeled, 'cores,' and 'threads.' For the threads box, have another dropdown that's the same in theory as the SMTX choices: a drop-down of 1, 2, 4, 8 (depending on the threads_per_socket value). Can the 'cores' box have a hover hint that lists the max? Since sockets will never be more than one, let's list it as a static placeholder (or leave it off completely). Checking this box will make the CPU box inactive, and the CPU number should now be calculated by the UI: CPUs = cores * threads (from the new boxes). - If that manual tickbox isn't selected: - Display the same box for CPUs as before. - Display a menu labled SMT (Power)/Hyper-Threads (x86) with up to five selections: Automatic, 1, 2, 4, 8. The max SMT value displayed will be dependant upoon threads_per_core from above. The default option should be 'Automatic.' For 'Automatic,' send in '0' for the threads value (#3 below). Otherwise, pass the threads selection value (#3 below). Note: This is more architecture-agnostic. The only difference is the label. I'm in favor of keeping SMT somewhere in the screen for Power, since that is how users traditionally think of this, and will look for it. 3. UI calls POST template with threads value set to '0' (x86) or SMTX (Power) Note that vcpus is still optional, so no change in how that's handled needs to be done. $ curl -k -u user -X POST -H 'Content-Type: application/json' -H 'Accept: application/json' https://localhost:8001/templates -d'{"name": "test_auto_topo", "cdrom": "/home/iso-pool/Fedora-Live-Desktop-x86_64-20-1.iso", "cpu_info": {"topology": {"threads":0}}}' { "cpus":1, "cpu_info":{ "topology":{ "cores":1, "threads":1, "sockets":1 } }, "graphics":{ "type":"vnc", "listen":"127.0.0.1" }, "cdrom":"/home/iso-pool/Fedora-Live-Desktop-x86_64-20-1.iso", "networks":[ "default" ], "icon":"images/icon-fedora.png", "os_distro":"fedora", "name":"test_auto_topo", "disks":[ { "index":0, "size":10 } ], "invalid":{}, "os_version":"20", "storagepool":"/storagepools/default", "memory":1024, "folder":[] } Christy Perez (1): Parts to allow Kimchi to configure the cpu topology. docs/API.md | 28 ++++++ src/kimchi/API.json | 11 +-- src/kimchi/control/cpuinfo.py | 37 ++++++++ src/kimchi/control/host.py | 2 + src/kimchi/i18n.py | 6 +- src/kimchi/model/cpuinfo.py | 215 ++++++++++++++++++++++++++++++++++++++++++ src/kimchi/model/host.py | 2 +- src/kimchi/model/templates.py | 25 +++-- 8 files changed, 309 insertions(+), 17 deletions(-) create mode 100644 src/kimchi/control/cpuinfo.py create mode 100644 src/kimchi/model/cpuinfo.py -- 1.9.3

2 3

[PATCH] Use dedicate function to remove unused namespace
by lvroyce＠linux.vnet.ibm.com 18 Nov '14

18 Nov '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> c5cb1515 used "cleanup_namespaces=True" to clean unused namespace. But on rhel lxml library, this argument is not supported and result in error: File "./src/kimchi/model/utils.py", line 145, in _kimchi_get_metadata_node objectify.deannotate(kimchi, cleanup_namespaces=True) File "lxml.objectify.pyx", line 1728, in lxml.objectify.deannotate (src/lxml/lxml.objectify.c:17914) TypeError: deannotate() got an unexpected keyword argument 'cleanup_namespaces' So use a dedicate function to clean the unused namespace. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/model/utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/kimchi/model/utils.py b/src/kimchi/model/utils.py index dc911a9..e02ec66 100644 --- a/src/kimchi/model/utils.py +++ b/src/kimchi/model/utils.py @@ -143,6 +143,7 @@ def _kimchi_get_metadata_node(dom, tag): elem.tag = elem.tag[i+1:] objectify.deannotate(kimchi, cleanup_namespaces=True) + etree.cleanup_namespaces(kimchi) return kimchi return None -- 1.8.3.2

2 1

[PATCH] Use dedicate function to remove unused namespace
by lvroyce＠linux.vnet.ibm.com 18 Nov '14

18 Nov '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> c5cb1515 used "cleanup_namespaces=True" to clean unused namespace. But on rhel lxml library, this argument is not supported and result in error: File "./src/kimchi/model/utils.py", line 145, in _kimchi_get_metadata_node objectify.deannotate(kimchi, cleanup_namespaces=True) File "lxml.objectify.pyx", line 1728, in lxml.objectify.deannotate (src/lxml/lxml.objectify.c:17914) TypeError: deannotate() got an unexpected keyword argument 'cleanup_namespaces' So use a dedicate function to clean the unused namespace. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/model/utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/kimchi/model/utils.py b/src/kimchi/model/utils.py index dc911a9..9896289 100644 --- a/src/kimchi/model/utils.py +++ b/src/kimchi/model/utils.py @@ -142,7 +142,8 @@ def _kimchi_get_metadata_node(dom, tag): if i >= 0: elem.tag = elem.tag[i+1:] - objectify.deannotate(kimchi, cleanup_namespaces=True) + objectify.deannotate(kimchi) + etree.cleanup_namespaces(kimchi) return kimchi return None -- 1.8.3.2

3 2

[PATCH] Don't fail if no translation can be found
by Cédric Bosdonnat 18 Nov '14

18 Nov '14

If a translation file for a locale can't be found, the user gets an HTTP 50x. Use fallback=True in the translation calls to avoid this and use the fallback strings instead. --- ui/pages/error.html.tmpl | 2 +- ui/pages/guest-add.html.tmpl | 2 +- ui/pages/guest-edit.html.tmpl | 2 +- ui/pages/guest-storage-add.html.tmpl | 2 +- ui/pages/guest.html.tmpl | 2 +- ui/pages/i18n.json.tmpl | 2 +- ui/pages/kimchi-ui.html.tmpl | 2 +- ui/pages/login.html.tmpl | 2 +- ui/pages/report-add.html.tmpl | 2 +- ui/pages/report-rename.html.tmpl | 2 +- ui/pages/repository-add.html.tmpl | 2 +- ui/pages/repository-edit.html.tmpl | 2 +- ui/pages/storagepool-add-volume.html.tmpl | 2 +- ui/pages/storagepool-add.html.tmpl | 2 +- ui/pages/tabs/guests.html.tmpl | 2 +- ui/pages/tabs/host.html.tmpl | 2 +- ui/pages/tabs/network.html.tmpl | 2 +- ui/pages/tabs/storage.html.tmpl | 2 +- ui/pages/tabs/templates.html.tmpl | 2 +- ui/pages/template-add.html.tmpl | 2 +- ui/pages/template-edit.html.tmpl | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ui/pages/error.html.tmpl b/ui/pages/error.html.tmpl index 98566c5..d8e16e6 100644 --- a/ui/pages/error.html.tmpl +++ b/ui/pages/error.html.tmpl @@ -19,7 +19,7 @@ #encoding UTF-8 #import gettext #from kimchi.cachebust import href -#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang) +#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True) #silent _ = t.gettext #silent _t = t.gettext <!doctype html> diff --git a/ui/pages/guest-add.html.tmpl b/ui/pages/guest-add.html.tmpl index 3ccafe2..e3270fb 100644 --- a/ui/pages/guest-add.html.tmpl +++ b/ui/pages/guest-add.html.tmpl @@ -18,7 +18,7 @@ #unicode UTF-8 #import gettext #from kimchi.cachebust import href -#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang) +#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True) #silent _ = t.gettext #silent _t = t.gettext <!DOCTYPE html> diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 512909a..62965eb 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -17,7 +17,7 @@ *# #unicode UTF-8 #import gettext -#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang) +#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True) #silent _ = t.gettext #silent _t = t.gettext diff --git a/ui/pages/guest-storage-add.html.tmpl b/ui/pages/guest-storage-add.html.tmpl index c991f42..504316c 100644 --- a/ui/pages/guest-storage-add.html.tmpl +++ b/ui/pages/guest-storage-add.html.tmpl @@ -18,7 +18,7 @@ #unicode UTF-8 #import gettext #from kimchi.cachebust import href -#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang) +#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True) #silent _ = t.gettext #silent _t = t.gettext <div id="guest-storage-add-window" class="window"> diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl index 74206fd..ebb5e86 100644 --- a/ui/pages/guest.html.tmpl +++ b/ui/pages/guest.html.tmpl @@ -18,7 +18,7 @@ #unicode UTF-8 #import gettext #from kimchi.cachebust import href -#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang) +#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True) #silent _ = t.gettext #silent _t = t.gettext <li name="guest" class="guest"> diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 959b7be..1edbc19 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -18,7 +18,7 @@ #unicode UTF-8 #import gettext #from kimchi.cachebust import href -#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang) +#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True) #silent _ = t.gettext #silent _t = t.gettext { diff --git a/ui/pages/kimchi-ui.html.tmpl b/ui/pages/kimchi-ui.html.tmpl index 2f592a6..844234d 100644 --- a/ui/pages/kimchi-ui.html.tmpl +++ b/ui/pages/kimchi-ui.html.tmpl @@ -18,7 +18,7 @@ #unicode UTF-8 #import gettext #from kimchi.cachebust import href -#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang) +#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True) #silent _ = t.gettext #silent _t = t.gettext #from kimchi.config import get_version diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl index f289af5..e2f6855 100644 --- a/ui/pages/login.html.tmpl +++ b/ui/pages/login.html.tmpl @@ -18,7 +18,7 @@ #unicode UTF-8 #import gettext #from kimchi.cachebust import href -#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang) +#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True) #silent _ = t.gettext #silent _t = t.gettext #silent next = "?next=%s" % $getVar('data.next', '') if $getVar('data.next', '') else "" diff --git a/ui/pages/report-add.html.tmpl b/ui/pages/report-add.html.tmpl index 2d0c510..e63da44 100644 --- a/ui/pages/report-add.html.tmpl +++ b/ui/pages/report-add.html.tmpl @@ -18,7 +18,7 @@ #unicode UTF-8 #import gettext #from kimchi.cachebust import href -#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang) +#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True) #silent _ = t.gettext #silent _t = t.gettext <!DOCTYPE html> diff --git a/ui/pages/report-rename.html.tmpl b/ui/pages/report-rename.html.tmpl index 2164af8..5bc91d3 100644 --- a/ui/pages/report-rename.html.tmpl +++ b/ui/pages/report-rename.html.tmpl @@ -18,7 +18,7 @@ #unicode UTF-8 #import gettext #from kimchi.cachebust import href -#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang) +#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True) #silent _ = t.gettext #silent _t = t.gettext <!DOCTYPE html> diff --git a/ui/pages/repository-add.html.tmpl b/ui/pages/repository-add.html.tmpl index ecd0152..6de4f76 100644 --- a/ui/pages/repository-add.html.tmpl +++ b/ui/pages/repository-add.html.tmpl @@ -18,7 +18,7 @@ #unicode UTF-8 #import gettext #from kimchi.cachebust import href -#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang) +#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True) #silent _ = t.gettext #silent _t = t.gettext <div id="repository-add-window" class="window"> diff --git a/ui/pages/repository-edit.html.tmpl b/ui/pages/repository-edit.html.tmpl index 56449f7..f13cb90 100644 --- a/ui/pages/repository-edit.html.tmpl +++ b/ui/pages/repository-edit.html.tmpl @@ -18,7 +18,7 @@ #unicode UTF-8 #import gettext #from kimchi.cachebust import href -#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang) +#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True) #silent _ = t.gettext #silent _t = t.gettext diff --git a/ui/pages/storagepool-add-volume.html.tmpl b/ui/pages/storagepool-add-volume.html.tmpl index 573a764..c0d68f6 100644 --- a/ui/pages/storagepool-add-volume.html.tmpl +++ b/ui/pages/storagepool-add-volume.html.tmpl @@ -18,7 +18,7 @@ #unicode UTF-8 #import gettext #from kimchi.cachebust import href -#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang) +#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True) #silent _ = t.gettext #silent _t = t.gettext <div id="sp-add-volume-window" class="window"> diff --git a/ui/pages/storagepool-add.html.tmpl b/ui/pages/storagepool-add.html.tmpl index 6f1861b..081805b 100644 --- a/ui/pages/storagepool-add.html.tmpl +++ b/ui/pages/storagepool-add.html.tmpl @@ -17,7 +17,7 @@ *# #unicode UTF-8 #import gettext -#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang) +#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True) #silent _ = t.gettext #silent _t = t.gettext <!DOCTYPE html> diff --git a/ui/pages/tabs/guests.html.tmpl b/ui/pages/tabs/guests.html.tmpl index 90d98e5..7bbf570 100644 --- a/ui/pages/tabs/guests.html.tmpl +++ b/ui/pages/tabs/guests.html.tmpl @@ -20,7 +20,7 @@ #import gettext #from Cheetah.Template import Template #from kimchi.cachebust import href -#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang) +#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True) #silent _ = t.gettext #silent _t = t.gettext diff --git a/ui/pages/tabs/host.html.tmpl b/ui/pages/tabs/host.html.tmpl index 81266ce..d5a9b1d 100644 --- a/ui/pages/tabs/host.html.tmpl +++ b/ui/pages/tabs/host.html.tmpl @@ -19,7 +19,7 @@ #unicode UTF-8 #import gettext #from kimchi.cachebust import href -#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang) +#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True) #silent _ = t.gettext #silent _t = t.gettext <div id="host-root-container"> diff --git a/ui/pages/tabs/network.html.tmpl b/ui/pages/tabs/network.html.tmpl index 6a6e5f7..6eaa4b3 100644 --- a/ui/pages/tabs/network.html.tmpl +++ b/ui/pages/tabs/network.html.tmpl @@ -19,7 +19,7 @@ #unicode UTF-8 #import gettext #from kimchi.cachebust import href -#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang) +#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True) #silent _ = t.gettext #silent _t = t.gettext <!DOCTYPE html> diff --git a/ui/pages/tabs/storage.html.tmpl b/ui/pages/tabs/storage.html.tmpl index 523f480..dbbaef9 100644 --- a/ui/pages/tabs/storage.html.tmpl +++ b/ui/pages/tabs/storage.html.tmpl @@ -18,7 +18,7 @@ #unicode UTF-8 #import gettext -#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang) +#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True) #silent _ = t.gettext #silent _t = t.gettext <!DOCTYPE html> diff --git a/ui/pages/tabs/templates.html.tmpl b/ui/pages/tabs/templates.html.tmpl index 7cf7fcd..4f91254 100644 --- a/ui/pages/tabs/templates.html.tmpl +++ b/ui/pages/tabs/templates.html.tmpl @@ -18,7 +18,7 @@ #unicode UTF-8 #import gettext #from kimchi.cachebust import href -#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang) +#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True) #silent _ = t.gettext #silent _t = t.gettext <!DOCTYPE html> diff --git a/ui/pages/template-add.html.tmpl b/ui/pages/template-add.html.tmpl index 75bb0ed..eaafaa7 100644 --- a/ui/pages/template-add.html.tmpl +++ b/ui/pages/template-add.html.tmpl @@ -18,7 +18,7 @@ #unicode UTF-8 #import gettext #from kimchi.cachebust import href -#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang) +#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True) #silent _ = t.gettext #silent _t = t.gettext <!DOCTYPE html> diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 5a71d91..d315391 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -18,7 +18,7 @@ #unicode UTF-8 #import gettext #from kimchi.cachebust import href -#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang) +#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True) #silent _ = t.gettext #silent _t = t.gettext -- 2.1.2

3 7

[PATCH] UI: Guest Snapshot
by huoyuxin＠linux.vnet.ibm.com 18 Nov '14

18 Nov '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/guest-edit.css | 34 +++++++++++++- ui/js/src/kimchi.api.js | 67 +++++++++++++++++++++++++ ui/js/src/kimchi.guest_edit_main.js | 91 +++++++++++++++++++++++++++++++++++ ui/pages/guest-edit.html.tmpl | 25 ++++++++++ 4 files changed, 216 insertions(+), 1 deletions(-) diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index b1d3931..a565c99 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -96,6 +96,7 @@ } #form-guest-edit-storage .header, +.guest-edit-snapshot .header, .guest-edit-interface .header { margin-bottom: 8px; padding-bottom: 2px; @@ -105,6 +106,7 @@ } #form-guest-edit-storage .body .item, +.guest-edit-snapshot .body .item, .guest-edit-interface .body .item { margin: 5px 0; } @@ -115,6 +117,32 @@ width: 250px; } +.guest-edit-snapshot .cell { + display: inline-block; +} + +.guest-edit-snapshot .sel { + width: 35px; + vertical-align: top; +} + +.guest-edit-snapshot .icon { + background: url('../../images/theme-default/kimchi-loading15x15.gif') no-repeat; + display: inline-block; + width: 20px; + height: 20px; + vertical-align: middle; + margin-left: 2px; +} + +.guest-edit-snapshot .name { + width: 400px; +} + +.guest-edit-snapshot .created { + width: 250px; +} + #form-guest-edit-storage .cell.dev { width: 60px; } @@ -135,6 +163,7 @@ } #form-guest-edit-storage .action-area, +.guest-edit-snapshot .action-area, .guest-edit-interface .action-area { float: right; } @@ -144,12 +173,14 @@ } #form-guest-edit-storage button, +.guest-edit-snapshot button, .guest-edit-interface button { width: 20px; height: 20px; } #form-guest-edit-storage .header button, +.guest-edit-snapshot .header button, .guest-edit-interface .header button { margin-bottom: 1px; } @@ -159,8 +190,9 @@ margin-right: 2px; } +.guest-edit-snapshot .hide, .guest-edit-interface .hide { - display: none; + display: none!important; } .guest-edit-permission { diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 78c6d66..f80f097 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -1260,5 +1260,72 @@ var kimchi = { kimchi.message.error(data.responseJSON.reason); } }); + }, + + listSnapshots : function(vm, suc, err) { + kimchi.requestJSON({ + url : kimchi.url+'vms/'+encodeURIComponent(vm)+'/snapshots', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + + getCurrentSnapshot : function(vm, suc, err) { + kimchi.requestJSON({ + url : kimchi.url+'vms/'+encodeURIComponent(vm)+'/snapshots/current', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + + revertSnapshot : function(vm, snapshot, suc, err) { + kimchi.requestJSON({ + url : kimchi.url+'vms/'+encodeURIComponent(vm)+'/snapshots/'+encodeURIComponent(snapshot)+'/revert', + type : 'POST', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + + createSnapshot : function(vm, suc, err) { + kimchi.requestJSON({ + url : kimchi.url+'vms/'+encodeURIComponent(vm)+'/snapshots', + type : 'POST', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + + deleteSnapshot : function(vm, snapshot, suc, err) { + kimchi.requestJSON({ + url : kimchi.url+'vms/'+encodeURIComponent(vm)+'/snapshots/'+encodeURIComponent(snapshot), + type : 'DELETE', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); } }; diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 9d87a73..19fc9ba 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -461,6 +461,96 @@ kimchi.guest_edit_main = function() { }); }; + var setupSnapshot = function() { + var currentSnapshot; + var addItem = function(data, container) { + var itemNode = $.parseHTML(kimchi.substitute($('#snapshot-tmpl').html(),data)); + $("."+container, "#form-guest-edit-snapshot").append(itemNode); + $("input:radio", itemNode).click(function(){ + $(".revert", "#form-guest-edit-snapshot").button(currentSnapshot==data.name?"disable":"enable"); + }); + if(kimchi.thisVMState === "running") { + $("#form-guest-edit-snapshot .delete").remove(); + }else{ + $(".delete", itemNode).button({ + icons: { primary: "ui-icon-trash" }, + text: false + }).click(function(evt){ + evt.preventDefault(); + var item = $(this).parent().parent(); + kimchi.deleteSnapshot(kimchi.selectedGuest, item.prop("id"), function(){ + item.remove(); + }); + }); + } + return itemNode; + }; + var listGeneratingSnapshots = function(){ + $(".task", "#form-guest-edit-snapshot").empty(); + kimchi.getTasksByFilter('status=running&target_uri='+encodeURIComponent('^/snapshots/*'), function(tasks) { + for(var i=0;i<tasks.length;i++){ + var uri = tasks[i].target_uri; + addItem({ + name: uri.substring(uri.lastIndexOf('/')+1, uri.length), + created: "", + listMode: "hide", + createMode: "" + }, 'task'); + if(kimchi.trackingTasks.indexOf(tasks[i].id)==-1) + kimchi.trackTask(tasks[i].id, function(task){ + listGeneratingSnapshots(); + listSnapshots(); + }, function(err){ + kimchi.message.error(err.message); + }); + } + }); + }; + var listSnapshots = function(){ + $(".body", "#form-guest-edit-snapshot").empty(); + kimchi.listSnapshots(kimchi.selectedGuest, function(data){ + kimchi.getCurrentSnapshot(kimchi.selectedGuest, function(snapshot){ + currentSnapshot = snapshot.name; + for(var i=0;i<data.length;i++){ + data[i].created = new Date(data[i].created*1000).toLocaleString(); + data[i].listMode = ""; + data[i].createMode = "hide"; + var item = addItem(data[i], 'body'); + if(data[i].name==currentSnapshot) $('input:radio', item).prop('checked', true); + } + }); + }); + }; + listGeneratingSnapshots(); + listSnapshots(); + if(kimchi.thisVMState === "running") { + $("#form-guest-edit-snapshot .revert").remove(); + $("#form-guest-edit-snapshot .add").remove(); + }else{ + $(".revert", "#form-guest-edit-snapshot").button({ + icons: { primary: "ui-icon-arrowthick-1-ne" }, + text: false, + disabled: true + }).click(function(evt){ + evt.preventDefault(); + var item = $("input:radio:checked", "#form-guest-edit-snapshot").parent().parent(); + kimchi.revertSnapshot(kimchi.selectedGuest, item.prop("id"), function(){ + currentSnapshot = item.prop("id"); + $(".revert", "#form-guest-edit-snapshot").button("disable"); + }); + }); + $(".add", "#form-guest-edit-snapshot").button({ + icons: { primary: "ui-icon-plusthick" }, + text: false + }).click(function(evt){ + evt.preventDefault(); + kimchi.createSnapshot(kimchi.selectedGuest, function(){ + listGeneratingSnapshots(); + }); + }); + } + }; + var initContent = function(guest) { guest['icon'] = guest['icon'] || 'images/icon-vm.png'; $('#form-guest-edit-general').fillWithObject(guest); @@ -496,6 +586,7 @@ kimchi.guest_edit_main = function() { setupInterface(); setupPermission(); setupPCIDevice(); + setupSnapshot(); kimchi.topic('kimchi/vmCDROMAttached').subscribe(onAttached); kimchi.topic('kimchi/vmCDROMReplaced').subscribe(onReplaced); diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 512909a..796ad42 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -44,6 +44,9 @@ <li> <a href="#form-guest-edit-pci">$_("Host PCI Device")</a> </li> + <li> + <a href="#form-guest-edit-snapshot">$_("Snapshot")</a> + </li> </ul> <form id="form-guest-edit-general"> <fieldset class="guest-edit-fieldset"> @@ -160,6 +163,17 @@ <div class="body"></div> </div> </form> + <form id="form-guest-edit-snapshot" class="guest-edit-snapshot"> + <div class="header"> + <span class="cell sel"></span> + <span class="cell name">$_("Name")</span> + <span class="cell created">$_("Created")</span> + <button class="add action-area"></button> + <button class="revert action-area" title="$_("revert")"></button> + </div> + <div class="task"></div> + <div class="body"></div> + </form> </div> </div> <footer> @@ -251,6 +265,17 @@ <button></button> </div> </script> +<script id="snapshot-tmpl" type="text/html"> + <div class="item" id="{name}"> + <span class="cell sel"> + <span class="icon {createMode}"></span> + <input type="radio" name="selSnap" class="{listMode}"> + </span> + <span class="cell name">{name}</span> + <span class="cell created">{created}</span> + <span class="action-area"><button class="delete {listMode}"></button></span> + <div> +</script> <script type="text/javascript"> kimchi.guest_edit_main(); </script> -- 1.7.1

3 3

[PATCH V3] Edit Template redefined
by Wen Wang 18 Nov '14

18 Nov '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V2 -> V3: Fix the bug that iscsi and scsi disk size won't change automatically V1 -> V2: 1) Enable "iSCSI" and "SCSI" for storage. 2) Changed the storage tab from "storage" to "Storage". 3) Fix the defect that when editing/adding "Storage" or "Interface" line went down issue. 4) "Storage" and "Interface" content can display properly on Remote and Image created template. 5) Fix the defect that "Image" didn't show properly when using a Image created template. This patch redesigned "Edit Template" diaguage in "Templates". New "Edit Template" will display all the related information into tabs of "General", "Storage" and "Interface". Due to unfinished back-end work, functions are not fully supported, which will be finished in the future work. Temporary disabled functions: 1) Multiple disk operation with multiple storage pools edit in template for which reason the add button in "Storage" tab is disabled. 2) iSCSI and SCSI storage pool add is removed since we are going to allow this kind of operation in the process of creating a VM. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/template-edit.css | 116 +++++++---- ui/js/src/kimchi.template_edit_main.js | 366 +++++++++++++++++++++++--------- ui/pages/template-edit.html.tmpl | 168 ++++++++------- 3 files changed, 434 insertions(+), 216 deletions(-) diff --git a/ui/css/theme-default/template-edit.css b/ui/css/theme-default/template-edit.css index 4975f1b..094e909 100644 --- a/ui/css/theme-default/template-edit.css +++ b/ui/css/theme-default/template-edit.css @@ -17,24 +17,33 @@ */ #template-edit-window { font-size: 13px; - height: 600px; - width: 1000px; + height: 500px; + width: 800px; } -.template-edit-fieldset { - float: left; - padding: 1em; +#edit-template-tabs { + background: none repeat scroll 0 0 transparent; + border: medium none; + height: 100%; + padding: 0; } -.template-edit-wrapper-label, .template-edit-wrapper-controls { +#edit-template-tabs .form-template-inline-wrapper { + display: inline-block; vertical-align: top; - width: 470px; } .template-edit-wrapper-label { - height: 18px; - line-height: 18px; - margin-top: 8px; + vertical-align: top; + min-width: 100px; + height: 35px; + line-height: 35px; + margin: 7px 0 8px; +} + +.template-edit-wrapper-controls { + vertical-align: top; + width: 400px; } .template-edit-wrapper-controls input[type="text"] { @@ -56,7 +65,7 @@ .template-edit-wrapper-controls > .dropdown { margin: 5px 0 0 1px; - width: 440px; + width: 372px; } .template-edit-wrapper-controls input[type="text"][disabled] { @@ -65,41 +74,72 @@ cursor: not-allowed; } -.hidden-area { - display: none; +#edit-template-tabs .template-tab-header { + margin-bottom: 8px; + padding-bottom: 2px; + font-weight: bold; + border-bottom: 1px solid #999999; + overflow: hidden; } -.template-edit-wrapper-controls .select-list-box { - width: 464px; - max-height: 168px; - overflow: auto; - margin-top: 5px; - border: 1px solid #ccc; +#edit-template-tabs .template-tab-header .action-area { + float: right; + height: 20px; + width: 20px; } -.template-edit-wrapper-controls .select-list-box>li>label { - display: block; +#edit-template-tabs .template-interface-cell { + display: inline-block; + width: 250px; } -.template-edit-wrapper-controls .select-list-box>li>label> -input[type="checkbox"] { - display: none; +#edit-template-tabs .template-storage-cell{ + display: inline-block; + width: 230px; +} + +#edit-template-tabs .template-storage-cell label { + height: 25px; + padding: 2px; + border: 1px; } -.template-edit-wrapper-controls .select-list-box>li>label>.item { - display: block; - height: 41px; - line-height: 41px; - padding: 0 20px 0 40px; - border-bottom: 1px solid #ccc; - box-shadow: 0px 1px 1px #fff; - text-shadow: -1px -1px 1px #ddd, 1px 1px 1px #fff; - color: #222; - font-size: 12px; +#form-template-storage .template-tab-body select { + width: 140px; } -.template-edit-wrapper-controls .select-list-box>li>label> -input[type="checkbox"]:CHECKED+.item { - background: #f8f8f8 url(../images/theme-default/check-green.png) no-repeat - 10px center; +#form-template-storage .template-tab-body input { + width: 56px; + height: 17px; } + +#form-template-storage .template-tab-body .template-storage-name { + width: 220px; +} + +#edit-template-tabs .template-tab-body input[readonly] { + background: none repeat scroll 0 0 rgba(0, 0, 0, 0); + border-color: transparent; + text-overflow: ellipsis; +} + +#edit-template-tabs .template-tab-body .item { + height: 25px; +} + +#form-template-interface .template-tab-body select { + width: 180px; +} + +#edit-template-tabs .template-tab-body .action-area { + float: right; +} + +#edit-template-tabs .template-tab-body .action-area button { + width: 20px; + height: 20px; +} + +#edit-template-tabs .hide { + display: none; +} \ No newline at end of file diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index 2f4cc9a..5073c62 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -16,19 +16,23 @@ * limitations under the License. */ kimchi.template_edit_main = function() { - var templateEditForm = $('#form-template-edit'); + var templateEditMain = $('#edit-template-tabs'); var origDisks; var origPool; + var origNetworks; var templateDiskSize; - $('#template-name', templateEditForm).val(kimchi.selectedTemplate); - kimchi.retrieveTemplate(kimchi.selectedTemplate, function(template) { + $('#template-name', templateEditMain).val(kimchi.selectedTemplate); + templateEditMain.tabs(); + + var initTemplate = function(template) { origDisks = template.disks; origPool = template.storagepool; + origNetworks = template.networks; for(var i=0;i<template.disks.length;i++){ if(template.disks[i].base){ template["vm-image"] = template.disks[i].base; - $('#templ-edit-cdrom').addClass('hide-content'); - $('#templ-edit-vm-image').removeClass('hide-content'); + $('.templ-edit-cdrom').addClass('hide'); + $('.templ-edit-vm-image').removeClass('hide'); break; } } @@ -37,18 +41,12 @@ kimchi.template_edit_main = function() { if (prop == 'graphics') { value = value["type"]; } - $('input[name="' + prop + '"]', templateEditForm).val(value); - } - var disks = template.disks; - $('input[name="disks"]').val(disks[0].size); - templateDiskSize = $('input[name="disks"]').val(); - if (disks[0].volume) { - var spool_value = $('#form-template-edit [name="storagepool"]').val(); - $('input[name="storagepool"]', templateEditForm).val(spool_value + '/' + disks[0].volume); - $('input[name="disks"]', templateEditForm).attr('disabled','disabled'); + $('input[name="' + prop + '"]', templateEditMain).val(value); } var vncOpt = [{label: 'VNC', value: 'vnc'}]; + $('#template-edit-graphics').append('<option selected>VNC</option>'); + $('#template-edit-graphics').append('<option>Spice</option>'); kimchi.select('template-edit-graphics-list', vncOpt); var enableSpice = function() { if (kimchi.capabilities == undefined) { @@ -61,119 +59,283 @@ kimchi.template_edit_main = function() { } }; enableSpice(); - - var scsipools = {}; - kimchi.listStoragePools(function(result) { - var options = []; - if (result && result.length) { - $.each(result, function(index, storagePool) { - if ((storagePool.state=="active") && (storagePool.type !== 'kimchi-iso')) { - if ((storagePool.type == 'iscsi') || (storagePool.type == 'scsi')){ - scsipools[storagePool.name] = []; - kimchi.listStorageVolumes(storagePool.name, function(result) { - if (result && result.length) { - $.each(result, function(index, storageVolume) { - options.push({ - label: storagePool.name + '/' + storageVolume.name, - value: '/storagepools/' + storagePool.name + '/' + storageVolume.name - }); - scsipools[storagePool.name].push(storageVolume) - }); - } - kimchi.select('template-edit-storagePool-list', options); - }); - } - else { - options.push({ - label: storagePool.name, - value: '/storagepools/' + storagePool.name - }); - } + var initStorage = function(result) { + var scsipools = {}; + var addStorageItem = function(storageData) { + var thisName; + var thisType; + var thisDisk; + var nodeStorage = $.parseHTML(kimchi.substitute($('#template-storage-pool-tmpl').html(), storageData)); + $('.template-tab-body', '#form-template-storage').append(nodeStorage); + $('.edit', '#form-template-storage').button({ + icons : {primary : 'ui-icon-pencil'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + var storageItem = $(this).parent().parent(); + thisName = $('.template-storage-name', storageItem).val(); + thisType = $('.template-storage-type', storageItem).val(); + thisDisk = $('.template-storage-disk', storageItem).val(); + $('.template-storage-name', storageItem).hide(); + $('.template-storage-disk', storageItem).attr('readonly', false); + if (thisType === 'iscsi' || thisType === 'scsi') { + $('.template-storage-disk', storageItem).attr('readonly', true); + } else { + $('.template-storage-disk', storageItem).attr('readonly', false); } + $('.save', storageItem).parent().show(); + $('.delete', storageItem).parent().hide(); + var selectedStorage = $('select', storageItem).val(); + $('.template-storage-name', storageItem).val(selectedStorage).hide(); + $('select', storageItem).val(thisName).show(); }); - } - if ($.isEmptyObject(scsipools)) { - kimchi.select('template-edit-storagePool-list', options); - } - }); - kimchi.listNetworks(function(result) { - if(result && result.length > 0) { - var html = ''; - var tmpl = $('#tmpl-network').html(); - $.each(result, function(index, network) { - if (result[index].state === 'active') - html += kimchi.substitute(tmpl, network); + $('.delete', '#form-template-storage').button({ + icons : {primary : 'ui-icon-trash'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + $(this).parent().parent().remove(); + }); + $('.cancel', '#form-template-storage').button({ + icons : {primary : 'ui-icon-arrowreturnthick-1-w'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + var cancelEntity = $(this).parent().parent(); + if ($('.template-storage-name', cancelEntity).val() === 'null') { + cancelEntity.remove(); + } else { + $('select', cancelEntity).hide(); + $('.template-storage-name', cancelEntity).val(thisName).attr('readonly', true).show(); + $('.template-storage-type', cancelEntity).val(thisType).attr('readonly', true); + $('.template-storage-disk', cancelEntity).val(thisDisk).attr('readonly', true); + $('.save', cancelEntity).parent().hide(); + $('.edit', cancelEntity).parent().show(); + } + }); + $('.save', '#form-template-storage').button({ + icons : {primary : 'ui-icon-disk'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + var storageItem = $(this).parent().parent(); + $('.save', storageItem).parent().hide(); + $('.delete', storageItem).parent().show(); + var selectedStorage = $('select', storageItem).val(); + $('.template-storage-name', storageItem).val(selectedStorage).attr('readonly', true).show(); + $('.template-storage-disk', storageItem).attr('readonly', true); + $('.template-storage-type', storageItem).attr('readonly', true); + $('select', storageItem).hide(); }); - $('#template-edit-network-list').html(html).show(); - if(template.networks && template.networks.length > 0) { - $('input[name="networks"]', templateEditForm).each(function(index, element) { - var value = $(element).val(); - if(template.networks.indexOf(value) >= 0) { - $(element).prop('checked', true); + var storageOptions = ''; + var scsiOptions = ''; + $('select', '#form-template-storage').find('option').remove(); + $.each(result, function(index, storageEntities) { + if((storageEntities.state === 'active') && (storageEntities.type != 'kimchi-iso')) { + if(storageEntities.type === 'iscsi' || storageEntities.type === 'scsi') { + kimchi.listStorageVolumes(storageEntities.name, function(currentVolume) { + $.each(currentVolume, function(indexSCSI, scsiEntities) { + scsiOptions += '<option>' + storageEntities.name + '/' + scsiEntities.name + '</option>'; + }); + $('select', '#form-template-storage').append(scsiOptions); + }, function() {}); + } else { + var isSlected = storageEntities.name === 'default' ? ' selected' : ''; + storageOptions += '<option' + isSlected + '>' + storageEntities.name + '</option>'; + } + } + }); + $('select', '#form-template-storage').append(storageOptions); + $('select', '#form-template-storage').change(function() { + var selectedItem = $(this).parent().parent(); + var tempStorageName = $(this).val(); + var tempType; + tempStorageName =tempStorageName.split('/')[0]; + var scsiCap; + $.each(result, function(index, storageEntities) { + if (tempStorageName === storageEntities.name) { + selectedItem.find('.template-storage-type').val(storageEntities.type); + scsiCap = storageEntities.capacity / Math.pow(1024, 3); + tempType = storageEntities.type; } }); + if (tempType === 'iscsi' || tempType === 'scsi') { + $('.template-storage-disk', selectedItem).attr('readonly', true).val(scsiCap); + } else { + $('.template-storage-disk', selectedItem).attr('readonly', false).val('10'); + } + }); + }; + + if ((origDisks && origDisks.length) && (origPool && origPool.length)) { + splitPool = origPool.split('/'); + var defaultPool; + var defaultType; + $.each(result, function(index, poolEntities) { + if (poolEntities.name === splitPool[splitPool.length-1]) { + defaultType = poolEntities.type; + defaultPool = splitPool[splitPool.length-1] + } + }); + if (origDisks[0]['volume']) { + defaultPool = defaultPool + '/' + origDisks[0]['volume']; } - } else { - $('#template-edit-network-list').hide(); + $.each(origDisks, function(index, diskEntities) { + var storageNodeData = { + viewMode : '', + editMode : 'hide', + storageName : defaultPool, + storageType : defaultType, + storageDisk : diskEntities.size + } + addStorageItem(storageNodeData); + }); + $('.template-storage-disk').attr('readonly', true); } - }); - }); - $('#template-edit-storagePool').change(function() { - storagepool = $(this).val(); - var storageArray = storagepool.split("/"); - if (storageArray.length > 3) { - volumeName = storageArray.pop(); - poolName = storageArray.pop(); - kimchi.getStoragePoolVolume(poolName, volumeName, function(result) { - $('input[name="disks"]', templateEditForm).val(result.capacity / Math.pow(1024,3)); - $('input[name="disks"]', templateEditForm).attr('disabled','disabled'); - return false; - }, function (err) { - kimchi.message.error(err.responseJSON.reason); + $('#template-edit-storage-add-button').button({ + icons: { + primary: "ui-icon-plusthick" + }, + text: false, + disabled: true + }).click(function(event) { + event.preventDefault(); + var storageNodeData = { + viewMode : 'hide', + editMode : '', + storageName : 'null', + storageType : 'dir', + storageDisk : '10' + } + addStorageItem(storageNodeData); }); - } else { - $('input[name="disks"]', templateEditForm).removeAttr('disabled'); - $('input[name="disks"]', templateEditForm).val(templateDiskSize); - } - }); - $('input[name="disks"]', templateEditForm).keyup(function() { - templateDiskSize = $('input[name="disks"]', templateEditForm).val(); - }); + }; + var initInterface = function(result) { + var addInterfaceItem = function(networkData) { + var nodeInterface = $.parseHTML(kimchi.substitute($('#template-interface-tmpl').html(), networkData)); + $('.template-tab-body', '#form-template-interface').append(nodeInterface); + $('.edit', '#form-template-interface').button({ + icons : {primary : 'ui-icon-pencil'}, + text : false, + disabled : true + }); + $('.delete', '#form-template-interface').button({ + icons : {primary : 'ui-icon-trash'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + $(this).parent().parent().remove(); + }); + $('.cancel', '#form-template-interface').button({ + icons : {primary : 'ui-icon-arrowreturnthick-1-w'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + $(this).parent().parent().remove(); + }); + $('.save', '#form-template-interface').button({ + icons : {primary : 'ui-icon-disk'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + var interItem = $(this).parent().parent(); + $('.save', interItem).parent().hide(); + $('.delete', interItem).parent().show(); + var selectedInterface = $('select', interItem).val(); + $('.template-interface-name', interItem).val(selectedInterface).show(); + $('select', interItem).hide(); + }); + var networkOptions = ''; + for(var i=0;i<result.length;i++){ + if(result[i].state === "active") { + var isSlected = i==0 ? ' selected' : ''; + networkOptions += '<option' + isSlected + '>' + result[i].name + '</option>'; + } + } + $('select', '#form-template-interface').find('option').remove(); + $('select', '#form-template-interface').append(networkOptions); + }; + if(result && result.length > 0) { + $.each(result, function(index, data) { + if($.inArray(data.name, origNetworks) > -1) { + addInterfaceItem({ + mac : '', + network : data.name, + type : 'network', + viewMode : '', + editMode : 'hide' + }); + } + }); + } + $('#template-edit-interface-add-button').button({ + icons: { + primary: 'ui-icon-plusthick' + }, + text: false + }).click(function(evt) { + evt.preventDefault(); + addInterfaceItem({ + mac : '', + network : '', + type : 'network', + viewMode : 'hide', + editMode : '' + }); + }); + }; + kimchi.listNetworks(initInterface); + kimchi.listStoragePools(initStorage); + }; + kimchi.retrieveTemplate(kimchi.selectedTemplate, initTemplate); + $('#tmpl-edit-button-save').on('click', function() { - var editableFields = [ 'name', 'cpus', 'memory', 'storagepool', 'disks', 'graphics']; + var editableFields = [ 'name', 'cpus', 'memory', 'disks', 'graphics']; var data = {}; + //Fix me: Only support one storage pool now + var storages = $('.template-tab-body .item', '#form-template-storage'); + var tempName = $('.template-storage-name', storages).val(); + tempName = tempName.split('/'); + var tempNameHead =tempName[0]; + var tempNameTail = tempNameHead; + if(tempNameHead === 'iscsi' || tempNameHead =='scsi') { + tempNameTail = tempName[tempName.length-1]; + } + tempName = '/storagepools/' + tempNameHead; + data['storagepool'] = tempName; $.each(editableFields, function(i, field) { /* Support only 1 disk at this moment */ if (field == 'disks') { - origDisks[0].size = Number($('#form-template-edit [name="' + field + '"]').val()); + var tmpItem = $('#form-template-storage .item'); + origDisks[0].size = Number($('.template-storage-disk', tmpItem).val()); + if($('.template-storage-type', tmpItem).val() === 'iscsi' || $('.template-storage-type', tmpItem).val() =='scsi') { + origDisks[0]['volume'] = tempNameTail; + } else { + origDisks[0]['volume'] && delete origDisks[0]['volume']; + } data[field] = origDisks; } else if (field == 'graphics') { - var type = $('#form-template-edit [name="' + field + '"]').val(); + var type = $('#form-template-general [name="' + field + '"]').val(); data[field] = {'type': type}; } else { - data[field] = $('#form-template-edit [name="' + field + '"]').val(); + data[field] = $('#form-template-general [name="' + field + '"]').val(); } }); data['memory'] = Number(data['memory']); data['cpus'] = Number(data['cpus']); - storagepool = data['storagepool']; - storageArray = storagepool.split("/"); - if (storageArray.length > 3){ - /* Support only 1 disk at this moment */ - data["disks"][0].volume = storageArray.pop(); - data['storagepool'] = storageArray.join("/"); - } else if (data["disks"][0].volume) { - delete data["disks"][0].volume; - } - var networks = templateEditForm.serializeObject().networks; - if (networks instanceof Array) { - data.networks = networks; - } else if (networks != null) { - data.networks = [networks]; + var networks = $('.template-tab-body .item', '#form-template-interface'); + var networkForUpdate = new Array(); + $.each(networks, function(index, networkEntities) { + networkForUpdate.push($('.template-interface-name', networkEntities).val()); + }); + if (networkForUpdate instanceof Array) { + data.networks = networkForUpdate; + } else if (networkForUpdate != null) { + data.networks = [networkForUpdate]; } else { data.networks = []; } diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 5a71d91..018ac10 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -28,74 +28,67 @@ <div class="close">X</div> </header> <div class="content"> - <form id="form-template-edit"> + <div id="edit-template-tabs"> <input type="hidden" id="template-name" name="templateName" /> - <fieldset class="template-edit-fieldset"> - <div> + <ul> + <li> + <a href="#form-template-general">$_("General")</a> + </li> + <li> + <a href="#form-template-storage">$_("Storage")</a> + </li> + <li> + <a href="#form-template-interface">$_("Interface")</a> + </li> + </ul> + <form id="form-template-general"> + <div class="form-template-inline-wrapper"> <div class="template-edit-wrapper-label"> <label for="template-edit-id-textbox">$_("Name")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-id-textbox" name="name" type="text" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-vendor-textbox">$_("Vendor")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-vendor-textbox" name="os_distro" type="text" disabled="disabled" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-version-textbox">$_("Version")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-version-textbox" name="os_version" type="text" disabled="disabled" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-cpu-textbox">$_("CPU Number")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-cpu-textbox" name="cpus" type="text" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-memory-textbox">$_("Memory (MB)")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-memory-textbox" name="memory" type="text" /> + <div class="template-edit-wrapper-label templ-edit-cdrom"> + <label for="template-edit-cdrom-textbox">$_("CDROM")</label> + </div> + <div class="template-edit-wrapper-label templ-edit-vm-image hide"> + <label for="template-edit-vmimage-textbox">$_("Image File")</label> </div> - </div> - <div> <div class="template-edit-wrapper-label"> - <label for="template-edit-disk-textbox">$_("Disk (GB)")</label> + <label>$_("Graphics")</label> </div> + </div> + <div class="form-template-inline-wrapper"> <div class="template-edit-wrapper-controls"> - <input id="template-edit-disk-textbox" name="disks" type="text" /> + <input id="template-edit-id-textbox" name="name" type="text" /> </div> - </div> - </fieldset> - <fieldset class="template-edit-fieldset"> - <div id="templ-edit-cdrom"> - <div class="template-edit-wrapper-label"> - <label for="template-edit-cdrom-textbox">$_("CDROM")</label> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-vendor-textbox" name="os_distro" type="text" disabled="disabled" /> </div> <div class="template-edit-wrapper-controls"> - <input id="template-edit-cdrom-textbox" name="cdrom" type="text" disabled="disabled"/> + <input id="template-edit-version-textbox" name="os_version" type="text" disabled="disabled" /> </div> - </div> - <div id="templ-edit-vm-image" class="hide-content"> - <div class="template-edit-wrapper-label">$_("Image File")</div> - <div class="template-edit-wrapper-controls"><input name="vm-image" type="text" disabled/></div> - </div> - <div> - <div class="template-edit-wrapper-label"> - <label>$_("Graphics")</label> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-cpu-textbox" name="cpus" type="text" /> + </div> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-memory-textbox" name="memory" type="text" /> + </div> + <div class="template-edit-wrapper-controls templ-edit-cdrom"> + <input id="template-edit-cdrom-textbox" name="cdrom" type="text" disabled="disabled" /> + </div> + <div class="template-edit-wrapper-controls templ-edit-vm-image hide"> + <input id="template-edit-vmimage-textbox" name="vm-image" type="text" disabled="disabled" /> </div> <div class="template-edit-wrapper-controls"> <div class="btn dropdown popable"> @@ -108,40 +101,26 @@ </div> </div> </div> - <div> - <div class="template-edit-wrapper-label"> - <label>$_("Storage Pool")</label> - </div> - <div class="template-edit-wrapper-controls"> - <div class="btn dropdown popable"> - <input id="template-edit-storagePool" name="storagepool" type="hidden" /> - <span class="text" id="template-edit-storage-label"></span><span class="arrow"></span> - <div class="popover" style="width: 100%"> - <ul class="select-list" id="template-edit-storagePool-list" data-target="template-edit-storagePool" data-label="template-edit-storage-label"> - </ul> - </div> - </div> - </div> + </form> + <form id="form-template-storage"> + <div class="template-tab-header"> + <span class="template-storage-cell">$_("Storage Pool")</span> + <span class="template-storage-cell">$_("Type")</span> + <span class="template-storage-cell">$_("Disk(GB)")</span> + <button type="button" id="template-edit-storage-add-button" class="action-area"></button> </div> - <div> - <div class="template-edit-wrapper-label"> - <label>$_("Network")</label> - </div> - <div class="template-edit-wrapper-controls"> - <ul class="select-list-box" id="template-edit-network-list"> - </ul> - <script id="tmpl-network" type="text/html"> - <li> - <label> - <input name="networks" type="checkbox" value="{name}" /> - <span class="item">{name}</span> - </label> - </li> - </script> - </div> + <div class="template-tab-body"> </div> - </fieldset> - </form> + </form> + <form id="form-template-interface"> + <div class="template-tab-header"> + <span class="template-interface-cell">$_("Network")</span> + <span class="template-interface-cell">$_("Type")</span> + <button type="button" id="template-edit-interface-add-button" class="action-area"></button> + </div> + <div class="template-tab-body"></div> + </form> + </div> </div> <footer> <div class="btn-group"> @@ -152,3 +131,40 @@ <script> kimchi.template_edit_main(); </script> +<script id="template-storage-pool-tmpl" type="text/html"> + <div class='item'> + <span class="template-storage-cell"> + <input class="template-storage-name {viewMode}" value={storageName} readonly=true type="text"/> + <select class="{editMode}"></select> + </span> + <span class="template-storage-cell"> + <input class="template-storage-type" value={storageType} readonly=true type="text" /> + </span> + <span class="template-storage-cell"> + <input class="template-storage-disk" value={storageDisk} type="text" /> + </span> + <span class="action-area {editMode}"> + <button class="save"></button><button class="cancel"></button> + </span> + <span class="action-area {viewMode}"> + <button class="edit"></button><button class="delete"></button> + </span> + </div> +</script> +<script id="template-interface-tmpl" type="text/html"> + <div class="item"> + <span class="template-interface-cell"> + <input class="template-interface-name {viewMode}" readonly="true" type="text" value={network} /> + <select class="{editMode}"></select> + </span> + <span class="template-interface-cell"> + <input value={type} readonly=true type="text" /> + </span> + <span class="action-area {editMode}"> + <button class="save"></button><button class="cancel"></button> + </span> + <span class="action-area {viewMode}"> + <button class="edit"></button><button class="delete"></button> + </span> + </div> +</script> \ No newline at end of file -- 1.7.1

2 4

[PATCHv4 0/8] LDAP support in backend
by lvroyce＠linux.vnet.ibm.com 18 Nov '14

18 Nov '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v3>v4, Move authentication type report to capabilities. Be back compatible for old access label. Change try/exception logic in ldap authentication. Royce Lv (8): Add configuration of LDAP Split PAM and LDAP authentication Add LDAP authentication Fix test cases for authentication Split users and groups for permission query Move validation to authorizaiton change vm permission tag Update test model to fix user/group listing contrib/DEBIAN/control.in | 1 + contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + docs/API.md | 20 +++--- docs/README.md | 36 +++++----- src/kimchi.conf.in | 17 +++++ src/kimchi/auth.py | 155 +++++++++++++++++++++++++++++++----------- src/kimchi/config.py.in | 5 ++ src/kimchi/control/auth.py | 42 ++++++++++++ src/kimchi/control/host.py | 14 ---- src/kimchi/i18n.py | 1 + src/kimchi/model/config.py | 1 + src/kimchi/model/groups.py | 68 ++++++++++++++++++ src/kimchi/model/host.py | 19 ------ src/kimchi/model/users.py | 90 ++++++++++++++++++++++++ src/kimchi/model/vms.py | 62 ++++++++++++----- tests/test_model.py | 3 +- tests/test_rest.py | 4 +- tests/utils.py | 43 ++++++++---- 19 files changed, 451 insertions(+), 132 deletions(-) create mode 100644 src/kimchi/control/auth.py create mode 100644 src/kimchi/model/groups.py create mode 100644 src/kimchi/model/users.py -- 1.8.3.2

3 11

[PATCH v4] Auto Topology for Guest Templates
by Christy Perez 17 Nov '14

17 Nov '14

This is another rework of how this flow should work, after more thought and discussion with Aline. This new flow removes the 'auto-topology' element from the API and makes it so that users can enter varying information without being dinged for not doing exactly the right thing (e.g. vcpus != sockets * cores * threads). It also works in a way that doesn't require the UI to have access to the kimchi Model objects (as I misremembered for the previous patches). 1. UI calls GET host/cpuinfo curl -k -u user -H 'Content-Type: application/json' \ -H 'Accept: application/json' https://localhost:8001/host/cpuinfo { "cores":2, "threading_enabled":true, "sockets":1, "threads_per_core":2 } 2. UI displays appropriate title and checkboxes - If host arch is Power: - Display a menu labled SMT, with up to four check-boxes. The check-boxes will be labeled SMT1, SMT2, SMT4, and SMT8. The max SMT value displayed will be dependant upon threads_per_core from above. The default checkbox should be the greatest SMT value (e.g. SMT8). - Display the same box for CPUs as before. This value may change when the backend template creation is done, so if there's any way to pop up "Here are the values of your new template," kind of message, that would be nice. Otherwise, we'll just make it clear in the doc that the vCPUs value entered is not guaranteed. - Else: - Display a menu labeled Hyper-Threading, with only a checkbox labeled HT. Note: The same comments for vCPUS as above apply here. The number maybe need to change based on the CPU capabilities. 3. UI calls POST template with threads value set to '0' (x86) or SMTX (Power) Note that vcpus is still optional, so no change in how that's handled needs to be done. $ curl -k -u user -X POST -H 'Content-Type: application/json' -H 'Accept: application/json' https://localhost:8001/templates -d'{"name": "test_auto_topo", "cdrom": "/home/iso-pool/Fedora-Live-Desktop-x86_64-20-1.iso", "cpu_info": {"topology": {"threads":0}}}' { "cpus":1, "cpu_info":{ "topology":{ "cores":1, "threads":1, "sockets":1 } }, "graphics":{ "type":"vnc", "listen":"127.0.0.1" }, "cdrom":"/home/iso-pool/Fedora-Live-Desktop-x86_64-20-1.iso", "networks":[ "default" ], "icon":"images/icon-fedora.png", "os_distro":"fedora", "name":"test_auto_topo", "disks":[ { "index":0, "size":10 } ], "invalid":{}, "os_version":"20", "storagepool":"/storagepools/default", "memory":1024, "folder":[] } Regards, - Christy Christy Perez (1): Parts to allow Kimchi to configure the cpu topology. docs/API.md | 28 +++++++ src/kimchi/API.json | 11 +-- src/kimchi/control/cpuinfo.py | 37 +++++++++ src/kimchi/control/host.py | 2 + src/kimchi/i18n.py | 3 +- src/kimchi/model/cpuinfo.py | 172 ++++++++++++++++++++++++++++++++++++++++++ src/kimchi/model/host.py | 1 + src/kimchi/model/templates.py | 25 ++++-- 8 files changed, 263 insertions(+), 16 deletions(-) create mode 100644 src/kimchi/control/cpuinfo.py create mode 100644 src/kimchi/model/cpuinfo.py -- 1.9.3

3 5

[PATCH] Improve french translation
by Cédric Bosdonnat 17 Nov '14

17 Nov '14

Contains a few typos fixes and a bunch of new translations. --- po/fr_FR.po | 152 ++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 87 insertions(+), 65 deletions(-) diff --git a/po/fr_FR.po b/po/fr_FR.po index cfc0c44..6ee4f45 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -19,7 +19,7 @@ msgstr "" #, python-format msgid "Unknown parameter %(value)s" -msgstr "" +msgstr "Paramètre inconnu %(value)s" #, python-format msgid "Delete is not allowed for %(resource)s" @@ -37,7 +37,7 @@ msgstr "" #, python-format msgid "Create is not allowed for %(resource)s" -msgstr "La créatio n'est pas autorisée pour %(resource)s" +msgstr "La création n'est pas autorisée pour %(resource)s" msgid "Unable to parse JSON request" msgstr "Impossible de parser la requête JSON" @@ -68,20 +68,20 @@ msgstr "" "d'Erreur: %(code)s]" msgid "You are not authorized to access Kimchi" -msgstr "Vous n'êtes pas autorisé à accéder à Kimchi" +msgstr "Vous n'êtes pas autorisé à accéder à Kimchi" #, python-format msgid "Specify %(item)s to login into Kimchi" msgstr "Spécifiez %(item)s pour vous logguer dans Kimchi" msgid "Unknown \"_cap\" specified" -msgstr "" +msgstr "\"_cap\" spécifiée inconnue" msgid "\"_passthrough\" should be \"true\" or \"false\"" -msgstr "" +msgstr "\"_passthrough\" doit être \"true\" ou \"false\"" msgid "\"_passthrough_affected_by\" should be a device name string" -msgstr "" +msgstr "\"_passthrough_affected_by\" doit être un nom de périphérique" #, python-format msgid "Error while getting block devices. Details: %(err)s" @@ -115,7 +115,7 @@ msgstr "Impossible de se connecter à l'hôte iSCSI %(host)s cible %(target)s" #, python-format msgid "Unable to find ISO file %(filename)s" -msgstr "" +msgstr "Impossible de trouver le fichier ISO %(filename)s" #, python-format msgid "The ISO file %(filename)s is not bootable" @@ -161,20 +161,22 @@ msgstr "" "%(err)s" msgid "An error occurred when probing image OS information." -msgstr "" +msgstr "Une erreur est survenue lors de la détection de l'information d'OS de l'image." msgid "No OS information found in given image." msgstr "Aucune information d'OS trouvée sur l'image donnée." #, python-format msgid "Unable to read image file %(filename)s" -msgstr "" +msgstr "Impossible de lire le fichier image %(filename)s" #, python-format msgid "" "Image file must be an existing file on system. %(filename)s is not a valid " "input." msgstr "" +"Le fichier image doit être un fichier existant sur le système. %(filename)s n'est " +"pas une donnée valide." #, python-format msgid "Virtual machine %(name)s already exists" @@ -189,6 +191,8 @@ msgid "" "Unable to rename virtual machine %(name)s. The name %(new_name)s is already " "in use or the virtual machine is not powered off." msgstr "" +"Impossible de renommer la machine virtuelle %(name)s. Le nom %(new_name)s est " +"déja utilisé ou la machine virtuelle n'est pas éteinte." #, python-format msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s" @@ -201,7 +205,7 @@ msgstr "L'image ISO distante n'est pas supportée par le serveur." #, python-format msgid "Screenshot is not supported on virtual machine %(name)s" -msgstr "" +msgstr "Copie d'écran non supportée par la machine virtuelle %(name)s" #, python-format msgid "Unable to create virtual machine %(name)s. Details: %(err)s" @@ -219,7 +223,7 @@ msgstr "" #, python-format msgid "Unable to connect to powered off virtual machine %(name)s." -msgstr "" +msgstr "Impossible de se connecter à la machine virtuelle éteinte %(name)s." msgid "Virtual machine name must be a string" msgstr "Le nom de la machine virtuelle doit être une chaîne de caractères." @@ -293,19 +297,23 @@ msgstr "" "%(err)s" msgid "The guest console password must be a string." -msgstr "" +msgstr "Le mot de passe de console invitée doit être une chaîne de caractères." msgid "The life time for the guest console password must be a number." -msgstr "" +msgstr "La durée de vie du mot de passe de console invitée doit être un nombre" #, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" +"La machine virtuelle %(vmid)s ne peut pas contenir le périphérique hôte " +"directement assigné %(dev_name)s." #, python-format msgid "The host device %(dev_name)s is not allowed to directly assign to VM." msgstr "" +"The périphérique hôte %(dev_name)s ne peut être directement assigné à " +"la machine virtuelle" msgid "" "No IOMMU groups found. Host PCI pass through needs IOMMU group to function " @@ -316,7 +324,7 @@ msgid "" msgstr "" msgid "\"name\" should be a device name string" -msgstr "" +msgstr "\"name\" doit être un nom de périphérique" #, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" @@ -430,7 +438,7 @@ msgstr "" #, python-format msgid "The volume %(volume)s is not in storage pool %(pool)s" -msgstr "" +msgstr "Le volume %(volume)s n'est pas dans le pool de stockage %(pool)s" #, python-format msgid "Unable to create template due error: %(err)s" @@ -441,7 +449,7 @@ msgid "Unable to delete template due error: %(err)s" msgstr "Impossilbe de supprimer le modèle à cause de l'erreur: %(err)s" msgid "Disk size must be an integer greater than 1GB." -msgstr "" +msgstr "La taille de disque doit être un entier supérieur à 1Go." msgid "Template base image must be a valid local image file" msgstr "L'image de base de modèle doit petre un fichier image local valide" @@ -458,7 +466,8 @@ msgstr "" msgid "" "When specifying CPU topology, each element must be an integer greater than " "zero." -msgstr "" +msgstr "Dans la topologie de CPU, chaque élément doit être un entier " +"strictement positif." #, python-format msgid "Storage pool %(name)s already exists" @@ -534,6 +543,8 @@ msgid "" "Supported storage pool types are dir, netfs, logical, iscsi, isci and kimchi-" "iso" msgstr "" +"Les types de pool de stockage supportés sont: dir, netfs, logical, " +"iscsi, isci et kimchi-iso" msgid "Storage pool path must be a string" msgstr "Le chemin du pool de stockage doit être une chaîne de caractères" @@ -556,10 +567,10 @@ msgstr "" "et 65535" msgid "iSCSI target username must be a string" -msgstr "" +msgstr "Le nom d'utilisateur de la cible iSCSI doit être une chaîne de caractères" msgid "iSCSI target password must be a string" -msgstr "" +msgstr "Le mot de passe de la cible iSCSI doit être une chaîne de caractères" msgid "Specify name and type to create a storage pool" msgstr "Spécifier un nom et un type pour créer un pool de stockage" @@ -574,7 +585,7 @@ msgstr "" #, python-format msgid "Unable to extend logical pool %(pool)s. Details: %(err)s" -msgstr "" +msgstr "Impossible d'agrandir le pool logique %(pool)s. Détails: %(err)s" msgid "The parameter disks only can be updated for logical storage pool." msgstr "" @@ -644,6 +655,8 @@ msgid "" "Unable to create storage volume %(volume)s because storage pool %(pool)s is " "not active" msgstr "" +"Impossible de créer le volume de stockage %(volume)s car le pool de " +"stockage %(pool)s n'est pas actif" #, python-format msgid "Specify %(item)s in order to create storage volume %(volume)s" @@ -720,21 +733,21 @@ msgstr "" #, python-format msgid "Only one of parameter %(param)s can be specified" -msgstr "" +msgstr "Seulement un seul des paramêtre %(param)s peut être spécifié" #, python-format msgid "Create volume from %(param)s is not supported" -msgstr "" +msgstr "La création de volume avec %(param)s n'est pas supportée" msgid "Storage volume capacity must be an integer number." -msgstr "" +msgstr "La capacité du volume de stockage doit être un nombre entier." msgid "Storage volume URL must be http://, https://, ftp:// or ftps://." -msgstr "" +msgstr "L'URL du volume de stockage doit être http://, https://, ftp:// ou ftps://." #, python-format msgid "Unable to access file %(url)s. Please, check it." -msgstr "" +msgstr "Impossible d'accéder au fichier %(url)s. Veuillez le vérifier." #, python-format msgid "Interface %(name)s does not exist" @@ -833,7 +846,7 @@ msgstr "" #, python-format msgid "Debug report %(name)s does not exist" -msgstr "LE rapport de déboggage %(name)s n'existe pas" +msgstr "Le rapport de déboggage %(name)s n'existe pas" msgid "Debug report tool not found in system" msgstr "L'outil de rapport de déboggage n'a pas été trouvé dans le système" @@ -846,6 +859,7 @@ msgstr "" #, python-format msgid "Can not find any debug report with the given name %(name)s" msgstr "" +"Impossible de trouver un rapport de déboggage avec le nom fourni %(name)s" #, python-format msgid "Unable to generate debug report %(name)s. Details: %(err)s" @@ -853,12 +867,14 @@ msgstr "" "Impossible de générer le rapport de déboggage %(name)s. Détails: %(err)s" msgid "You should give a name for the debug report file." -msgstr "" +msgstr "Vous devriez donner un nom au fichier de rapport de déboggage." msgid "" "Debug report name must be a string. Only letters, digits, underscore ('_') " "and hyphen ('-') are allowed." msgstr "" +"Le nom du rapport de déboggage doit être une chaîne de caractères. Seulement " +"les lettres, chiffres, blanc souligné ('_') et tirets ('-') sont acceptés." #, python-format msgid "" @@ -882,12 +898,12 @@ msgstr "La partition %(name)s n'existe pas sur cet hôte" msgid "Unable to shutdown host machine as there are running virtual machines" msgstr "" -"Impossilbe d'éteindre la machine hôte car des machines virtuelles en sont " +"Impossible d'éteindre la machine hôte car des machines virtuelles en sont " "cours d'exécution" msgid "Unable to reboot host machine as there are running virtual machines" msgstr "" -"Impossilbe de rebooter la machine hôte car des machines virtuelles en sont " +"Impossible de redémarrer la machine hôte car des machines virtuelles en sont " "cours d'exécution" #, python-format @@ -895,7 +911,7 @@ msgid "Node device '%(name)s' not found" msgstr "Périphérique de noeud '%(name)s' non trouvé" msgid "Conflicting flag filters specified." -msgstr "" +msgstr "Filtres incompatibles spécifiés." msgid "No packages marked for update" msgstr "Aucun paquet marqué pour mise à jour" @@ -928,7 +944,7 @@ msgstr "" "secondes" msgid "Unable to choose a virtual machine name" -msgstr "" +msgstr "Impossible de sélectionner un nom de machine virtuelle" msgid "Invalid storage type. Types supported: 'cdrom', 'disk'" msgstr "Type de stockage invalide. Les Types supportés sont: 'cdrom', 'disk'" @@ -938,13 +954,15 @@ msgid "The path '%(value)s' is not a valid local/remote path for the device" msgstr "" msgid "Only CDROM path can be update." -msgstr "" +msgstr "Seulement le chemin d'un CDROM peut être modifié." #, python-format msgid "" "The storage device %(dev_name)s does not exist in the virtual machine " "%(vm_name)s" msgstr "" +"Le périphérique de stockage %(dev_name)s n'existe pas dans la machine virtuelle " +"%(vm_name)s" #, python-format msgid "Error while creating new storage device: %(error)s" @@ -960,7 +978,7 @@ msgid "Error while removing storage device: %(error)s" msgstr "Erreur durant le retrait du périphérique de stockage: %(error)s" msgid "Do not support IDE device hot plug" -msgstr "" +msgstr "Ne pas supporter le branchement à chaud de périphérique IDE" msgid "" "Specify type and path or type and pool/volume to add a new virtual machine " @@ -997,6 +1015,8 @@ msgid "" "Volume chosen with format %(format)s does not fit in the storage type " "%(type)s" msgstr "" +"Le volume de format %(format)s sélectionné ne correspond pas " +"au type de stockage %(type)s" msgid "YUM Repository ID must be one word only string." msgstr "" @@ -1106,7 +1126,7 @@ msgstr "Impossible de supprimer un dépôt. Détails: '%(err)s'" #, python-format msgid "" "Configuration items: '%(items)s' are not supported by repository manager" -msgstr "" +msgstr "Éléments de configurations: %(items)s ne sont pas supportés par le gestionnaire de dépôt" msgid "ERROR CODE" msgstr "ERROR CODE" @@ -1176,7 +1196,7 @@ msgid "Permission" msgstr "Permission" msgid "Host PCI Device" -msgstr "" +msgstr "Périphérique PCI Hôte" msgid "Name" msgstr "Nom" @@ -1212,16 +1232,16 @@ msgid "All" msgstr "Tous" msgid "To Add" -msgstr "" +msgstr "À Ajouter" msgid "Added" -msgstr "" +msgstr "Ajouter" msgid "filter" -msgstr "" +msgstr "Filtre" msgid "Product" -msgstr "" +msgstr "Produit" msgid "Vendor" msgstr "Vendeur" @@ -1352,13 +1372,13 @@ msgid "Warning" msgstr "Avertissement" msgid "Creating..." -msgstr "" +msgstr "Création en cours..." msgid "Loading..." msgstr "Chargement en cours..." msgid "An error occurred while checking for packages update." -msgstr "" +msgstr "Une erreur est survenue lors de la vérification des mises-à-jour de paquets." msgid "Retry" msgstr "Essayer à nouveau" @@ -1367,7 +1387,7 @@ msgid "Detailed message:" msgstr "Message détaillé:" msgid "No ISO found" -msgstr "" +msgstr "Aucune ISO détectée" msgid "This is not a valid ISO file." msgstr "Ce n'est pas un fichier ISO valide." @@ -1477,7 +1497,7 @@ msgid "Updating..." msgstr "En cours de mise à jour..." msgid "Failed to retrieve packages update information." -msgstr "" +msgstr "Échec de récupération des informations de mise-à-jour des paquets." msgid "Failed to update package(s)." msgstr "Échec durant la mise à jour du/des paquet(s)" @@ -1518,7 +1538,7 @@ msgid "Pending..." msgstr "En attente..." msgid "Report name is the same as the original one." -msgstr "" +msgstr "Le nom du rapport est le même que celui d'origine." msgid "" "This will delete the virtual machine and its virtual disks. This operation " @@ -1555,7 +1575,7 @@ msgstr "" "Noter que l'OS invité pourrait ignorer cette requête. Voulez-vous continuer ?" msgid "Virtual Machine delete Confirmation" -msgstr "" +msgstr "Confirmation de suppression de Machine Virtuelle" msgid "" "This virtual machine is not persistent. Power Off will delete it. Continue?" @@ -1587,6 +1607,8 @@ msgid "" "This disk will be detached permanently and you can re-attach it. Continue to " "detach it?" msgstr "" +"Ce disque sera définitivement détaché et peut être ré-attaché. Continuer " +"à le détacher ?" msgid "The VLAN id must be between 1 and 4094." msgstr "L'id du VLAN doit être entre 1 et 4094." @@ -1686,13 +1708,13 @@ msgid "Unable to retrieve partitions information." msgstr "Impossible de récupérer les informations des partitions." msgid "In progress..." -msgstr "" +msgstr "En cours..." msgid "Failed!" -msgstr "" +msgstr "Échec!" msgid "CDROM path needs to be a valid local/remote path and cannot be blank." -msgstr "" +msgstr "Le chemin de CDROM doit être un chemin local/distant valide et ne peut être virge." msgid "Disk pool or volume cannot be blank." msgstr "Le pool de disque ou le volume ne peut être vierge." @@ -1719,7 +1741,7 @@ msgid "Version:" msgstr "Version:" msgid "Session timeout, please re-login." -msgstr "Session expirée, veuillez vous reconecter." +msgstr "Session expirée, veuillez vous reconnecter." msgid "User Name" msgstr "Nom d'Utilisateur" @@ -1879,22 +1901,22 @@ msgid "SCSI Adapter" msgstr "Adaptateur SCSI" msgid "Please, wait..." -msgstr "Vauillez patienter..." +msgstr "Veuillez patienter..." msgid "Add a Volume to Storage Pool" -msgstr "" +msgstr "iAjouter un Volume au Pool de Stockage" msgid "Fetch from remote URL" msgstr "" msgid "Enter the remote URL here." -msgstr "" +msgstr "Saisir une URL distante ici" msgid "Upload an file" -msgstr "" +msgstr "Charger un fichier" msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "" +msgstr "Sélectionner le fichier ISO (avec suffixe .iso) à charger" msgid "Add Template" msgstr "Ajouter un Modèle" @@ -1906,7 +1928,7 @@ msgid "Local ISO Image" msgstr "Image ISO Locale" msgid "Local Image File" -msgstr "" +msgstr "Fichier Image Local" msgid "Remote ISO Image" msgstr "Image ISO Distante" @@ -1918,13 +1940,13 @@ msgid "The following ISOs are available:" msgstr "Les ISOs suivants sont disponibles:" msgid "OS: " -msgstr "OS:" +msgstr "OS: " msgid "Version: " -msgstr "Version:" +msgstr "Version: " msgid "Size: " -msgstr "Taille:" +msgstr "Taille: " msgid "Search more ISOs" msgstr "Chercher plus d'ISOs" @@ -1936,10 +1958,10 @@ msgid "I want to use a specific ISO file" msgstr "Je veux utiliser un fichier ISO spécifique" msgid "Loading default remote ISOs ..." -msgstr "En cours de chargement des ISOs distants par défaut..." +msgstr "Chargement des ISOs distants par défaut en cours..." msgid "Arch: " -msgstr "Arch:" +msgstr "Arch: " msgid "I want to use a custom URL" msgstr "Je veux utiliser une URL personnalisée" @@ -1957,7 +1979,7 @@ msgid "CDROM" msgstr "CDROM" msgid "Image File" -msgstr "" +msgstr "Fichier Image" msgid "Graphics" msgstr "Graphiques" @@ -2017,7 +2039,7 @@ msgid "Name should not contain '/' and '\"'." msgstr "Le nom ne devrait pas contenir '/' et '\"'." msgid "Isolated: no external network connection" -msgstr "Isolated: pas de connexion à un réseau externe" +msgstr "Isolé: pas de connexion à un réseau externe" msgid "NAT: outbound physical network connection only" msgstr "NAT: connexion physique au réseau sortant uniquement" @@ -2027,7 +2049,7 @@ msgstr "" "Bridgé: Les macines virtuelles sont connectées directement au réseau physique" msgid "(No interfaces found)" -msgstr "" +msgstr "(Aucune interface trouvée)" msgid "Destination" msgstr "Destination" @@ -2063,13 +2085,13 @@ msgid "Activate" msgstr "Activer" msgid "Add Volume" -msgstr "" +msgstr "Ajouter un Volume" msgid "Extend" msgstr "Étendre" msgid "Undefine" -msgstr "Indéfini" +msgstr "Supprimer" msgid "Format" msgstr "Format" -- 2.1.2

3 2

[PATCH V3] New MockModel
by Aline Manera 17 Nov '14

17 Nov '14

V2 -> V3: - Fix "make check-local" errors - Fix typo V1 -> V2: - Fix some tests cases - Update volune ref_cnt when VM is deleted Aline Manera (1): MockModel refactor: Create MockModel based on Model("test:///default") src/kimchi/i18n.py | 2 - src/kimchi/mockmodel.py | 1771 ++++++++----------------------------------- src/kimchi/vmtemplate.py | 9 +- tests/run_tests.sh.in | 18 +- tests/test_authorization.py | 27 +- tests/test_mockmodel.py | 60 +- tests/test_model.py | 5 + tests/test_rest.py | 254 +++---- 8 files changed, 503 insertions(+), 1643 deletions(-) -- 1.9.3

2 3

[PATCH 0/2 v2] New MockModel
by Aline Manera 17 Nov '14

17 Nov '14

Now it is completely done! \o/ The new MockModel uses Model with the 'test:///default' URI. I also needed to update some tests cases and the run_tests.sh.in scripts as the new MockModel overrides some Model functions, the test_model.py must be the first test to be run. V1 -> V2: - Fix some tests cases - Update volune ref_cnt when VM is deleted Aline Manera (2): bug fix: Update storage volume ref_cnt when VM is deleted MockModel refactor: Create MockModel based on Model("test:///default") src/kimchi/mockmodel.py | 1771 ++++++++----------------------------------- src/kimchi/model/vms.py | 16 +- src/kimchi/vmtemplate.py | 9 +- tests/run_tests.sh.in | 18 +- tests/test_authorization.py | 27 +- tests/test_mockmodel.py | 60 +- tests/test_model.py | 5 + tests/test_rest.py | 254 +++---- 8 files changed, 518 insertions(+), 1642 deletions(-) -- 1.9.3

2 12

[PATCH v2 00/10] Add snapshot support
by Crístian Viana 17 Nov '14

17 Nov '14

This is the difference between this and the previous patchset (v1): - Use "dict.get(key, default_value)" instead of handling "dict[key]" in a try/except block when the key doesn't exist. - Remove the mention of a parameter in the snapshot method DELETE because it wasn't implemented. - Fix documentation, including mispelled words. - Rebased to the latest revision (bde438e). Crístian Viana (10): Update clone test snapshot: Create domain snapshots snapshot: Lookup a domain snapshot snapshot: List domain snapshots snapshot: Delete a domain snapshot snapshot: Lookup current snapshot on a domain snapshot: Revert a domain to a snapshot snapshot: Add model tests snapshot: Delete snapshots when deleting a VM snapshot: Clone snapshots when cloning a VM docs/API.md | 27 ++++++ src/kimchi/control/vm/snapshots.py | 58 ++++++++++++ src/kimchi/i18n.py | 10 ++ src/kimchi/mockmodel.py | 90 ++++++++++++++++++ src/kimchi/model/vms.py | 47 +++++++++- src/kimchi/model/vmsnapshots.py | 185 +++++++++++++++++++++++++++++++++++++ tests/test_model.py | 74 ++++++++++++++- tests/test_rest.py | 100 ++++++++++++++++++++ 8 files changed, 589 insertions(+), 2 deletions(-) create mode 100644 src/kimchi/control/vm/snapshots.py create mode 100644 src/kimchi/model/vmsnapshots.py -- 1.9.3

2 11

UI Mockup of SMT
by Yu Xin Huo 15 Nov '14

15 Nov '14

x86 Power(for SMT, I think it is single selection)

4 6

[PATCH v3] Keep disk ref_counts accurate
by Christy Perez 14 Nov '14

14 Nov '14

This patch is very different from v1. I sent a v2 to Aline to test, but she found a problem with iSCSI, which Royce provided a fix for. v1 : Change the way storage is represented (as volumes). v1->v2: - Royce pointed out that the concept of a volume was a new feature to libvirt, and after some investigation I found that this would break kimchi on RHEL 6. - I changed from using the pool:vol label to identify storage to using the path alone. This will make it easier to track disks not in pools. v2->v3: - Rebase and fixed conflicts - Add ref_cnt checking on update. This problem was found by the model test that ejects a CD ROM, leaving a blank 'path' element in the XML. - Resolve issue with circular include of [s,g]et_ref_cnt functions in both vmstorages.py and storagevolumes.py by creating a new diskutils module. Christy Perez (1): Prevent disks from being added twice src/kimchi/model/diskutils.py | 75 ++++++++++++++++++++++++++++++++++++++ src/kimchi/model/storagevolumes.py | 51 +++++++++----------------- src/kimchi/model/vmstorages.py | 70 +++++++++++++++++++++++++++++++---- 3 files changed, 154 insertions(+), 42 deletions(-) create mode 100644 src/kimchi/model/diskutils.py -- 1.9.3

2 4

[PATCH 0/6] New MockModel \o/
by Aline Manera 14 Nov '14

14 Nov '14

Yeap! Finally it is done! The new MockModel uses Model with the 'test:///default' URI. I also needed to update some tests cases and the run_tests.sh.in scripts as the new MockModel overrides some Model functions, the test_model.py must be the first test to be run. But there are one test that is still failing: ====================================================================== FAIL: test_edit_vm (test_rest.RestTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "test_rest.py", line 248, in test_edit_vm self.assertEquals('123456', info["graphics"]["passwd"]) AssertionError: '123456' != u'abcdef' I could not identify the reason yet, as the same test runs fine when I only run test_rest.py. I suspect it is a override issue. While I am investigating it I decided to send the patches to collect feedbacks soon. Aline Manera (6): Re-raise the original exception when creating a new Template Use objectify to Remove metadata namespace Check currentMemory exists prior to remote its XML node Ensure the guest volume exists to remove it Pass libvirt connection as CapabilitiesModel parameter MockModel refactor: Create MockModel based on Model("test:///default") src/kimchi/mockmodel.py | 1769 +++++++----------------------------- src/kimchi/model/host.py | 3 +- src/kimchi/model/storagepools.py | 2 +- src/kimchi/model/storagetargets.py | 2 +- src/kimchi/model/templates.py | 5 +- src/kimchi/model/utils.py | 37 +- src/kimchi/model/vmhostdevs.py | 3 +- src/kimchi/model/vmifaces.py | 5 +- src/kimchi/model/vms.py | 44 +- src/kimchi/model/vmstorages.py | 16 +- src/kimchi/vmtemplate.py | 9 +- tests/run_tests.sh.in | 18 +- tests/test_authorization.py | 25 +- tests/test_mockmodel.py | 60 +- tests/test_rest.py | 254 +++--- 15 files changed, 565 insertions(+), 1687 deletions(-) -- 1.9.3

2 16

[v3 1/1] Virtual machine migration
by simonjin＠linux.vnet.ibm.com 14 Nov '14

14 Nov '14

From: Simon Jin <simonjin(a)linux.vnet.ibm.com> v3-v2: address commets from vianac(a)linux.vnet.ibm.com. Signed-off-by: Simon Jin <simonjin(a)linux.vnet.ibm.com> --- docs/API.md | 5 ++ src/kimchi/control/vms.py | 1 + src/kimchi/i18n.py | 9 ++++ src/kimchi/model/vms.py | 116 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 131 insertions(+) diff --git a/docs/API.md b/docs/API.md index 9b866f3..17073c8 100644 --- a/docs/API.md +++ b/docs/API.md @@ -132,6 +132,11 @@ the following general conventions: It emulates the power reset button on a machine. Note that there is a risk of data loss caused by reset without the guest OS shutdown. * connect: Prepare the connection for spice or vnc +* migrate: Migrate a virtual machine to a remote server, only support live mode without block migration. + * remoteHost: IP address or hostname of the remote server. + * user: User of the remote server. + * passwd: Passwd of user on remote server. + * secure: Migrate in P2P secure tunel mode. * clone: Create a new VM identical to this VM. The new VM's name, UUID and network MAC addresses will be generated automatically. Each existing diff --git a/src/kimchi/control/vms.py b/src/kimchi/control/vms.py index a1589ef..e6870e0 100644 --- a/src/kimchi/control/vms.py +++ b/src/kimchi/control/vms.py @@ -42,6 +42,7 @@ class VM(Resource): for ident, node in sub_nodes.items(): setattr(self, ident, node(model, self.ident)) self.start = self.generate_action_handler('start') + self.migrate = self.generate_action_handler_task('migrate', ['remoteHost', 'user', 'passwd', 'secure']) self.poweroff = self.generate_action_handler('poweroff') self.shutdown = self.generate_action_handler('shutdown') self.reset = self.generate_action_handler('reset') diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index e823f2b..8d87671 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -105,6 +105,15 @@ messages = { "KCHVM0033E": _("Virtual machine '%(name)s' must be stopped before cloning it."), "KCHVM0034E": _("Insufficient disk space to clone virtual machine '%(name)s'"), "KCHVM0035E": _("Unable to clone VM '%(name)s'. Details: %(err)s"), + "KCHVM0036E": _("Can't migrate to localhost."), + "KCHVM0037E": _("Can't migrate vm %(name)s on Hypervisor arch %(srcarch)s.to a different Hypervisor arch %(destarch)s."), + "KCHVM0038E": _("Can't migrate from %(srchyp)s to a different Hypervisor type %(desthyp)s."), + "KCHVM0039E": _("Can't migrate vm %(name)s, vm has passthrough device %(hostdevs)s."), + "KCHVM0040E": _("Failed to set migrateSetMaxDowntime when migrate vm %(name)s. Details: %(err)s "), + "KCHVM0041E": _("Can not migrate vm %(name)s when its in %(state)s state."), + "KCHVM0042E": _("Failed Migrate vm %(name)s due error: %(err)s"), + "KCHVM0043E": _("Failed destory vm %(name)s from migration recover. Details: %(err)s"), + "KCHVM0044E": _("Failed disconnect %(remoteuri)s when finish migrate vm %(name)s. Details: %(err)s"), "KCHVMHDEV0001E": _("VM %(vmid)s does not contain directly assigned host device %(dev_name)s."), "KCHVMHDEV0002E": _("The host device %(dev_name)s is not allowed to directly assign to VM."), diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index d194049..ed8f96f 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -33,6 +33,7 @@ from cherrypy.process.plugins import BackgroundTask from kimchi import model, vnc from kimchi.config import READONLY_POOL_TYPE from kimchi.exception import InvalidOperation, InvalidParameter +from kimchi.model.libvirtconnection import LibvirtConnection from kimchi.exception import NotFoundError, OperationFailed from kimchi.model.config import CapabilitiesModel from kimchi.model.tasks import TaskModel @@ -790,6 +791,121 @@ class VMModel(object): except libvirt.libvirtError as e: raise OperationFailed("KCHVM0019E", {'name': name, 'err': e.get_error_message()}) + + def _preCheck(self, name, destConn, remoteHost): + kimchi_log.debug('precheck migrate %s' % name) + + _destConn = destConn.get() + if remoteHost in ['localhost', '127.0.0.1']: + kimchi_log.debug('vm %s Can not migrate to localhost.' % name) + raise OperationFailed("KCHVM0036E", {'name': name, + 'remoteHost': remoteHost}) + destarch = _destConn.getInfo()[0] + if self.conn.get().getInfo()[0] != destarch: + kimchi_log.debug('vm %s can not migrate to different arch server.' % (name, destarch)) + raise OperationFailed("KCHVM0037E", {'name': name, + 'srcarch': self.conn.get().getInfo()[0], + 'destarch': destarch}) + desthyp = _destConn.getType() + if self.conn.get().getType() != desthyp: + kimchi_log.debug('vm %s can not migrate to a different hypervisor' % name) + raise OperationFailed("KCHVM0038E", {'name': self.name, + 'srchyp':self.conn.get().getType(), + 'desthyp':desthyp}) + + + #model.host import DOM_STATE_MAP, vmhostdevs import host, + #to void loop import DOM_STATE_MAP, move import VMHostDevsModel here + from kimchi.model.vmhostdevs import VMHostDevsModel + + #check if there is any passthrough devices belong to this vm + vmhostdevs = VMHostDevsModel(conn = self.conn) + hostdevs = vmhostdevs.get_list(name) + if hostdevs: + raise OperationFailed("KCHVM0039E", {'name' : name, + 'hostdevs': hostdevs}) + #open destination connect to migrate + @staticmethod + def _getRemoteConn(self, remoteHost, user, transport = 'ssh'): + duri = 'qemu+%s://%s@%s/system' % (transport, + user,remoteHost) + conn = LibvirtConnection(duri) + return conn + + def _do_migrate(self, name, destConn, remoteHost, secure, cb): + _destConn = destConn.get() + + cb('starting a migration') + kimchi_log.debug('migrate %s start' % name) + dom = self.get_vm(name, self.conn) + flag = 0 + if secure: + flag |= (libvirt.VIR_MIGRATE_PEER2PEER | + libvirt.VIR_MIGRATE_TUNNELLED) + + state = DOM_STATE_MAP[dom.info()[0]] + if state in ['running','paused']: + flag |= libvirt.VIR_MIGRATE_LIVE + try: + dom.migrateSetMaxDowntime(0) + except libvirt.libvirtError as e: + raise OperationFailed("KCHVM0040E", + {'name': name, 'err': e.get_error_message()}) + elif state == 'shutoff': + flag |= libvirt.VIR_MIGRATE_OFFLINE + else: + kimchi_log.debug('Can not migrate vm %s when its in %s.' % (name, state)) + raise OperationFailed("KCHVM0041E", {'name': self.name}) + try: + dom.migrate(_destConn, flag, None, None, 0) + except libvirt.libvirtError as e: + kimchi_log.error('migrate %s to %s failed' % (name, + remoteHost)) + self._recover(cb) + raise OperationFailed('KCHVM0042E', {'err': e.message, + 'name': name}) + finally: + self._finish(name, destConn, cb) + + def migrate(self, name, remoteHost, user, passwd = None, secure = None): + destconn = self._getRemoteConn(remoteHost, user, passwd) + self._preCheck(name, destconn, remoteHost, secure) + + task_id = add_task('/vms/%s/migrate' % name, self._do_migrate, self.objstore, + {'name' : name, 'destconn': destconn, + 'remoteHost': remoteHost, 'secure': secure}) + + # Record vm migrate task for future querying + try: + with self.objstore as session: + session.store('migrate', name, task_id) + return task_id + except Exception as e: + raise OperationFailed('KCHPOOL0037E', {'err': e.message}) + + def _recover(self, name, destconn, cb): + destvm = self.get_vm(name, destconn) + #recover + cb('recover from a failed migration',False) + kimchi_log.debug('recover from a failed migrate %s' % name) + try: + destvm.destroy() + kimchi_log.error("destory migrate vm on destination server") + except libvirt.libvirtError as e: + raise OperationFailed('KCHVM0043E', {'name' : name, + 'err': e.message}) + + def _finish(self, name, destConn, cb): + _destConn = destConn.get() + kimchi_log.debug('finished migrate %s' % name) + try: + _destConn.close() + except libvirt.libvirtError as e: + raise OperationFailed('KCHVM0044E', {'name' : name, + 'remoteuri' : _destConn.getURI(), + 'err': e.message}) + finally: + cb('Migrate finished', True) def poweroff(self, name): dom = self.get_vm(name, self.conn) -- 1.8.3.1

3 3

UI Mockup of Guest Snapshot
by Yu Xin Huo 14 Nov '14

14 Nov '14

2 3

[PATCHv3 0/8] LDAP support
by lvroyce＠linux.vnet.ibm.com 14 Nov '14

14 Nov '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Royce Lv (8): Add configuration of LDAP Split PAM and LDAP authentication Add LDAP authentication Fix test cases for authentication Split users and groups for permission query Move validation to authorizaiton change vm permission tag Update test model to fix user/group listing contrib/DEBIAN/control.in | 1 + contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + docs/README.md | 36 +++++----- src/kimchi.conf.in | 17 +++++ src/kimchi/auth.py | 157 +++++++++++++++++++++++++++++++----------- src/kimchi/config.py.in | 5 ++ src/kimchi/control/auth.py | 42 +++++++++++ src/kimchi/control/host.py | 14 ---- src/kimchi/i18n.py | 1 + src/kimchi/model/auth.py | 136 ++++++++++++++++++++++++++++++++++++ src/kimchi/model/host.py | 19 ----- src/kimchi/model/vms.py | 42 ++++++----- tests/test_model.py | 3 +- tests/test_rest.py | 4 +- tests/utils.py | 43 ++++++++---- 16 files changed, 398 insertions(+), 124 deletions(-) create mode 100644 src/kimchi/control/auth.py create mode 100644 src/kimchi/model/auth.py -- 1.8.3.2

4 18

[v4 1/1] Virtual machine migration
by simonjin＠linux.vnet.ibm.com 14 Nov '14

14 Nov '14

From: Simon Jin <simonjin(a)linux.vnet.ibm.com> Signed-off-by: Simon Jin <simonjin(a)linux.vnet.ibm.com> --- docs/API.md | 5 ++ src/kimchi/control/vms.py | 1 + src/kimchi/i18n.py | 11 ++++ src/kimchi/model/vms.py | 130 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 147 insertions(+) diff --git a/docs/API.md b/docs/API.md index 9b866f3..17073c8 100644 --- a/docs/API.md +++ b/docs/API.md @@ -132,6 +132,11 @@ the following general conventions: It emulates the power reset button on a machine. Note that there is a risk of data loss caused by reset without the guest OS shutdown. * connect: Prepare the connection for spice or vnc +* migrate: Migrate a virtual machine to a remote server, only support live mode without block migration. + * remoteHost: IP address or hostname of the remote server. + * user: User of the remote server. + * passwd: Passwd of user on remote server. + * secure: Migrate in P2P secure tunel mode. * clone: Create a new VM identical to this VM. The new VM's name, UUID and network MAC addresses will be generated automatically. Each existing diff --git a/src/kimchi/control/vms.py b/src/kimchi/control/vms.py index a1589ef..e6870e0 100644 --- a/src/kimchi/control/vms.py +++ b/src/kimchi/control/vms.py @@ -42,6 +42,7 @@ class VM(Resource): for ident, node in sub_nodes.items(): setattr(self, ident, node(model, self.ident)) self.start = self.generate_action_handler('start') + self.migrate = self.generate_action_handler_task('migrate', ['remoteHost', 'user', 'passwd', 'secure']) self.poweroff = self.generate_action_handler('poweroff') self.shutdown = self.generate_action_handler('shutdown') self.reset = self.generate_action_handler('reset') diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index e823f2b..6da834a 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -105,6 +105,17 @@ messages = { "KCHVM0033E": _("Virtual machine '%(name)s' must be stopped before cloning it."), "KCHVM0034E": _("Insufficient disk space to clone virtual machine '%(name)s'"), "KCHVM0035E": _("Unable to clone VM '%(name)s'. Details: %(err)s"), + "KCHVM0036E": _("Migrate %(name)s to localhost %(remoteHost)s is not allowed."), + "KCHVM0037E": _("vm %(name)s is already in migrating, can not perform migrate on it again."), + "KCHVM0038E": _("Can't migrate vm %(name)s on Hypervisor arch %(srcarch)s.to a different Hypervisor arch %(destarch)s."), + "KCHVM0039E": _("Can't migrate %(name)s from %(srchyp)s to a different Hypervisor type %(desthyp)s."), + "KCHVM0040E": _("Can't migrate vm %(name)s, vm has passthrough device %(hostdevs)s."), + "KCHVM0041E": _("Failed to set migrateSetMaxDowntime when migrate vm %(name)s. Details: %(err)s "), + "KCHVM0042E": _("Can not migrate vm %(name)s when its in %(state)s state."), + "KCHVM0043E": _("Failed Migrate vm %(name)s due error: %(err)s"), + "KCHVM0044E": _("Failed to store migrate %(name)s task ID %(task_id)s. error: %(err)s"), + "KCHVM0045E": _("Failed to destroy vm %(name)s from migration recover. Details: %(err)s"), + "KCHVM0046E": _("Failed disconnect %(remoteuri)s when finish migrate vm %(name)s. Details: %(err)s"), "KCHVMHDEV0001E": _("VM %(vmid)s does not contain directly assigned host device %(dev_name)s."), "KCHVMHDEV0002E": _("The host device %(dev_name)s is not allowed to directly assign to VM."), diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index d194049..3243f70 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -35,6 +35,7 @@ from kimchi.config import READONLY_POOL_TYPE from kimchi.exception import InvalidOperation, InvalidParameter from kimchi.exception import NotFoundError, OperationFailed from kimchi.model.config import CapabilitiesModel +from kimchi.model.libvirtconnection import LibvirtConnection from kimchi.model.tasks import TaskModel from kimchi.model.templates import TemplateModel from kimchi.model.utils import get_vm_name @@ -790,6 +791,135 @@ class VMModel(object): except libvirt.libvirtError as e: raise OperationFailed("KCHVM0019E", {'name': name, 'err': e.get_error_message()}) + + def _preCheck(self, name, destConn, remoteHost): + kimchi_log.debug('precheck migrate %s' % name) + _destConn = destConn.get() + if remoteHost in ['localhost', '127.0.0.1']: + kimchi_log.debug('vm %s Can not migrate to localhost.' % name) + raise OperationFailed("KCHVM0036E", {'name': name, + 'remoteHost': remoteHost}) + try: + with self.objstore as session: + task_id = session.get('migrate', name) + if task_id: + kimchi_log.debug('vm %s is already in migrating.' % name) + raise OperationFailed("KCHVM0037E", {'name': name}) + except NotFoundError as e: + kimchi_log.debug('No migrate on vm %s.' % name) + + srcarch = self.conn.get().getInfo()[0] + destarch = _destConn.getInfo()[0] + if srcarch != destarch: + kimchi_log.debug('vm %s can not migrate to different arch server.' % (name, destarch)) + raise OperationFailed("KCHVM0038E", {'name': name, + 'srcarch': srcarch, + 'destarch': destarch}) + srchyp = self.conn.get().getType() + desthyp = _destConn.getType() + if srchyp != desthyp: + kimchi_log.debug('vm %s can not migrate to a different hypervisor' % name) + raise OperationFailed("KCHVM0039E", {'name': name, + 'srchyp': srchyp, + 'desthyp':desthyp}) + + #model.host import DOM_STATE_MAP, vmhostdevs import host, + #to void loop import DOM_STATE_MAP, move import VMHostDevsModel here + from kimchi.model.vmhostdevs import VMHostDevsModel + #check if there is any passthrough devices belong to this vm + vmhostdevs = VMHostDevsModel(conn = self.conn) + hostdevs = vmhostdevs.get_list(name) + if hostdevs: + raise OperationFailed("KCHVM0040E", {'name' : name, + 'hostdevs': hostdevs}) + #open destination connect to migrate + @staticmethod + def _getRemoteConn(remoteHost, user, passwd, transport = 'ssh'): + duri = 'qemu+%s://%s@%s/system' % (transport, user,remoteHost) + conn = LibvirtConnection(duri) + return conn + + def _do_migrate(self, cb, params): + name = params['name'] + destConn = params['destConn'] + remoteHost = params['remoteHost'] + secure = params['secure'] + _destConn = destConn.get() + + cb('starting a migration') + kimchi_log.debug('migrate %s start' % name) + dom = self.get_vm(name, self.conn) + flag = 0 + if secure: + flag |= (libvirt.VIR_MIGRATE_PEER2PEER | + libvirt.VIR_MIGRATE_TUNNELLED) + + state = DOM_STATE_MAP[dom.info()[0]] + if state in ['running','paused']: + flag |= libvirt.VIR_MIGRATE_LIVE + try: + dom.migrateSetMaxDowntime(0) + except libvirt.libvirtError as e: + raise OperationFailed("KCHVM0041E", + {'name': name, 'err': e.get_error_message()}) + elif state == 'shutoff': + flag |= libvirt.VIR_MIGRATE_OFFLINE + else: + kimchi_log.debug('Can not migrate vm %s when its in %s.' % (name, state)) + raise OperationFailed("KCHVM0042E", {'name': name, + 'state': state}) + try: + dom.migrate(_destConn, flag, None, None, 0) + except libvirt.libvirtError as e: + kimchi_log.error('migrate %s to %s failed' % (name, remoteHost)) + self._finish(name, destConn, False, cb) + self._recover(name, destConn, cb) + raise OperationFailed('KCHVM0043E', {'err': e.message, + 'name': name}) + self._finish(name, destConn, True, cb) + + def migrate(self, name, remoteHost, user, passwd = None, secure = None): + destConn = self._getRemoteConn(remoteHost, user, passwd) + self._preCheck(name, destconn, remoteHost, secure) + + params = {'name': name, + 'destConn': destConn, + 'remoteHost': remoteHost, + 'secure': secure} + task_id = add_task('/vms/%s/migrate' % name, self._do_migrate, + self.objstore, params) + + # Record vm migrate task for future querying + try: + with self.objstore as session: + session.store('migrate', name, task_id) + except Exception as e: + raise OperationFailed('KCHVM0044E', {'name': name, + 'task_id': task_id, + 'err': e.message}) + + def _recover(self, name, destconn, cb): + destvm = self.get_vm(name, destconn) + cb('recover from a failed migration',False) + kimchi_log.debug('recover from a failed migrate %s' % name) + try: + destvm.destroy() + kimchi_log.error("Failed to destory migrate vm %s on \ + destination server" % name) + except libvirt.libvirtError as e: + raise OperationFailed('KCHVM0045E', {'name' : name, + 'err': e.message}) + + def _finish(self, name, destConn, success, cb): + _destConn = destConn.get() + kimchi_log.debug('finished migrate %s' % name) + cb('Migrate finished', success) + try: + _destConn.close() + except libvirt.libvirtError as e: + raise OperationFailed('KCHVM0046E', {'name' : name, + 'remoteuri' :_destConn.getURI(), + 'err': e.message}) def poweroff(self, name): dom = self.get_vm(name, self.conn) -- 1.8.3.1

1 0

[PATCH V2] Edit Template redefined
by Wen Wang 14 Nov '14

14 Nov '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V1 -> V2: 1) Enable "iSCSI" and "SCSI" for storage. 2) Changed the storage tab from "storage" to "Storage". 3) Fix the defect that when editing/adding "Storage" or "Interface" line went down issue. 4) "Storage" and "Interface" content can display properly on Remote and Image created template. 5) Fix the defect that "Image" didn't show properly when using a Image created template. This patch redesigned "Edit Template" diaguage in "Templates". New "Edit Template" will display all the related information into tabs of "General", "Storage" and "Interface". Due to unfinished back-end work, functions are not fully supported, which will be finished in the future work. Temporary disabled functions: 1) Multiple disk operation with multiple storage pools edit in template for which reason the add button in "Storage" tab is disabled. 2) iSCSI and SCSI storage pool add is removed since we are going to allow this kind of operation in the process of creating a VM. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/template-edit.css | 116 +++++++---- ui/js/src/kimchi.template_edit_main.js | 364 +++++++++++++++++++++++--------- ui/pages/template-edit.html.tmpl | 168 ++++++++------- 3 files changed, 432 insertions(+), 216 deletions(-) diff --git a/ui/css/theme-default/template-edit.css b/ui/css/theme-default/template-edit.css index 4975f1b..094e909 100644 --- a/ui/css/theme-default/template-edit.css +++ b/ui/css/theme-default/template-edit.css @@ -17,24 +17,33 @@ */ #template-edit-window { font-size: 13px; - height: 600px; - width: 1000px; + height: 500px; + width: 800px; } -.template-edit-fieldset { - float: left; - padding: 1em; +#edit-template-tabs { + background: none repeat scroll 0 0 transparent; + border: medium none; + height: 100%; + padding: 0; } -.template-edit-wrapper-label, .template-edit-wrapper-controls { +#edit-template-tabs .form-template-inline-wrapper { + display: inline-block; vertical-align: top; - width: 470px; } .template-edit-wrapper-label { - height: 18px; - line-height: 18px; - margin-top: 8px; + vertical-align: top; + min-width: 100px; + height: 35px; + line-height: 35px; + margin: 7px 0 8px; +} + +.template-edit-wrapper-controls { + vertical-align: top; + width: 400px; } .template-edit-wrapper-controls input[type="text"] { @@ -56,7 +65,7 @@ .template-edit-wrapper-controls > .dropdown { margin: 5px 0 0 1px; - width: 440px; + width: 372px; } .template-edit-wrapper-controls input[type="text"][disabled] { @@ -65,41 +74,72 @@ cursor: not-allowed; } -.hidden-area { - display: none; +#edit-template-tabs .template-tab-header { + margin-bottom: 8px; + padding-bottom: 2px; + font-weight: bold; + border-bottom: 1px solid #999999; + overflow: hidden; } -.template-edit-wrapper-controls .select-list-box { - width: 464px; - max-height: 168px; - overflow: auto; - margin-top: 5px; - border: 1px solid #ccc; +#edit-template-tabs .template-tab-header .action-area { + float: right; + height: 20px; + width: 20px; } -.template-edit-wrapper-controls .select-list-box>li>label { - display: block; +#edit-template-tabs .template-interface-cell { + display: inline-block; + width: 250px; } -.template-edit-wrapper-controls .select-list-box>li>label> -input[type="checkbox"] { - display: none; +#edit-template-tabs .template-storage-cell{ + display: inline-block; + width: 230px; +} + +#edit-template-tabs .template-storage-cell label { + height: 25px; + padding: 2px; + border: 1px; } -.template-edit-wrapper-controls .select-list-box>li>label>.item { - display: block; - height: 41px; - line-height: 41px; - padding: 0 20px 0 40px; - border-bottom: 1px solid #ccc; - box-shadow: 0px 1px 1px #fff; - text-shadow: -1px -1px 1px #ddd, 1px 1px 1px #fff; - color: #222; - font-size: 12px; +#form-template-storage .template-tab-body select { + width: 140px; } -.template-edit-wrapper-controls .select-list-box>li>label> -input[type="checkbox"]:CHECKED+.item { - background: #f8f8f8 url(../images/theme-default/check-green.png) no-repeat - 10px center; +#form-template-storage .template-tab-body input { + width: 56px; + height: 17px; } + +#form-template-storage .template-tab-body .template-storage-name { + width: 220px; +} + +#edit-template-tabs .template-tab-body input[readonly] { + background: none repeat scroll 0 0 rgba(0, 0, 0, 0); + border-color: transparent; + text-overflow: ellipsis; +} + +#edit-template-tabs .template-tab-body .item { + height: 25px; +} + +#form-template-interface .template-tab-body select { + width: 180px; +} + +#edit-template-tabs .template-tab-body .action-area { + float: right; +} + +#edit-template-tabs .template-tab-body .action-area button { + width: 20px; + height: 20px; +} + +#edit-template-tabs .hide { + display: none; +} \ No newline at end of file diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index 2f4cc9a..12a9f20 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -16,19 +16,23 @@ * limitations under the License. */ kimchi.template_edit_main = function() { - var templateEditForm = $('#form-template-edit'); + var templateEditMain = $('#edit-template-tabs'); var origDisks; var origPool; + var origNetworks; var templateDiskSize; - $('#template-name', templateEditForm).val(kimchi.selectedTemplate); - kimchi.retrieveTemplate(kimchi.selectedTemplate, function(template) { + $('#template-name', templateEditMain).val(kimchi.selectedTemplate); + templateEditMain.tabs(); + + var initTemplate = function(template) { origDisks = template.disks; origPool = template.storagepool; + origNetworks = template.networks; for(var i=0;i<template.disks.length;i++){ if(template.disks[i].base){ template["vm-image"] = template.disks[i].base; - $('#templ-edit-cdrom').addClass('hide-content'); - $('#templ-edit-vm-image').removeClass('hide-content'); + $('.templ-edit-cdrom').addClass('hide'); + $('.templ-edit-vm-image').removeClass('hide'); break; } } @@ -37,18 +41,12 @@ kimchi.template_edit_main = function() { if (prop == 'graphics') { value = value["type"]; } - $('input[name="' + prop + '"]', templateEditForm).val(value); - } - var disks = template.disks; - $('input[name="disks"]').val(disks[0].size); - templateDiskSize = $('input[name="disks"]').val(); - if (disks[0].volume) { - var spool_value = $('#form-template-edit [name="storagepool"]').val(); - $('input[name="storagepool"]', templateEditForm).val(spool_value + '/' + disks[0].volume); - $('input[name="disks"]', templateEditForm).attr('disabled','disabled'); + $('input[name="' + prop + '"]', templateEditMain).val(value); } var vncOpt = [{label: 'VNC', value: 'vnc'}]; + $('#template-edit-graphics').append('<option selected>VNC</option>'); + $('#template-edit-graphics').append('<option>Spice</option>'); kimchi.select('template-edit-graphics-list', vncOpt); var enableSpice = function() { if (kimchi.capabilities == undefined) { @@ -61,119 +59,281 @@ kimchi.template_edit_main = function() { } }; enableSpice(); - - var scsipools = {}; - kimchi.listStoragePools(function(result) { - var options = []; - if (result && result.length) { - $.each(result, function(index, storagePool) { - if ((storagePool.state=="active") && (storagePool.type !== 'kimchi-iso')) { - if ((storagePool.type == 'iscsi') || (storagePool.type == 'scsi')){ - scsipools[storagePool.name] = []; - kimchi.listStorageVolumes(storagePool.name, function(result) { - if (result && result.length) { - $.each(result, function(index, storageVolume) { - options.push({ - label: storagePool.name + '/' + storageVolume.name, - value: '/storagepools/' + storagePool.name + '/' + storageVolume.name - }); - scsipools[storagePool.name].push(storageVolume) - }); - } - kimchi.select('template-edit-storagePool-list', options); - }); + var initStorage = function(result) { + var scsipools = {}; + var addStorageItem = function(storageData) { + var thisName; + var thisType; + var thisDisk; + var nodeStorage = $.parseHTML(kimchi.substitute($('#template-storage-pool-tmpl').html(), storageData)); + $('.template-tab-body', '#form-template-storage').append(nodeStorage); + $('.edit', '#form-template-storage').button({ + icons : {primary : 'ui-icon-pencil'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + var storageItem = $(this).parent().parent(); + thisName = $('.template-storage-name', storageItem).val(); + thisType = $('.template-storage-type', storageItem).val(); + thisDisk = $('.template-storage-disk', storageItem).val(); + $('.template-storage-name', storageItem).hide(); + $('.template-storage-disk', storageItem).attr('readonly', false); + if (thisType === 'iscsi' || thisType === 'scsi') { + $('.template-storage-disk', storageItem).attr('readonly', true); + } else { + $('.template-storage-disk', storageItem).attr('readonly', false); + } + $('.save', storageItem).parent().show(); + $('.delete', storageItem).parent().hide(); + var selectedStorage = $('select', storageItem).val(); + $('.template-storage-name', storageItem).val(selectedStorage).hide(); + $('select', storageItem).val(thisName).show(); + }); + $('.delete', '#form-template-storage').button({ + icons : {primary : 'ui-icon-trash'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + $(this).parent().parent().remove(); + }); + $('.cancel', '#form-template-storage').button({ + icons : {primary : 'ui-icon-arrowreturnthick-1-w'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + var cancelEntity = $(this).parent().parent(); + if ($('.template-storage-name', cancelEntity).val() === 'null') { + cancelEntity.remove(); + } else { + $('select', cancelEntity).hide(); + $('.template-storage-name', cancelEntity).val(thisName).attr('readonly', true).show(); + $('.template-storage-type', cancelEntity).val(thisType).attr('readonly', true); + $('.template-storage-disk', cancelEntity).val(thisDisk).attr('readonly', true); + $('.save', cancelEntity).parent().hide(); + $('.edit', cancelEntity).parent().show(); + } + }); + $('.save', '#form-template-storage').button({ + icons : {primary : 'ui-icon-disk'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + var storageItem = $(this).parent().parent(); + $('.save', storageItem).parent().hide(); + $('.delete', storageItem).parent().show(); + var selectedStorage = $('select', storageItem).val(); + $('.template-storage-name', storageItem).val(selectedStorage).attr('readonly', true).show(); + $('.template-storage-disk', storageItem).attr('readonly', true); + $('.template-storage-type', storageItem).attr('readonly', true); + $('select', storageItem).hide(); + }); + var storageOptions = ''; + var scsiOptions = ''; + $('select', '#form-template-storage').find('option').remove(); + $.each(result, function(index, storageEntities) { + if((storageEntities.state === 'active') && (storageEntities.type != 'kimchi-iso')) { + if(storageEntities.type === 'iscsi' || storageEntities.type === 'scsi') { + kimchi.listStorageVolumes(storageEntities.name, function(currentVolume) { + $.each(currentVolume, function(indexSCSI, scsiEntities) { + scsiOptions += '<option>' + storageEntities.name + '/' + scsiEntities.name + '</option>'; + }); + $('select', '#form-template-storage').append(scsiOptions); + }, function() {}); + } else { + var isSlected = storageEntities.name === 'default' ? ' selected' : ''; + storageOptions += '<option' + isSlected + '>' + storageEntities.name + '</option>'; } - else { - options.push({ - label: storagePool.name, - value: '/storagepools/' + storagePool.name - }); + } + }); + $('select', '#form-template-storage').append(storageOptions); + $('select', '#form-template-storage').change(function() { + var selectedItem = $(this).parent().parent(); + var tempStorageName = $(this).val(); + tempStorageName =tempStorageName.split('/')[0]; + var scsiCap; + $.each(result, function(index, storageEntities) { + if (tempStorageName === storageEntities.name) { + selectedItem.find('.template-storage-type').val(storageEntities.type); + scsiCap = storageEntities.capacity / Math.pow(1024, 3); } + }) + if (tempStorageName === 'iscsi' || tempStorageName === 'scsi') { + $('.template-storage-disk', selectedItem).attr('readonly', true).val(scsiCap); + } else { + $('.template-storage-disk', selectedItem).attr('readonly', false).val('10'); } }); - } - if ($.isEmptyObject(scsipools)) { - kimchi.select('template-edit-storagePool-list', options); - } - }); - kimchi.listNetworks(function(result) { - if(result && result.length > 0) { - var html = ''; - var tmpl = $('#tmpl-network').html(); - $.each(result, function(index, network) { - if (result[index].state === 'active') - html += kimchi.substitute(tmpl, network); + }; + + if ((origDisks && origDisks.length) && (origPool && origPool.length)) { + splitPool = origPool.split('/'); + var defaultPool; + var defaultType; + $.each(result, function(index, poolEntities) { + if (poolEntities.name === splitPool[splitPool.length-1]) { + defaultType = poolEntities.type; + defaultPool = splitPool[splitPool.length-1] + } }); - $('#template-edit-network-list').html(html).show(); - if(template.networks && template.networks.length > 0) { - $('input[name="networks"]', templateEditForm).each(function(index, element) { - var value = $(element).val(); - if(template.networks.indexOf(value) >= 0) { - $(element).prop('checked', true); - } - }); + if (origDisks[0]['volume']) { + defaultPool = defaultPool + '/' + origDisks[0]['volume']; } - } else { - $('#template-edit-network-list').hide(); + $.each(origDisks, function(index, diskEntities) { + var storageNodeData = { + viewMode : '', + editMode : 'hide', + storageName : defaultPool, + storageType : defaultType, + storageDisk : diskEntities.size + } + addStorageItem(storageNodeData); + }); + $('.template-storage-disk').attr('readonly', true); } - }); - }); - $('#template-edit-storagePool').change(function() { - storagepool = $(this).val(); - var storageArray = storagepool.split("/"); - if (storageArray.length > 3) { - volumeName = storageArray.pop(); - poolName = storageArray.pop(); - kimchi.getStoragePoolVolume(poolName, volumeName, function(result) { - $('input[name="disks"]', templateEditForm).val(result.capacity / Math.pow(1024,3)); - $('input[name="disks"]', templateEditForm).attr('disabled','disabled'); - return false; - }, function (err) { - kimchi.message.error(err.responseJSON.reason); + $('#template-edit-storage-add-button').button({ + icons: { + primary: "ui-icon-plusthick" + }, + text: false, + disabled: true + }).click(function(event) { + event.preventDefault(); + var storageNodeData = { + viewMode : 'hide', + editMode : '', + storageName : 'null', + storageType : 'dir', + storageDisk : '10' + } + addStorageItem(storageNodeData); }); - } else { - $('input[name="disks"]', templateEditForm).removeAttr('disabled'); - $('input[name="disks"]', templateEditForm).val(templateDiskSize); - } - }); - $('input[name="disks"]', templateEditForm).keyup(function() { - templateDiskSize = $('input[name="disks"]', templateEditForm).val(); - }); + }; + var initInterface = function(result) { + var addInterfaceItem = function(networkData) { + var nodeInterface = $.parseHTML(kimchi.substitute($('#template-interface-tmpl').html(), networkData)); + $('.template-tab-body', '#form-template-interface').append(nodeInterface); + $('.edit', '#form-template-interface').button({ + icons : {primary : 'ui-icon-pencil'}, + text : false, + disabled : true + }); + $('.delete', '#form-template-interface').button({ + icons : {primary : 'ui-icon-trash'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + $(this).parent().parent().remove(); + }); + $('.cancel', '#form-template-interface').button({ + icons : {primary : 'ui-icon-arrowreturnthick-1-w'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + $(this).parent().parent().remove(); + }); + $('.save', '#form-template-interface').button({ + icons : {primary : 'ui-icon-disk'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + var interItem = $(this).parent().parent(); + $('.save', interItem).parent().hide(); + $('.delete', interItem).parent().show(); + var selectedInterface = $('select', interItem).val(); + $('.template-interface-name', interItem).val(selectedInterface).show(); + $('select', interItem).hide(); + }); + var networkOptions = ''; + for(var i=0;i<result.length;i++){ + if(result[i].state === "active") { + var isSlected = i==0 ? ' selected' : ''; + networkOptions += '<option' + isSlected + '>' + result[i].name + '</option>'; + } + } + $('select', '#form-template-interface').find('option').remove(); + $('select', '#form-template-interface').append(networkOptions); + }; + if(result && result.length > 0) { + $.each(result, function(index, data) { + if($.inArray(data.name, origNetworks) > -1) { + addInterfaceItem({ + mac : '', + network : data.name, + type : 'network', + viewMode : '', + editMode : 'hide' + }); + } + }); + } + $('#template-edit-interface-add-button').button({ + icons: { + primary: 'ui-icon-plusthick' + }, + text: false + }).click(function(evt) { + evt.preventDefault(); + addInterfaceItem({ + mac : '', + network : '', + type : 'network', + viewMode : 'hide', + editMode : '' + }); + }); + }; + kimchi.listNetworks(initInterface); + kimchi.listStoragePools(initStorage); + }; + kimchi.retrieveTemplate(kimchi.selectedTemplate, initTemplate); + $('#tmpl-edit-button-save').on('click', function() { - var editableFields = [ 'name', 'cpus', 'memory', 'storagepool', 'disks', 'graphics']; + var editableFields = [ 'name', 'cpus', 'memory', 'disks', 'graphics']; var data = {}; + //Fix me: Only support one storage pool now + var storages = $('.template-tab-body .item', '#form-template-storage'); + var tempName = $('.template-storage-name', storages).val(); + tempName = tempName.split('/'); + var tempNameHead =tempName[0]; + var tempNameTail = tempNameHead; + if(tempNameHead === 'iscsi' || tempNameHead =='scsi') { + tempNameTail = tempName[tempName.length-1]; + } + tempName = '/storagepools/' + tempNameHead; + data['storagepool'] = tempName; $.each(editableFields, function(i, field) { /* Support only 1 disk at this moment */ if (field == 'disks') { - origDisks[0].size = Number($('#form-template-edit [name="' + field + '"]').val()); + var tmpItem = $('#form-template-storage .item'); + origDisks[0].size = Number($('.template-storage-disk', tmpItem).val()); + if($('.template-storage-type', tmpItem).val() === 'iscsi' || $('.template-storage-type', tmpItem).val() =='scsi') { + origDisks[0]['volume'] = tempNameTail; + } else { + origDisks[0]['volume'] && delete origDisks[0]['volume']; + } data[field] = origDisks; } else if (field == 'graphics') { - var type = $('#form-template-edit [name="' + field + '"]').val(); + var type = $('#form-template-general [name="' + field + '"]').val(); data[field] = {'type': type}; } else { - data[field] = $('#form-template-edit [name="' + field + '"]').val(); + data[field] = $('#form-template-general [name="' + field + '"]').val(); } }); data['memory'] = Number(data['memory']); data['cpus'] = Number(data['cpus']); - storagepool = data['storagepool']; - storageArray = storagepool.split("/"); - if (storageArray.length > 3){ - /* Support only 1 disk at this moment */ - data["disks"][0].volume = storageArray.pop(); - data['storagepool'] = storageArray.join("/"); - } else if (data["disks"][0].volume) { - delete data["disks"][0].volume; - } - var networks = templateEditForm.serializeObject().networks; - if (networks instanceof Array) { - data.networks = networks; - } else if (networks != null) { - data.networks = [networks]; + var networks = $('.template-tab-body .item', '#form-template-interface'); + var networkForUpdate = new Array(); + $.each(networks, function(index, networkEntities) { + networkForUpdate.push($('.template-interface-name', networkEntities).val()); + }); + if (networkForUpdate instanceof Array) { + data.networks = networkForUpdate; + } else if (networkForUpdate != null) { + data.networks = [networkForUpdate]; } else { data.networks = []; } diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 5a71d91..018ac10 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -28,74 +28,67 @@ <div class="close">X</div> </header> <div class="content"> - <form id="form-template-edit"> + <div id="edit-template-tabs"> <input type="hidden" id="template-name" name="templateName" /> - <fieldset class="template-edit-fieldset"> - <div> + <ul> + <li> + <a href="#form-template-general">$_("General")</a> + </li> + <li> + <a href="#form-template-storage">$_("Storage")</a> + </li> + <li> + <a href="#form-template-interface">$_("Interface")</a> + </li> + </ul> + <form id="form-template-general"> + <div class="form-template-inline-wrapper"> <div class="template-edit-wrapper-label"> <label for="template-edit-id-textbox">$_("Name")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-id-textbox" name="name" type="text" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-vendor-textbox">$_("Vendor")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-vendor-textbox" name="os_distro" type="text" disabled="disabled" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-version-textbox">$_("Version")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-version-textbox" name="os_version" type="text" disabled="disabled" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-cpu-textbox">$_("CPU Number")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-cpu-textbox" name="cpus" type="text" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-memory-textbox">$_("Memory (MB)")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-memory-textbox" name="memory" type="text" /> + <div class="template-edit-wrapper-label templ-edit-cdrom"> + <label for="template-edit-cdrom-textbox">$_("CDROM")</label> + </div> + <div class="template-edit-wrapper-label templ-edit-vm-image hide"> + <label for="template-edit-vmimage-textbox">$_("Image File")</label> </div> - </div> - <div> <div class="template-edit-wrapper-label"> - <label for="template-edit-disk-textbox">$_("Disk (GB)")</label> + <label>$_("Graphics")</label> </div> + </div> + <div class="form-template-inline-wrapper"> <div class="template-edit-wrapper-controls"> - <input id="template-edit-disk-textbox" name="disks" type="text" /> + <input id="template-edit-id-textbox" name="name" type="text" /> </div> - </div> - </fieldset> - <fieldset class="template-edit-fieldset"> - <div id="templ-edit-cdrom"> - <div class="template-edit-wrapper-label"> - <label for="template-edit-cdrom-textbox">$_("CDROM")</label> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-vendor-textbox" name="os_distro" type="text" disabled="disabled" /> </div> <div class="template-edit-wrapper-controls"> - <input id="template-edit-cdrom-textbox" name="cdrom" type="text" disabled="disabled"/> + <input id="template-edit-version-textbox" name="os_version" type="text" disabled="disabled" /> </div> - </div> - <div id="templ-edit-vm-image" class="hide-content"> - <div class="template-edit-wrapper-label">$_("Image File")</div> - <div class="template-edit-wrapper-controls"><input name="vm-image" type="text" disabled/></div> - </div> - <div> - <div class="template-edit-wrapper-label"> - <label>$_("Graphics")</label> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-cpu-textbox" name="cpus" type="text" /> + </div> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-memory-textbox" name="memory" type="text" /> + </div> + <div class="template-edit-wrapper-controls templ-edit-cdrom"> + <input id="template-edit-cdrom-textbox" name="cdrom" type="text" disabled="disabled" /> + </div> + <div class="template-edit-wrapper-controls templ-edit-vm-image hide"> + <input id="template-edit-vmimage-textbox" name="vm-image" type="text" disabled="disabled" /> </div> <div class="template-edit-wrapper-controls"> <div class="btn dropdown popable"> @@ -108,40 +101,26 @@ </div> </div> </div> - <div> - <div class="template-edit-wrapper-label"> - <label>$_("Storage Pool")</label> - </div> - <div class="template-edit-wrapper-controls"> - <div class="btn dropdown popable"> - <input id="template-edit-storagePool" name="storagepool" type="hidden" /> - <span class="text" id="template-edit-storage-label"></span><span class="arrow"></span> - <div class="popover" style="width: 100%"> - <ul class="select-list" id="template-edit-storagePool-list" data-target="template-edit-storagePool" data-label="template-edit-storage-label"> - </ul> - </div> - </div> - </div> + </form> + <form id="form-template-storage"> + <div class="template-tab-header"> + <span class="template-storage-cell">$_("Storage Pool")</span> + <span class="template-storage-cell">$_("Type")</span> + <span class="template-storage-cell">$_("Disk(GB)")</span> + <button type="button" id="template-edit-storage-add-button" class="action-area"></button> </div> - <div> - <div class="template-edit-wrapper-label"> - <label>$_("Network")</label> - </div> - <div class="template-edit-wrapper-controls"> - <ul class="select-list-box" id="template-edit-network-list"> - </ul> - <script id="tmpl-network" type="text/html"> - <li> - <label> - <input name="networks" type="checkbox" value="{name}" /> - <span class="item">{name}</span> - </label> - </li> - </script> - </div> + <div class="template-tab-body"> </div> - </fieldset> - </form> + </form> + <form id="form-template-interface"> + <div class="template-tab-header"> + <span class="template-interface-cell">$_("Network")</span> + <span class="template-interface-cell">$_("Type")</span> + <button type="button" id="template-edit-interface-add-button" class="action-area"></button> + </div> + <div class="template-tab-body"></div> + </form> + </div> </div> <footer> <div class="btn-group"> @@ -152,3 +131,40 @@ <script> kimchi.template_edit_main(); </script> +<script id="template-storage-pool-tmpl" type="text/html"> + <div class='item'> + <span class="template-storage-cell"> + <input class="template-storage-name {viewMode}" value={storageName} readonly=true type="text"/> + <select class="{editMode}"></select> + </span> + <span class="template-storage-cell"> + <input class="template-storage-type" value={storageType} readonly=true type="text" /> + </span> + <span class="template-storage-cell"> + <input class="template-storage-disk" value={storageDisk} type="text" /> + </span> + <span class="action-area {editMode}"> + <button class="save"></button><button class="cancel"></button> + </span> + <span class="action-area {viewMode}"> + <button class="edit"></button><button class="delete"></button> + </span> + </div> +</script> +<script id="template-interface-tmpl" type="text/html"> + <div class="item"> + <span class="template-interface-cell"> + <input class="template-interface-name {viewMode}" readonly="true" type="text" value={network} /> + <select class="{editMode}"></select> + </span> + <span class="template-interface-cell"> + <input value={type} readonly=true type="text" /> + </span> + <span class="action-area {editMode}"> + <button class="save"></button><button class="cancel"></button> + </span> + <span class="action-area {viewMode}"> + <button class="edit"></button><button class="delete"></button> + </span> + </div> +</script> \ No newline at end of file -- 1.7.1

2 4

[v2 1/1] Virtual machine migration
by Simon Jin 13 Nov '14

13 Nov '14

Issue: Migraton SSH authentication, even 2 peers have ssh key exchanged, migration still failed due to failed authentication, first of all, still need passwd input to get a remote libvirt connection second, after that, migration still failed with error: libvirt: QEMU Driver error : 操作失败: Failed to connect to remote libvirt URI qemu+ssh://root@9.115.122.75/system: Cannot recv data: Permission denied, please try again. Permission denied, please try again. Permission denied (publickey,gssapi-keyex,gssapi-with-mic,password).: Connection reset by peer How to test: Apply this patch(did some hack to easy debug) and issue migrate action with: sudo curl -k -u use:password -H "Content-Type: application/json" -H "Accept: application/json" https://localhost:8001/vms/RHEL-7/migrate -X POST -d '{"remoteHost": "9.115.122.75", "user": "root", "passwd": "passwd"}' v2: - use generate_action_handler_task - Fix args in generate_action_handler_task - Remove MigrationError - Put import in alphabetic - Support offline migration Signed-off-by: Simon Jin <simonjin(a)linux.vnet.ibm.com> --- docs/API.md | 4 ++ src/kimchi/control/vms.py | 1 + src/kimchi/i18n.py | 10 ++++ src/kimchi/model/vms.py | 145 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 160 insertions(+) diff --git a/docs/API.md b/docs/API.md index 9c06f85..36e5ab6 100644 --- a/docs/API.md +++ b/docs/API.md @@ -132,6 +132,10 @@ the following general conventions: It emulates the power reset button on a machine. Note that there is a risk of data loss caused by reset without the guest OS shutdown. * connect: Prepare the connection for spice or vnc +* migrate: Migrate a virtual machine to a remote server, only support live mode without block migration. + * remoteHost: IP address or hostname of the remote server. + * user: user of the remote server. + * passwd: passwd of user on remote server. ### Sub-resource: Virtual Machine Screenshot diff --git a/src/kimchi/control/vms.py b/src/kimchi/control/vms.py index 88d8a81..0ab239e 100644 --- a/src/kimchi/control/vms.py +++ b/src/kimchi/control/vms.py @@ -42,6 +42,7 @@ class VM(Resource): for ident, node in sub_nodes.items(): setattr(self, ident, node(model, self.ident)) self.start = self.generate_action_handler('start') + self.migrate = self.generate_action_handler_task('migrate', ['remoteHost', 'user', 'passwd']) self.poweroff = self.generate_action_handler('poweroff') self.shutdown = self.generate_action_handler('shutdown') self.reset = self.generate_action_handler('reset') diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index f789259..6edc595 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -101,6 +101,16 @@ messages = { "KCHVM0030E": _("Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"), "KCHVM0031E": _("The guest console password must be a string."), "KCHVM0032E": _("The life time for the guest console password must be a number."), + "KCHVM0033E": _("Can't migrate to localhost."), + "KCHVM0034E": _("Can't migrate vm %(name)s on Hypervisor arch %(srcarch)s.to a different Hypervisor arch %(destarch)s."), + "KCHVM0035E": _("Can't migrate from %(srchyp)s to a different Hypervisor type %(desthyp)s."), + "KCHVM0037E": _("Can't migrate vm %(name)s,which isn't in running state."), + "KCHVM0038E": _("Can't migrate vm %(name)s, vm has passthrough device %(hostdevs)s."), + "KCHVM0039E": _("Can't migrate vm %(name)s, vm already exist on destination server %(remoteHost)s."), + "KCHVM0040E": _("Failed Migrate vm %(name)s due error: %(err)s"), + "KCHVM0041E": _("Failed resume vm %(name)s from migration recover. Details: %(err)s"), + "KCHVM0042E": _("Failed destory vm %(name)s from migration recover. Details: %(err)s"), + "KCHVM0043E": _("Failed disconnect %(remoteuri)s when finish migrate vm %(name)s. Details: %(err)s"), "KCHVMHDEV0001E": _("VM %(vmid)s does not contain directly assigned host device %(dev_name)s."), "KCHVMHDEV0002E": _("The host device %(dev_name)s is not allowed to directly assign to VM."), diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index f2e4ae3..c6709ca 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -30,16 +30,20 @@ from xml.etree import ElementTree import libvirt from cherrypy.process.plugins import BackgroundTask +from kimchi.utils import add_task from kimchi import vnc from kimchi.config import READONLY_POOL_TYPE from kimchi.exception import InvalidOperation, InvalidParameter +from kimchi.model.libvirtconnection import LibvirtConnection from kimchi.exception import NotFoundError, OperationFailed from kimchi.model.config import CapabilitiesModel from kimchi.model.templates import TemplateModel +from kimchi.model.templates import TemplateModel from kimchi.model.utils import get_vm_name from kimchi.model.utils import get_metadata_node from kimchi.model.utils import set_metadata_node from kimchi.screenshot import VMScreenshot +#from kimchi.model.vmhostdevs import VMHostDevsModel from kimchi.utils import import_class, kimchi_log, run_setfacl_set_attr from kimchi.utils import template_name_from_uri from kimchi.xmlutils.utils import xpath_get_text, xml_item_update @@ -514,6 +518,147 @@ class VMModel(object): except libvirt.libvirtError as e: raise OperationFailed("KCHVM0019E", {'name': name, 'err': e.get_error_message()}) + + def _preCheck(self, name, destConn, remoteHost): + kimchi_log.debug('precheck migrate %s' % name) + + _destConn = destConn.get() + if remoteHost in ['localhost', '127.0.0.1']: + kimchi_log.debug('vm %s is not in running, only running vm can be migrated' % name) + raise OperationFailed("KCHVM00033E", {'name': name, + 'remoteHost': remoteHost}) + + + if self.conn.get().getInfo()[0] != _destConn.getInfo()[0]: + kimchi_log.debug('vm %s can not migrate to different arch server.' % (name, _destConn.getInfo()[0])) + raise OperationFailed("KCHVM00034E", {'name': name, + 'srcarch': self.conn.get().getType(), + 'destarch': _destConn.getType()}) + + if self.conn.get().getType() != _destConn.getType(): + kimchi_log.debug('vm %s can not migrate to a different hypervisor' % name) + raise OperationFailed("KCHVM00035E", {'name': self.name, + 'srchyp':self.conn.get().getType(), + 'desthyp': _destConn.getType()}) + + + #model.host import DOM_STATE_MAP, vmhostdevs import host, + #to void loop import DOM_STATE_MAP, move import VMHostDevsModel here + from kimchi.model.vmhostdevs import VMHostDevsModel + #check if there is any passthrough devices belong to this vm + vmhostdevs = VMHostDevsModel(conn = self.conn) + hostdevs = vmhostdevs.get_list(name) + if hostdevs: + raise OperationFailed("KCHVM00038E", {'name' : name, + 'hostdevs': hostdevs}) + #try: #FIXME + # self.get_vm(name, destConn) + #except NotFoundError as e: + # if e != NotFoundError: + # kimchi_log.debug('migrate vm %s already exist on %s' % (name, destConn.getURI())) + #raise OperationFailed("KCHVM00039E", {'name' : name, + # 'remoteHost': remoteHost}) + + def _getRemoteConn(self, remoteHost, user): + #open destination connect to migrate + transport = 'ssh' + duri = 'qemu+%s://%s@%s/system' % (transport, + user,remoteHost) + + conn = LibvirtConnection(duri) + return conn + + def _preMigrate(self, name): + #can't update VM while in Migration source/destination + kimchi_log.debug('prepare migrate %s' % name) + dom = self.get_vm(name, self.conn) + try: + dom.migrateSetMaxDowntime(0) + except libvirt.libvirtError as e: + print e.message + + def _do_migrate(self, name, destConn, remoteHost, cb): + _destConn = destConn.get() + cb('starting a migration') + kimchi_log.debug('migrate %s start' % name) + #import pdb + #pdb.set_trace() + dom = self.get_vm(name, self.conn) + flag = 0 + flag |= (libvirt.VIR_MIGRATE_PEER2PEER | + libvirt.VIR_MIGRATE_TUNNELLED) + + state = DOM_STATE_MAP[dom.info()[0]] + if state == 'running': + flag |= libvirt.VIR_MIGRATE_LIVE + try: + dom.migrateSetMaxDowntime(0) + except libvirt.libvirtError as e: + print e.message #FIXME + + elif state == 'shutoff': + flag |= libvirt.VIR_MIGRATE_OFFLINE + else: #FIXME any other state will prevend migration ? + kimchi_log.debug('Can not migrate vm %s when its in %s.' % (name, state)) + raise OperationFailed("KCHVM00037E", {'name': self.name}) + + try: + dom.migrate(_destConn, flag, None, None, 0) + except libvirt.libvirtError as e: + kimchi_log.error('migrate %s to %s failed' % (name, + remoteHost)) + self._recover(cb) + raise OperationFailed('KCHPOOL0040E', {'err': e.message, + 'name': name}) + finally: + self._finish(name, destConn, cb) + + def migrate(self, name, remoteHost, user, passwd ): + destconn = self._getRemoteConn(remoteHost, user) + + flag = self._preCheck(name, destconn, remoteHost) + self._preMigrate(name) + def cb(message): + print message + + + self._do_migrate(name, destconn, remoteHost,cb) + + task_id = add_task('/vms/%s/migrate' % name, self._do_migrate, self.objstore, + {'name' : name, 'destconn': destconn, + 'remoteHost': remoteHost}) + + # Record vm migrate task for future querying + try: + with self.objstore as session: + session.store('migrate', name, task_id) + return task_id + except Exception as e: + raise OperationFailed('KCHPOOL0037E', {'err': e.message}) + + def _recover(self, name, destconn, cb): + destvm = self.get_vm(name, destconn) + #recover + cb('recover from a failed migration',False) + kimchi_log.debug('recover from a failed migrate %s' % name) + try: + destvm.destroy() + kimchi_log.error("destory migrate vm on destination server") + except libvirt.libvirtError as e: + raise OperationFailed('KCHPOOL0042E', {'name' : name, + 'err': e.message}) + + def _finish(self, name, destConn, cb): + _destConn = destConn.get() + kimchi_log.debug('finished migrate %s' % name) + try: + _destConn.close() + except libvirt.libvirtError as e: + raise OperationFailed('KCHPOOL0043E', {'name' : name, + 'remoteuri' : _destConn.getURI(), + 'err': e.message}) + finally: + cb('Migrate finished', True) def poweroff(self, name): dom = self.get_vm(name, self.conn) -- 1.8.3.1

3 5

[PATCH V3] Edit Template redefined
by Wen Wang 13 Nov '14

13 Nov '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V2 -> V3: Fix the bug that iscsi and scsi disk size won't change automatically V1 -> V2: 1) Enable "iSCSI" and "SCSI" for storage. 2) Changed the storage tab from "storage" to "Storage". 3) Fix the defect that when editing/adding "Storage" or "Interface" line went down issue. 4) "Storage" and "Interface" content can display properly on Remote and Image created template. 5) Fix the defect that "Image" didn't show properly when using a Image created template. This patch redesigned "Edit Template" diaguage in "Templates". New "Edit Template" will display all the related information into tabs of "General", "Storage" and "Interface". Due to unfinished back-end work, functions are not fully supported, which will be finished in the future work. Temporary disabled functions: 1) Multiple disk operation with multiple storage pools edit in template for which reason the add button in "Storage" tab is disabled. 2) iSCSI and SCSI storage pool add is removed since we are going to allow this kind of operation in the process of creating a VM. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/template-edit.css | 116 +++++++---- ui/js/src/kimchi.template_edit_main.js | 366 +++++++++++++++++++++++--------- ui/pages/template-edit.html.tmpl | 168 ++++++++------- 3 files changed, 434 insertions(+), 216 deletions(-) diff --git a/ui/css/theme-default/template-edit.css b/ui/css/theme-default/template-edit.css index 4975f1b..094e909 100644 --- a/ui/css/theme-default/template-edit.css +++ b/ui/css/theme-default/template-edit.css @@ -17,24 +17,33 @@ */ #template-edit-window { font-size: 13px; - height: 600px; - width: 1000px; + height: 500px; + width: 800px; } -.template-edit-fieldset { - float: left; - padding: 1em; +#edit-template-tabs { + background: none repeat scroll 0 0 transparent; + border: medium none; + height: 100%; + padding: 0; } -.template-edit-wrapper-label, .template-edit-wrapper-controls { +#edit-template-tabs .form-template-inline-wrapper { + display: inline-block; vertical-align: top; - width: 470px; } .template-edit-wrapper-label { - height: 18px; - line-height: 18px; - margin-top: 8px; + vertical-align: top; + min-width: 100px; + height: 35px; + line-height: 35px; + margin: 7px 0 8px; +} + +.template-edit-wrapper-controls { + vertical-align: top; + width: 400px; } .template-edit-wrapper-controls input[type="text"] { @@ -56,7 +65,7 @@ .template-edit-wrapper-controls > .dropdown { margin: 5px 0 0 1px; - width: 440px; + width: 372px; } .template-edit-wrapper-controls input[type="text"][disabled] { @@ -65,41 +74,72 @@ cursor: not-allowed; } -.hidden-area { - display: none; +#edit-template-tabs .template-tab-header { + margin-bottom: 8px; + padding-bottom: 2px; + font-weight: bold; + border-bottom: 1px solid #999999; + overflow: hidden; } -.template-edit-wrapper-controls .select-list-box { - width: 464px; - max-height: 168px; - overflow: auto; - margin-top: 5px; - border: 1px solid #ccc; +#edit-template-tabs .template-tab-header .action-area { + float: right; + height: 20px; + width: 20px; } -.template-edit-wrapper-controls .select-list-box>li>label { - display: block; +#edit-template-tabs .template-interface-cell { + display: inline-block; + width: 250px; } -.template-edit-wrapper-controls .select-list-box>li>label> -input[type="checkbox"] { - display: none; +#edit-template-tabs .template-storage-cell{ + display: inline-block; + width: 230px; +} + +#edit-template-tabs .template-storage-cell label { + height: 25px; + padding: 2px; + border: 1px; } -.template-edit-wrapper-controls .select-list-box>li>label>.item { - display: block; - height: 41px; - line-height: 41px; - padding: 0 20px 0 40px; - border-bottom: 1px solid #ccc; - box-shadow: 0px 1px 1px #fff; - text-shadow: -1px -1px 1px #ddd, 1px 1px 1px #fff; - color: #222; - font-size: 12px; +#form-template-storage .template-tab-body select { + width: 140px; } -.template-edit-wrapper-controls .select-list-box>li>label> -input[type="checkbox"]:CHECKED+.item { - background: #f8f8f8 url(../images/theme-default/check-green.png) no-repeat - 10px center; +#form-template-storage .template-tab-body input { + width: 56px; + height: 17px; } + +#form-template-storage .template-tab-body .template-storage-name { + width: 220px; +} + +#edit-template-tabs .template-tab-body input[readonly] { + background: none repeat scroll 0 0 rgba(0, 0, 0, 0); + border-color: transparent; + text-overflow: ellipsis; +} + +#edit-template-tabs .template-tab-body .item { + height: 25px; +} + +#form-template-interface .template-tab-body select { + width: 180px; +} + +#edit-template-tabs .template-tab-body .action-area { + float: right; +} + +#edit-template-tabs .template-tab-body .action-area button { + width: 20px; + height: 20px; +} + +#edit-template-tabs .hide { + display: none; +} \ No newline at end of file diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index 2f4cc9a..5073c62 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -16,19 +16,23 @@ * limitations under the License. */ kimchi.template_edit_main = function() { - var templateEditForm = $('#form-template-edit'); + var templateEditMain = $('#edit-template-tabs'); var origDisks; var origPool; + var origNetworks; var templateDiskSize; - $('#template-name', templateEditForm).val(kimchi.selectedTemplate); - kimchi.retrieveTemplate(kimchi.selectedTemplate, function(template) { + $('#template-name', templateEditMain).val(kimchi.selectedTemplate); + templateEditMain.tabs(); + + var initTemplate = function(template) { origDisks = template.disks; origPool = template.storagepool; + origNetworks = template.networks; for(var i=0;i<template.disks.length;i++){ if(template.disks[i].base){ template["vm-image"] = template.disks[i].base; - $('#templ-edit-cdrom').addClass('hide-content'); - $('#templ-edit-vm-image').removeClass('hide-content'); + $('.templ-edit-cdrom').addClass('hide'); + $('.templ-edit-vm-image').removeClass('hide'); break; } } @@ -37,18 +41,12 @@ kimchi.template_edit_main = function() { if (prop == 'graphics') { value = value["type"]; } - $('input[name="' + prop + '"]', templateEditForm).val(value); - } - var disks = template.disks; - $('input[name="disks"]').val(disks[0].size); - templateDiskSize = $('input[name="disks"]').val(); - if (disks[0].volume) { - var spool_value = $('#form-template-edit [name="storagepool"]').val(); - $('input[name="storagepool"]', templateEditForm).val(spool_value + '/' + disks[0].volume); - $('input[name="disks"]', templateEditForm).attr('disabled','disabled'); + $('input[name="' + prop + '"]', templateEditMain).val(value); } var vncOpt = [{label: 'VNC', value: 'vnc'}]; + $('#template-edit-graphics').append('<option selected>VNC</option>'); + $('#template-edit-graphics').append('<option>Spice</option>'); kimchi.select('template-edit-graphics-list', vncOpt); var enableSpice = function() { if (kimchi.capabilities == undefined) { @@ -61,119 +59,283 @@ kimchi.template_edit_main = function() { } }; enableSpice(); - - var scsipools = {}; - kimchi.listStoragePools(function(result) { - var options = []; - if (result && result.length) { - $.each(result, function(index, storagePool) { - if ((storagePool.state=="active") && (storagePool.type !== 'kimchi-iso')) { - if ((storagePool.type == 'iscsi') || (storagePool.type == 'scsi')){ - scsipools[storagePool.name] = []; - kimchi.listStorageVolumes(storagePool.name, function(result) { - if (result && result.length) { - $.each(result, function(index, storageVolume) { - options.push({ - label: storagePool.name + '/' + storageVolume.name, - value: '/storagepools/' + storagePool.name + '/' + storageVolume.name - }); - scsipools[storagePool.name].push(storageVolume) - }); - } - kimchi.select('template-edit-storagePool-list', options); - }); - } - else { - options.push({ - label: storagePool.name, - value: '/storagepools/' + storagePool.name - }); - } + var initStorage = function(result) { + var scsipools = {}; + var addStorageItem = function(storageData) { + var thisName; + var thisType; + var thisDisk; + var nodeStorage = $.parseHTML(kimchi.substitute($('#template-storage-pool-tmpl').html(), storageData)); + $('.template-tab-body', '#form-template-storage').append(nodeStorage); + $('.edit', '#form-template-storage').button({ + icons : {primary : 'ui-icon-pencil'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + var storageItem = $(this).parent().parent(); + thisName = $('.template-storage-name', storageItem).val(); + thisType = $('.template-storage-type', storageItem).val(); + thisDisk = $('.template-storage-disk', storageItem).val(); + $('.template-storage-name', storageItem).hide(); + $('.template-storage-disk', storageItem).attr('readonly', false); + if (thisType === 'iscsi' || thisType === 'scsi') { + $('.template-storage-disk', storageItem).attr('readonly', true); + } else { + $('.template-storage-disk', storageItem).attr('readonly', false); } + $('.save', storageItem).parent().show(); + $('.delete', storageItem).parent().hide(); + var selectedStorage = $('select', storageItem).val(); + $('.template-storage-name', storageItem).val(selectedStorage).hide(); + $('select', storageItem).val(thisName).show(); }); - } - if ($.isEmptyObject(scsipools)) { - kimchi.select('template-edit-storagePool-list', options); - } - }); - kimchi.listNetworks(function(result) { - if(result && result.length > 0) { - var html = ''; - var tmpl = $('#tmpl-network').html(); - $.each(result, function(index, network) { - if (result[index].state === 'active') - html += kimchi.substitute(tmpl, network); + $('.delete', '#form-template-storage').button({ + icons : {primary : 'ui-icon-trash'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + $(this).parent().parent().remove(); + }); + $('.cancel', '#form-template-storage').button({ + icons : {primary : 'ui-icon-arrowreturnthick-1-w'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + var cancelEntity = $(this).parent().parent(); + if ($('.template-storage-name', cancelEntity).val() === 'null') { + cancelEntity.remove(); + } else { + $('select', cancelEntity).hide(); + $('.template-storage-name', cancelEntity).val(thisName).attr('readonly', true).show(); + $('.template-storage-type', cancelEntity).val(thisType).attr('readonly', true); + $('.template-storage-disk', cancelEntity).val(thisDisk).attr('readonly', true); + $('.save', cancelEntity).parent().hide(); + $('.edit', cancelEntity).parent().show(); + } + }); + $('.save', '#form-template-storage').button({ + icons : {primary : 'ui-icon-disk'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + var storageItem = $(this).parent().parent(); + $('.save', storageItem).parent().hide(); + $('.delete', storageItem).parent().show(); + var selectedStorage = $('select', storageItem).val(); + $('.template-storage-name', storageItem).val(selectedStorage).attr('readonly', true).show(); + $('.template-storage-disk', storageItem).attr('readonly', true); + $('.template-storage-type', storageItem).attr('readonly', true); + $('select', storageItem).hide(); }); - $('#template-edit-network-list').html(html).show(); - if(template.networks && template.networks.length > 0) { - $('input[name="networks"]', templateEditForm).each(function(index, element) { - var value = $(element).val(); - if(template.networks.indexOf(value) >= 0) { - $(element).prop('checked', true); + var storageOptions = ''; + var scsiOptions = ''; + $('select', '#form-template-storage').find('option').remove(); + $.each(result, function(index, storageEntities) { + if((storageEntities.state === 'active') && (storageEntities.type != 'kimchi-iso')) { + if(storageEntities.type === 'iscsi' || storageEntities.type === 'scsi') { + kimchi.listStorageVolumes(storageEntities.name, function(currentVolume) { + $.each(currentVolume, function(indexSCSI, scsiEntities) { + scsiOptions += '<option>' + storageEntities.name + '/' + scsiEntities.name + '</option>'; + }); + $('select', '#form-template-storage').append(scsiOptions); + }, function() {}); + } else { + var isSlected = storageEntities.name === 'default' ? ' selected' : ''; + storageOptions += '<option' + isSlected + '>' + storageEntities.name + '</option>'; + } + } + }); + $('select', '#form-template-storage').append(storageOptions); + $('select', '#form-template-storage').change(function() { + var selectedItem = $(this).parent().parent(); + var tempStorageName = $(this).val(); + var tempType; + tempStorageName =tempStorageName.split('/')[0]; + var scsiCap; + $.each(result, function(index, storageEntities) { + if (tempStorageName === storageEntities.name) { + selectedItem.find('.template-storage-type').val(storageEntities.type); + scsiCap = storageEntities.capacity / Math.pow(1024, 3); + tempType = storageEntities.type; } }); + if (tempType === 'iscsi' || tempType === 'scsi') { + $('.template-storage-disk', selectedItem).attr('readonly', true).val(scsiCap); + } else { + $('.template-storage-disk', selectedItem).attr('readonly', false).val('10'); + } + }); + }; + + if ((origDisks && origDisks.length) && (origPool && origPool.length)) { + splitPool = origPool.split('/'); + var defaultPool; + var defaultType; + $.each(result, function(index, poolEntities) { + if (poolEntities.name === splitPool[splitPool.length-1]) { + defaultType = poolEntities.type; + defaultPool = splitPool[splitPool.length-1] + } + }); + if (origDisks[0]['volume']) { + defaultPool = defaultPool + '/' + origDisks[0]['volume']; } - } else { - $('#template-edit-network-list').hide(); + $.each(origDisks, function(index, diskEntities) { + var storageNodeData = { + viewMode : '', + editMode : 'hide', + storageName : defaultPool, + storageType : defaultType, + storageDisk : diskEntities.size + } + addStorageItem(storageNodeData); + }); + $('.template-storage-disk').attr('readonly', true); } - }); - }); - $('#template-edit-storagePool').change(function() { - storagepool = $(this).val(); - var storageArray = storagepool.split("/"); - if (storageArray.length > 3) { - volumeName = storageArray.pop(); - poolName = storageArray.pop(); - kimchi.getStoragePoolVolume(poolName, volumeName, function(result) { - $('input[name="disks"]', templateEditForm).val(result.capacity / Math.pow(1024,3)); - $('input[name="disks"]', templateEditForm).attr('disabled','disabled'); - return false; - }, function (err) { - kimchi.message.error(err.responseJSON.reason); + $('#template-edit-storage-add-button').button({ + icons: { + primary: "ui-icon-plusthick" + }, + text: false, + disabled: true + }).click(function(event) { + event.preventDefault(); + var storageNodeData = { + viewMode : 'hide', + editMode : '', + storageName : 'null', + storageType : 'dir', + storageDisk : '10' + } + addStorageItem(storageNodeData); }); - } else { - $('input[name="disks"]', templateEditForm).removeAttr('disabled'); - $('input[name="disks"]', templateEditForm).val(templateDiskSize); - } - }); - $('input[name="disks"]', templateEditForm).keyup(function() { - templateDiskSize = $('input[name="disks"]', templateEditForm).val(); - }); + }; + var initInterface = function(result) { + var addInterfaceItem = function(networkData) { + var nodeInterface = $.parseHTML(kimchi.substitute($('#template-interface-tmpl').html(), networkData)); + $('.template-tab-body', '#form-template-interface').append(nodeInterface); + $('.edit', '#form-template-interface').button({ + icons : {primary : 'ui-icon-pencil'}, + text : false, + disabled : true + }); + $('.delete', '#form-template-interface').button({ + icons : {primary : 'ui-icon-trash'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + $(this).parent().parent().remove(); + }); + $('.cancel', '#form-template-interface').button({ + icons : {primary : 'ui-icon-arrowreturnthick-1-w'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + $(this).parent().parent().remove(); + }); + $('.save', '#form-template-interface').button({ + icons : {primary : 'ui-icon-disk'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + var interItem = $(this).parent().parent(); + $('.save', interItem).parent().hide(); + $('.delete', interItem).parent().show(); + var selectedInterface = $('select', interItem).val(); + $('.template-interface-name', interItem).val(selectedInterface).show(); + $('select', interItem).hide(); + }); + var networkOptions = ''; + for(var i=0;i<result.length;i++){ + if(result[i].state === "active") { + var isSlected = i==0 ? ' selected' : ''; + networkOptions += '<option' + isSlected + '>' + result[i].name + '</option>'; + } + } + $('select', '#form-template-interface').find('option').remove(); + $('select', '#form-template-interface').append(networkOptions); + }; + if(result && result.length > 0) { + $.each(result, function(index, data) { + if($.inArray(data.name, origNetworks) > -1) { + addInterfaceItem({ + mac : '', + network : data.name, + type : 'network', + viewMode : '', + editMode : 'hide' + }); + } + }); + } + $('#template-edit-interface-add-button').button({ + icons: { + primary: 'ui-icon-plusthick' + }, + text: false + }).click(function(evt) { + evt.preventDefault(); + addInterfaceItem({ + mac : '', + network : '', + type : 'network', + viewMode : 'hide', + editMode : '' + }); + }); + }; + kimchi.listNetworks(initInterface); + kimchi.listStoragePools(initStorage); + }; + kimchi.retrieveTemplate(kimchi.selectedTemplate, initTemplate); + $('#tmpl-edit-button-save').on('click', function() { - var editableFields = [ 'name', 'cpus', 'memory', 'storagepool', 'disks', 'graphics']; + var editableFields = [ 'name', 'cpus', 'memory', 'disks', 'graphics']; var data = {}; + //Fix me: Only support one storage pool now + var storages = $('.template-tab-body .item', '#form-template-storage'); + var tempName = $('.template-storage-name', storages).val(); + tempName = tempName.split('/'); + var tempNameHead =tempName[0]; + var tempNameTail = tempNameHead; + if(tempNameHead === 'iscsi' || tempNameHead =='scsi') { + tempNameTail = tempName[tempName.length-1]; + } + tempName = '/storagepools/' + tempNameHead; + data['storagepool'] = tempName; $.each(editableFields, function(i, field) { /* Support only 1 disk at this moment */ if (field == 'disks') { - origDisks[0].size = Number($('#form-template-edit [name="' + field + '"]').val()); + var tmpItem = $('#form-template-storage .item'); + origDisks[0].size = Number($('.template-storage-disk', tmpItem).val()); + if($('.template-storage-type', tmpItem).val() === 'iscsi' || $('.template-storage-type', tmpItem).val() =='scsi') { + origDisks[0]['volume'] = tempNameTail; + } else { + origDisks[0]['volume'] && delete origDisks[0]['volume']; + } data[field] = origDisks; } else if (field == 'graphics') { - var type = $('#form-template-edit [name="' + field + '"]').val(); + var type = $('#form-template-general [name="' + field + '"]').val(); data[field] = {'type': type}; } else { - data[field] = $('#form-template-edit [name="' + field + '"]').val(); + data[field] = $('#form-template-general [name="' + field + '"]').val(); } }); data['memory'] = Number(data['memory']); data['cpus'] = Number(data['cpus']); - storagepool = data['storagepool']; - storageArray = storagepool.split("/"); - if (storageArray.length > 3){ - /* Support only 1 disk at this moment */ - data["disks"][0].volume = storageArray.pop(); - data['storagepool'] = storageArray.join("/"); - } else if (data["disks"][0].volume) { - delete data["disks"][0].volume; - } - var networks = templateEditForm.serializeObject().networks; - if (networks instanceof Array) { - data.networks = networks; - } else if (networks != null) { - data.networks = [networks]; + var networks = $('.template-tab-body .item', '#form-template-interface'); + var networkForUpdate = new Array(); + $.each(networks, function(index, networkEntities) { + networkForUpdate.push($('.template-interface-name', networkEntities).val()); + }); + if (networkForUpdate instanceof Array) { + data.networks = networkForUpdate; + } else if (networkForUpdate != null) { + data.networks = [networkForUpdate]; } else { data.networks = []; } diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 5a71d91..018ac10 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -28,74 +28,67 @@ <div class="close">X</div> </header> <div class="content"> - <form id="form-template-edit"> + <div id="edit-template-tabs"> <input type="hidden" id="template-name" name="templateName" /> - <fieldset class="template-edit-fieldset"> - <div> + <ul> + <li> + <a href="#form-template-general">$_("General")</a> + </li> + <li> + <a href="#form-template-storage">$_("Storage")</a> + </li> + <li> + <a href="#form-template-interface">$_("Interface")</a> + </li> + </ul> + <form id="form-template-general"> + <div class="form-template-inline-wrapper"> <div class="template-edit-wrapper-label"> <label for="template-edit-id-textbox">$_("Name")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-id-textbox" name="name" type="text" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-vendor-textbox">$_("Vendor")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-vendor-textbox" name="os_distro" type="text" disabled="disabled" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-version-textbox">$_("Version")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-version-textbox" name="os_version" type="text" disabled="disabled" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-cpu-textbox">$_("CPU Number")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-cpu-textbox" name="cpus" type="text" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-memory-textbox">$_("Memory (MB)")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-memory-textbox" name="memory" type="text" /> + <div class="template-edit-wrapper-label templ-edit-cdrom"> + <label for="template-edit-cdrom-textbox">$_("CDROM")</label> + </div> + <div class="template-edit-wrapper-label templ-edit-vm-image hide"> + <label for="template-edit-vmimage-textbox">$_("Image File")</label> </div> - </div> - <div> <div class="template-edit-wrapper-label"> - <label for="template-edit-disk-textbox">$_("Disk (GB)")</label> + <label>$_("Graphics")</label> </div> + </div> + <div class="form-template-inline-wrapper"> <div class="template-edit-wrapper-controls"> - <input id="template-edit-disk-textbox" name="disks" type="text" /> + <input id="template-edit-id-textbox" name="name" type="text" /> </div> - </div> - </fieldset> - <fieldset class="template-edit-fieldset"> - <div id="templ-edit-cdrom"> - <div class="template-edit-wrapper-label"> - <label for="template-edit-cdrom-textbox">$_("CDROM")</label> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-vendor-textbox" name="os_distro" type="text" disabled="disabled" /> </div> <div class="template-edit-wrapper-controls"> - <input id="template-edit-cdrom-textbox" name="cdrom" type="text" disabled="disabled"/> + <input id="template-edit-version-textbox" name="os_version" type="text" disabled="disabled" /> </div> - </div> - <div id="templ-edit-vm-image" class="hide-content"> - <div class="template-edit-wrapper-label">$_("Image File")</div> - <div class="template-edit-wrapper-controls"><input name="vm-image" type="text" disabled/></div> - </div> - <div> - <div class="template-edit-wrapper-label"> - <label>$_("Graphics")</label> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-cpu-textbox" name="cpus" type="text" /> + </div> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-memory-textbox" name="memory" type="text" /> + </div> + <div class="template-edit-wrapper-controls templ-edit-cdrom"> + <input id="template-edit-cdrom-textbox" name="cdrom" type="text" disabled="disabled" /> + </div> + <div class="template-edit-wrapper-controls templ-edit-vm-image hide"> + <input id="template-edit-vmimage-textbox" name="vm-image" type="text" disabled="disabled" /> </div> <div class="template-edit-wrapper-controls"> <div class="btn dropdown popable"> @@ -108,40 +101,26 @@ </div> </div> </div> - <div> - <div class="template-edit-wrapper-label"> - <label>$_("Storage Pool")</label> - </div> - <div class="template-edit-wrapper-controls"> - <div class="btn dropdown popable"> - <input id="template-edit-storagePool" name="storagepool" type="hidden" /> - <span class="text" id="template-edit-storage-label"></span><span class="arrow"></span> - <div class="popover" style="width: 100%"> - <ul class="select-list" id="template-edit-storagePool-list" data-target="template-edit-storagePool" data-label="template-edit-storage-label"> - </ul> - </div> - </div> - </div> + </form> + <form id="form-template-storage"> + <div class="template-tab-header"> + <span class="template-storage-cell">$_("Storage Pool")</span> + <span class="template-storage-cell">$_("Type")</span> + <span class="template-storage-cell">$_("Disk(GB)")</span> + <button type="button" id="template-edit-storage-add-button" class="action-area"></button> </div> - <div> - <div class="template-edit-wrapper-label"> - <label>$_("Network")</label> - </div> - <div class="template-edit-wrapper-controls"> - <ul class="select-list-box" id="template-edit-network-list"> - </ul> - <script id="tmpl-network" type="text/html"> - <li> - <label> - <input name="networks" type="checkbox" value="{name}" /> - <span class="item">{name}</span> - </label> - </li> - </script> - </div> + <div class="template-tab-body"> </div> - </fieldset> - </form> + </form> + <form id="form-template-interface"> + <div class="template-tab-header"> + <span class="template-interface-cell">$_("Network")</span> + <span class="template-interface-cell">$_("Type")</span> + <button type="button" id="template-edit-interface-add-button" class="action-area"></button> + </div> + <div class="template-tab-body"></div> + </form> + </div> </div> <footer> <div class="btn-group"> @@ -152,3 +131,40 @@ <script> kimchi.template_edit_main(); </script> +<script id="template-storage-pool-tmpl" type="text/html"> + <div class='item'> + <span class="template-storage-cell"> + <input class="template-storage-name {viewMode}" value={storageName} readonly=true type="text"/> + <select class="{editMode}"></select> + </span> + <span class="template-storage-cell"> + <input class="template-storage-type" value={storageType} readonly=true type="text" /> + </span> + <span class="template-storage-cell"> + <input class="template-storage-disk" value={storageDisk} type="text" /> + </span> + <span class="action-area {editMode}"> + <button class="save"></button><button class="cancel"></button> + </span> + <span class="action-area {viewMode}"> + <button class="edit"></button><button class="delete"></button> + </span> + </div> +</script> +<script id="template-interface-tmpl" type="text/html"> + <div class="item"> + <span class="template-interface-cell"> + <input class="template-interface-name {viewMode}" readonly="true" type="text" value={network} /> + <select class="{editMode}"></select> + </span> + <span class="template-interface-cell"> + <input value={type} readonly=true type="text" /> + </span> + <span class="action-area {editMode}"> + <button class="save"></button><button class="cancel"></button> + </span> + <span class="action-area {viewMode}"> + <button class="edit"></button><button class="delete"></button> + </span> + </div> +</script> \ No newline at end of file -- 1.7.1

2 1

[PATCH] Enable storage volume upload
by Aline Manera 12 Nov '14

12 Nov '14

This patch enables storage volume upload and close the upload dialog right before send the POST request. It is needed to improve the user usability as the POST request takes around 5 minutes to be sent for an ISO ~1G. So before send the POST request, the upload file name is saved in a cookie according to its pool to be used later to update the UI. When listing the storage volumes, the cookie will be read to retrieve those storage volumes and create a fake entry on UI (in a similar way we did for on going tasks). That way the POST request will be sent in background and do not block user on the Storage tab. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storage_main.js | 40 +++++++++++++++++-------- ui/js/src/kimchi.storagepool_add_volume_main.js | 20 ++++++++++++- ui/pages/storagepool-add-volume.html.tmpl | 4 +-- 3 files changed, 48 insertions(+), 16 deletions(-) diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index 9a45b65..1659351 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -233,21 +233,29 @@ kimchi.doListVolumes = function(poolObj) { var listHtml = ''; var ongoingVolumes = []; var ongoingVolumesMap = getOngoingVolumes(); + var volume = { + poolName: poolName, + ref_cnt: 0, + capacity: 0, + format: '', + bootable: null, + os_distro: '', + allocation: 0, + os_version: '', + path: '', + type: 'file' + }; + + onholdVolumes = JSON.parse(kimchi.cookie.get('uploadVolumes') || '{}') + onholdVolumes = onholdVolumes[poolName] || [] + $.each(onholdVolumes, function(index) { + volume.name = onholdVolumes[index] + listHtml += kimchi._generateVolumeHTML(volume); + }); + $.each(ongoingVolumesMap, function(volumeName, task) { ongoingVolumes.push(volumeName) - var volume = { - poolName: poolName, - ref_cnt: 0, - capacity: 0, - name: volumeName, - format: '', - bootable: null, - os_distro: '', - allocation: 0, - os_version: '', - path: '', - type: 'file' - }; + volume.name = volumeName listHtml += kimchi._generateVolumeHTML(volume); }); @@ -264,6 +272,12 @@ kimchi.doListVolumes = function(poolObj) { volumeDiv.html("<div class='pool-empty'>" + i18n['KCHPOOL6002M'] + "</div>"); } + $.each(onholdVolumes, function(index) { + volumeBox = $('#volume' + poolName + ' [data-volume-name="' + onholdVolumes[index] + '"]'); + $('.volume-progress', volumeBox).removeClass('hidden'); + $('.progress-status', volumeBox).text(i18n['KCHPOOL6014M']); + }); + $.each(ongoingVolumesMap, function(volumeName, task) { kimchi.topic('kimchi/volumeTransferProgress').publish(task); }); diff --git a/ui/js/src/kimchi.storagepool_add_volume_main.js b/ui/js/src/kimchi.storagepool_add_volume_main.js index 590ccde..73877a2 100644 --- a/ui/js/src/kimchi.storagepool_add_volume_main.js +++ b/ui/js/src/kimchi.storagepool_add_volume_main.js @@ -84,11 +84,29 @@ kimchi.sp_add_volume_main = function() { var fd = new FormData(); fd.append('name', fileName); fd.append('file', blobFile); + + + volName = $('#volume-input-file').val() + uploadVolumes = JSON.parse(kimchi.cookie.get('uploadVolumes') || '{}'); + vols = uploadVolumes[kimchi.selectedSP] || []; + vols.push(volName); + uploadVolumes[kimchi.selectedSP] = vols; + kimchi.cookie.set('uploadVolumes', JSON.stringify(uploadVolumes)); + + kimchi.topic('kimchi/storageVolumeAdded').publish(); + kimchi.window.close(); + kimchi.uploadVolumeToSP({ sp: kimchi.selectedSP, formData: fd }, function(result) { - kimchi.window.close(); + uploadVolumes = JSON.parse(kimchi.cookie.get('uploadVolumes') || '{}'); + vols = uploadVolumes[kimchi.selectedSP] || []; + vols = jQuery.grep(vols, function(name) { + return name !== volName; + }); + uploadVolumes[kimchi.selectedSP] = vols; + kimchi.cookie.set('uploadVolumes', JSON.stringify(uploadVolumes)); kimchi.topic('kimchi/storageVolumeAdded').publish(); }, onError); }; diff --git a/ui/pages/storagepool-add-volume.html.tmpl b/ui/pages/storagepool-add-volume.html.tmpl index 573a764..0927948 100644 --- a/ui/pages/storagepool-add-volume.html.tmpl +++ b/ui/pages/storagepool-add-volume.html.tmpl @@ -47,14 +47,14 @@ </div> <div class="form-section"> <h2> - <input type="radio" id="volume-type-upload" class="volume-type" name="volumeType" value="upload" disabled/> + <input type="radio" id="volume-type-upload" class="volume-type" name="volumeType" value="upload"/> <label for="volume-type-upload"> $_("Upload an file") </label> </h2> <div class="field"> <p class="text-help"> - $_("Choose the ISO file (with .iso suffix) you want to upload.") + $_("Choose the file you want to upload.") </p> <div class="textbox-wrapper"> <input type="file" class="volume-input upload" id="volume-input-file" name="volumeLocalFile" disabled="disabled" /> -- 1.9.3

1 0

[PATCH v3]
by Christy Perez 12 Nov '14

12 Nov '14

This patchset is a better functioning, but not final, version of the topology logic. Aline asked that I send another version with details for the UI will interact with the cpu_info API. The flow will be: - GET /host/cpu_info: curl -k -u user -H 'Content-Type: application/json' \ -H 'Accept: application/json' https://localhost:8001/host/cpuinfo { "cores":2, "threading_enabled":true, "sockets":1, "threads_per_core":2 } Note: I removed the cores_online and cores_present, and changed it to just cores. I think the other was too much info. - Based on that information, plus the host arch, the UI can display - If host arch is Power: - Display a menu labled SMT, with up to four check-boxes. The check-boxes will be labeled SMT1, SMT2, SMT4, and SMT8. The max SMT value displayed will be dependant upon threads_per_core from above. The default checkbox should be the greatest SMT value (e.g. SMT8). - Display the same box for CPUs as before. I had initially thought about having a drop-down for CPUs instead of the empty field, (with only legal vCPU amounts, like 1,2,4,8, etc.), but that will get complicated with different types of processors, and also be too tedious to use. So, unless someone objects, I think the next best thing to do, is just slightly adjust the number of vCPUs the user asked for in order to make sure that the number is a legal number to use with a topology (since vCPUS must equal sockets * cores * threads). Note: See below return from get_rec_topology. If different than what the user entered, this new vcpus should replace the number entered by the user. If some kind of effect could be shown when it's changed, that might be helpful. - Else: - Display a menu labeled Hyper-Threading, with only a checkbox labeled HT. Note: The same comments for vCPUS as above apply here. The number maybe need to change based on the CPU capabilities. - The user's selections from those fields is sent to the get_rec_topology method, which will then return two values: {'topology': {'sockets': sockets, 'cores': cores, 'threads': threads}, 'vcpus': best_vcpus} These values can then be used to create the template: curl -k -u user -X POST -H 'Content-Typ: application/json' -H 'Accept: application/json' \ https://localhost:8001/templates -d'{"name": "test_topo", "cdrom": "/isos/DVD_name.iso", \ "cpus":4, "cpu_info": {"topology": {"sockets": 1, "cores": 2, "threads":2}}}' What doesn't work right now: - Some error messages still need to be created. - API doc needs to be added. Christy Perez (1): Parts to allow Kimchi to configure the cpu topology. docs/API.md | 2 + src/kimchi/API.json | 6 ++ src/kimchi/control/cpuinfo.py | 37 +++++++++ src/kimchi/control/host.py | 2 + src/kimchi/i18n.py | 2 + src/kimchi/model/cpuinfo.py | 175 ++++++++++++++++++++++++++++++++++++++++++ src/kimchi/model/host.py | 1 + src/kimchi/model/templates.py | 16 +++- 8 files changed, 240 insertions(+), 1 deletion(-) create mode 100644 src/kimchi/control/cpuinfo.py create mode 100644 src/kimchi/model/cpuinfo.py -- 1.9.3

1 2

[PATCH v3] Auto Topology for Guest Templates
by Christy Perez 12 Nov '14

12 Nov '14

This patchset is a better functioning, but not final, version of the topology logic. Aline asked that I send another version with details for the UI will interact with the cpu_info API. The flow will be: - GET /host/cpu_info: curl -k -u user -H 'Content-Type: application/json' \ -H 'Accept: application/json' https://localhost:8001/host/cpuinfo { "cores":2, "threading_enabled":true, "sockets":1, "threads_per_core":2 } Note: I removed the cores_online and cores_present, and changed it to just cores. I think the other was too much info. - Based on that information, plus the host arch, the UI can display - If host arch is Power: - Display a menu labled SMT, with up to four check-boxes. The check-boxes will be labeled SMT1, SMT2, SMT4, and SMT8. The max SMT value displayed will be dependant upon threads_per_core from above. The default checkbox should be the greatest SMT value (e.g. SMT8). - Display the same box for CPUs as before. I had initially thought about having a drop-down for CPUs instead of the empty field, (with only legal vCPU amounts, like 1,2,4,8, etc.), but that will get complicated with different types of processors, and also be too tedious to use. So, unless someone objects, I think the next best thing to do, is just slightly adjust the number of vCPUs the user asked for in order to make sure that the number is a legal number to use with a topology (since vCPUS must equal sockets * cores * threads). Note: See below return from get_rec_topology. If different than what the user entered, this new vcpus should replace the number entered by the user. If some kind of effect could be shown when it's changed, that might be helpful. - Else: - Display a menu labeled Hyper-Threading, with only a checkbox labeled HT. Note: The same comments for vCPUS as above apply here. The number maybe need to change based on the CPU capabilities. - The user's selections from those fields is sent to the get_rec_topology method, which will then return two values: {'topology': {'sockets': sockets, 'cores': cores, 'threads': threads}, 'vcpus': best_vcpus} These values can then be used to create the template: curl -k -u user -X POST -H 'Content-Typ: application/json' -H 'Accept: application/json' \ https://localhost:8001/templates -d'{"name": "test_topo", "cdrom": "/isos/DVD_name.iso", \ "cpus":4, "cpu_info": {"topology": {"sockets": 1, "cores": 2, "threads":2}}}' What doesn't work right now: - Some error messages still need to be created. - API doc needs to be added. Christy Perez (1): Parts to allow Kimchi to configure the cpu topology. docs/API.md | 2 + src/kimchi/API.json | 6 ++ src/kimchi/control/cpuinfo.py | 37 +++++++++ src/kimchi/control/host.py | 2 + src/kimchi/i18n.py | 2 + src/kimchi/model/cpuinfo.py | 175 ++++++++++++++++++++++++++++++++++++++++++ src/kimchi/model/host.py | 1 + src/kimchi/model/templates.py | 16 +++- 8 files changed, 240 insertions(+), 1 deletion(-) create mode 100644 src/kimchi/control/cpuinfo.py create mode 100644 src/kimchi/model/cpuinfo.py -- 1.9.3

1 1

[PATCH 00/10] Add snapshot support
by Crístian Viana 12 Nov '14

12 Nov '14

Crístian Viana (10): Update clone test snapshot: Create domain snapshots snapshot: Lookup a domain snapshot snapshot: List domain snapshots snapshot: Delete a domain snapshot snapshot: Lookup current snapshot on a domain snapshot: Revert a domain to a snapshot snapshot: Add model tests snapshot: Delete snapshots when deleting a VM snapshot: Clone snapshots when cloning a VM docs/API.md | 30 ++++++ src/kimchi/control/vm/snapshots.py | 58 +++++++++++ src/kimchi/i18n.py | 10 ++ src/kimchi/mockmodel.py | 94 ++++++++++++++++++ src/kimchi/model/vms.py | 47 ++++++++- src/kimchi/model/vmsnapshots.py | 192 +++++++++++++++++++++++++++++++++++++ tests/test_model.py | 74 +++++++++++++- tests/test_rest.py | 100 +++++++++++++++++++ 8 files changed, 603 insertions(+), 2 deletions(-) create mode 100644 src/kimchi/control/vm/snapshots.py create mode 100644 src/kimchi/model/vmsnapshots.py -- 1.9.3

2 14

[PATCH] Issue #473: Update selectMenu method to set a default value.
by Paulo Vital 12 Nov '14

12 Nov '14

On all pages with selectMenu (combobox) the user had to choose an option to effectively store its value in the form. This patch updates the function to use the first option as default value. With this patch, user can skip the combo selection if want use the first option. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- ui/js/widgets/select-menu.js | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/js/widgets/select-menu.js b/ui/js/widgets/select-menu.js index c4b0209..4a79605 100644 --- a/ui/js/widgets/select-menu.js +++ b/ui/js/widgets/select-menu.js @@ -46,6 +46,7 @@ if(option.value === value) { item.addClass(selectedClass); that.label.text(option.label); + that.target.val(option.value); } that.listControl.append(item); }); -- 1.9.3

3 2

[PATCH v4] Keep disk ref_counts accurate
by Christy Perez 12 Nov '14

12 Nov '14

v1 : Change the way storage is represented (as volumes). v1->v2: - Royce pointed out that the concept of a volume was a new feature to libvirt, and after some investigation I found that this would break kimchi on RHEL 6. - I changed from using the pool:vol label to identify storage to using the path alone. This will make it easier to track disks not in pools. v2->v3: - Rebase and fixed conflicts - Add ref_cnt checking on update. This problem was found by the model test that ejects a CD ROM, leaving a blank 'path' element in the XML. - Resolve issue with circular include of [s,g]et_ref_cnt functions in both vmstorages.py and storagevolumes.py by creating a new diskutils module. v3->v4: - Remove unused lookup_by_path() method Christy Perez (1): Prevent disks from being added twice src/kimchi/model/diskutils.py | 75 ++++++++++++++++++++++++++++++++++++++ src/kimchi/model/storagevolumes.py | 38 +++---------------- src/kimchi/model/vmstorages.py | 70 +++++++++++++++++++++++++++++++---- 3 files changed, 143 insertions(+), 40 deletions(-) create mode 100644 src/kimchi/model/diskutils.py -- 1.9.3

2 2

[PATCH] Delete ui/js/modernizr.custom.2.6.2.min.js
by Aline Manera 12 Nov '14

12 Nov '14

This file is not in use by Kimchi. So we don't need to keep it in the source code. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/modernizr.custom.2.6.2.min.js | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 ui/js/modernizr.custom.2.6.2.min.js diff --git a/ui/js/modernizr.custom.2.6.2.min.js b/ui/js/modernizr.custom.2.6.2.min.js deleted file mode 100644 index 39a08de..0000000 --- a/ui/js/modernizr.custom.2.6.2.min.js +++ /dev/null @@ -1,4 +0,0 @@ -/* Modernizr 2.6.2 (Custom Build) | MIT & BSD - * Build: http://modernizr.com/download/#-boxshadow-multiplebgs-cssgradients-shiv-mq-… - */ -;window.Modernizr=function(a,b,c){function A(a){j.cssText=a}function B(a,b){return A(m.join(a+";")+(b||""))}function C(a,b){return typeof a===b}function D(a,b){return!!~(""+a).indexOf(b)}function E(a,b){for(var d in a){var e=a[d];if(!D(e,"-")&&j[e]!==c)return b=="pfx"?e:!0}return!1}function F(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:C(f,"function")?f.bind(d||b):f}return!1}function G(a,b,c){var d=a.charAt(0).toUpperCase()+a.slice(1),e=(a+" "+o.join(d+" ")+d).split(" ");return C(b,"string")||C(b,"undefined")?E(e,b):(e=(a+" "+p.join(d+" ")+d).split(" "),F(e,b,c))}var d="2.6.2",e={},f=!0,g=b.documentElement,h="modernizr",i=b.createElement(h),j=i.style,k,l={}.toString,m=" -webkit- -moz- -o- -ms- ".split(" "),n="Webkit Moz O ms",o=n.split(" "),p=n.toLowerCase().split(" "),q={},r={},s={},t=[],u=t.slice,v,w=function(a,c,d,e){var f,i,j,k,l=b.createElement("div"),m=b.body,n=m||b.createElement("body");if(parseInt(d,10))while(d--)j=b.createElement("div"),j.id=e?! e[d]:h+(d+1),l.appendChild(j);return f=["",'<style id="s',h,'">',a,"</style>"].join(""),l.id=h,(m?l:n).innerHTML+=f,n.appendChild(l),m||(n.style.background="",n.style.overflow="hidden",k=g.style.overflow,g.style.overflow="hidden",g.appendChild(n)),i=c(l,a),m?l.parentNode.removeChild(l):(n.parentNode.removeChild(n),g.style.overflow=k),!!i},x=function(b){var c=a.matchMedia||a.msMatchMedia;if(c)return c(b).matches;var d;return w("@media "+b+" { #"+h+" { position: absolute; } }",function(b){d=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle)["position"]=="absolute"}),d},y={}.hasOwnProperty,z;!C(y,"undefined")&&!C(y.call,"undefined")?z=function(a,b){return y.call(a,b)}:z=function(a,b){return b in a&&C(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=u.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var! f=new a,g=c.apply(f,d.concat(u.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(u.call(arguments)))};return e}),q.multiplebgs=function(){return A("background:url(https://),url(https://),red url(https://)"),/(url\s*\(.*?){3}/.test(j.background)},q.boxshadow=function(){return G("boxShadow")},q.cssgradients=function(){var a="background-image:",b="gradient(linear,left top,right bottom,from(#9f9),to(white));",c="linear-gradient(left top,#9f9, white);";return A((a+"-webkit- ".split(" ").join(b+a)+m.join(c+a)).slice(0,-a.length)),D(j.backgroundImage,"gradient")};for(var H in q)z(q,H)&&(v=H.toLowerCase(),e[v]=q[H](),t.push((e[v]?"":"no-")+v));return e.addTest=function(a,b){if(typeof a=="object")for(var d in a)z(a,d)&&e.addTest(d,a[d]);else{a=a.toLowerCase();if(e[a]!==c)return e;b=typeof b=="function"?b():b,typeof f!="undefined"&&f&&(g.className+=" "+(b?"":"no-")+a),e[a]=b}return e},A(""),i=k=null,function(a,b){function k(a,b){var c=a.createElement("p"),d=a.getE! lementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<st! yle>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function l(){var a=r.elements;return typeof a=="string"?a.split(" "):a}function m(a){var b=i[a[g]];return b||(b={},h++,a[g]=h,i[h]=b),b}function n(a,c,f){c||(c=b);if(j)return c.createElement(a);f||(f=m(c));var g;return f.cache[a]?g=f.cache[a].cloneNode():e.test(a)?g=(f.cache[a]=f.createElem(a)).cloneNode():g=f.createElem(a),g.canHaveChildren&&!d.test(a)?f.frag.appendChild(g):g}function o(a,c){a||(a=b);if(j)return a.createDocumentFragment();c=c||m(a);var d=c.frag.cloneNode(),e=0,f=l(),g=f.length;for(;e<g;e++)d.createElement(f[e]);return d}function p(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return r.shivMethods?n(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+l().join().replace(/\w+/g,function(a){return b.createElem(a),b.frag! .createElement(a),'c("'+a+'")'})+");return n}")(r,b.frag)}function q(a){a||(a=b);var c=m(a);return r.shivCSS&&!f&&!c.hasCSS&&(c.hasCSS=!!k(a,"article,aside,figcaption,figure,footer,header,hgroup,nav,section{display:block}mark{background:#FF0;color:#000}")),j||p(a,c),a}var c=a.html5||{},d=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,e=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,f,g="_html5shiv",h=0,i={},j;(function(){try{var a=b.createElement("a");a.innerHTML="<xyz></xyz>",f="hidden"in a,j=a.childNodes.length==1||function(){b.createElement("a");var a=b.createDocumentFragment();return typeof a.cloneNode=="undefined"||typeof a.createDocumentFragment=="undefined"||typeof a.createElement=="undefined"}()}catch(c){f=!0,j=!0}})();var r={elements:c.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section su! mmary time video",shivCSS:c.shivCSS!==!1,supportsUnknownElements:j,shiv! Methods:c.shivMethods!==!1,type:"default",shivDocument:q,createElement:n,createDocumentFragment:o};a.html5=r,q(b)}(this,b),e._version=d,e._prefixes=m,e._domPrefixes=p,e._cssomPrefixes=o,e.mq=x,e.testProp=function(a){return E([a])},e.testAllProps=G,e.testStyles=w,g.className=g.className.replace(/(^|\s)no-js(\s|$)/,"$1$2")+(f?" js "+t.join(" "):""),e}(this,this.document); \ No newline at end of file -- 1.9.3

2 2

[PATCH] Delete ui/libs/modernizr.custom.76777.js
by Aline Manera 12 Nov '14

12 Nov '14

modernizr provides support for HTML5 and CSS3. As all the browsers supported by Kimchi alreay has support for those technologies we don't need it. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/libs/modernizr.custom.76777.js | 4 ---- ui/pages/kimchi-ui.html.tmpl | 1 - ui/pages/login.html.tmpl | 1 - 3 files changed, 6 deletions(-) delete mode 100644 ui/libs/modernizr.custom.76777.js diff --git a/ui/libs/modernizr.custom.76777.js b/ui/libs/modernizr.custom.76777.js deleted file mode 100644 index 187b113..0000000 --- a/ui/libs/modernizr.custom.76777.js +++ /dev/null @@ -1,4 +0,0 @@ -/* Modernizr 2.6.2 (Custom Build) | MIT & BSD - * Build: http://modernizr.com/download/#-fontface-backgroundsize-borderimage-borderr… - */ -;window.Modernizr=function(a,b,c){function C(a){j.cssText=a}function D(a,b){return C(n.join(a+";")+(b||""))}function E(a,b){return typeof a===b}function F(a,b){return!!~(""+a).indexOf(b)}function G(a,b){for(var d in a){var e=a[d];if(!F(e,"-")&&j[e]!==c)return b=="pfx"?e:!0}return!1}function H(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:E(f,"function")?f.bind(d||b):f}return!1}function I(a,b,c){var d=a.charAt(0).toUpperCase()+a.slice(1),e=(a+" "+p.join(d+" ")+d).split(" ");return E(b,"string")||E(b,"undefined")?G(e,b):(e=(a+" "+q.join(d+" ")+d).split(" "),H(e,b,c))}function J(){e.input=function(c){for(var d=0,e=c.length;d<e;d++)u[c[d]]=c[d]in k;return u.list&&(u.list=!!b.createElement("datalist")&&!!a.HTMLDataListElement),u}("autocomplete autofocus list placeholder max min multiple pattern required step".split(" ")),e.inputtypes=function(a){for(var d=0,e,f,h,i=a.length;d<i;d++)k.setAttribute("type",f=a[d]),e=k.type!=="text",e&&(k.value=l,k.style.cssText="! position:absolute;visibility:hidden;",/^range$/.test(f)&&k.style.WebkitAppearance!==c?(g.appendChild(k),h=b.defaultView,e=h.getComputedStyle&&h.getComputedStyle(k,null).WebkitAppearance!=="textfield"&&k.offsetHeight!==0,g.removeChild(k)):/^(search|tel)$/.test(f)||(/^(url|email)$/.test(f)?e=k.checkValidity&&k.checkValidity()===!1:e=k.value!=l)),t[a[d]]=!!e;return t}("search tel url email datetime date month week time datetime-local number range color".split(" "))}var d="2.6.2",e={},f=!0,g=b.documentElement,h="modernizr",i=b.createElement(h),j=i.style,k=b.createElement("input"),l=":)",m={}.toString,n=" -webkit- -moz- -o- -ms- ".split(" "),o="Webkit Moz O ms",p=o.split(" "),q=o.toLowerCase().split(" "),r={svg:"http://www.w3.org/2000/svg"},s={},t={},u={},v=[],w=v.slice,x,y=function(a,c,d,e){var f,i,j,k,l=b.createElement("div"),m=b.body,n=m||b.createElement("body");if(parseInt(d,10))while(d--)j=b.createElement("div"),j.id=e?e[d]:h+(d+1),l.appendChild(j);return f=["",'<styl! e id="s',h,'">',a,"</style>"].join(""),l.id=h,(m?l:n).innerHTML+=f,n.appendChild(l),m||(n.style.background="",n.style.overflow="hidden",k=g.style.overflow,g.style.overflow="hidden",g.appendChild(n)),i=c(l,a),m?l.parentNode.removeChild(l):(n.parentNode.removeChild(n),g.style.overflow=k),!!i},z=function(){function d(d,e){e=e||b.createElement(a[d]||"div"),d="on"+d;var f=d in e;return f||(e.setAttribute||(e=b.createElement("div")),e.setAttribute&&e.removeAttribute&&(e.setAttribute(d,""),f=E(e[d],"function"),E(e[d],"undefined")||(e[d]=c),e.removeAttribute(d))),e=null,f}var a={select:"input",change:"input",submit:"form",reset:"form",error:"img",load:"img",abort:"img"};return d}(),A={}.hasOwnProperty,B;!E(A,"undefined")&&!E(A.call,"undefined")?B=function(a,b){return A.call(a,b)}:B=function(a,b){return b in a&&E(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=w.call(a! rguments,1),e=function(){if(this instanceof e){var a=function(){};a.pro! totype=c.prototype;var f=new a,g=c.apply(f,d.concat(w.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(w.call(arguments)))};return e}),s.flexbox=function(){return I("flexWrap")},s.flexboxlegacy=function(){return I("boxDirection")},s.canvas=function(){var a=b.createElement("canvas");return!!a.getContext&&!!a.getContext("2d")},s.canvastext=function(){return!!e.canvas&&!!E(b.createElement("canvas").getContext("2d").fillText,"function")},s.webgl=function(){return!!a.WebGLRenderingContext},s.touch=function(){var c;return"ontouchstart"in a||a.DocumentTouch&&b instanceof DocumentTouch?c=!0:y(["@media (",n.join("touch-enabled),("),h,")","{#modernizr{top:9px;position:absolute}}"].join(""),function(a){c=a.offsetTop===9}),c},s.geolocation=function(){return"geolocation"in navigator},s.postmessage=function(){return!!a.postMessage},s.websqldatabase=function(){return!!a.openDatabase},s.indexedDB=function(){return!!I("indexedDB",a)},s.hashchange=function(){return z("has! hchange",a)&&(b.documentMode===c||b.documentMode>7)},s.history=function(){return!!a.history&&!!history.pushState},s.draganddrop=function(){var a=b.createElement("div");return"draggable"in a||"ondragstart"in a&&"ondrop"in a},s.websockets=function(){return"WebSocket"in a||"MozWebSocket"in a},s.rgba=function(){return C("background-color:rgba(150,255,150,.5)"),F(j.backgroundColor,"rgba")},s.hsla=function(){return C("background-color:hsla(120,40%,100%,.5)"),F(j.backgroundColor,"rgba")||F(j.backgroundColor,"hsla")},s.multiplebgs=function(){return C("background:url(https://),url(https://),red url(https://)"),/(url\s*\(.*?){3}/.test(j.background)},s.backgroundsize=function(){return I("backgroundSize")},s.borderimage=function(){return I("borderImage")},s.borderradius=function(){return I("borderRadius")},s.boxshadow=function(){return I("boxShadow")},s.textshadow=function(){return b.createElement("div").style.textShadow===""},s.opacity=function(){return D("opacity:.55"),/^0.55$/.test(! j.opacity)},s.cssanimations=function(){return I("animationName")},s.css! columns=function(){return I("columnCount")},s.cssgradients=function(){var a="background-image:",b="gradient(linear,left top,right bottom,from(#9f9),to(white));",c="linear-gradient(left top,#9f9, white);";return C((a+"-webkit- ".split(" ").join(b+a)+n.join(c+a)).slice(0,-a.length)),F(j.backgroundImage,"gradient")},s.cssreflections=function(){return I("boxReflect")},s.csstransforms=function(){return!!I("transform")},s.csstransforms3d=function(){var a=!!I("perspective");return a&&"webkitPerspective"in g.style&&y("@media (transform-3d),(-webkit-transform-3d){#modernizr{left:9px;position:absolute;height:3px;}}",function(b,c){a=b.offsetLeft===9&&b.offsetHeight===3}),a},s.csstransitions=function(){return I("transition")},s.fontface=function(){var a;return y('@font-face {font-family:"font";src:url("https://")}',function(c,d){var e=b.getElementById("smodernizr"),f=e.sheet||e.styleSheet,g=f?f.cssRules&&f.cssRules[0]?f.cssRules[0].cssText:f.cssText||"":"";a=/src/i.test(g)&&g.indexOf(d! .split(" ")[0])===0}),a},s.generatedcontent=function(){var a;return y(["#",h,"{font:0/0 a}#",h,':after{content:"',l,'";visibility:hidden;font:3px/1 a}'].join(""),function(b){a=b.offsetHeight>=3}),a},s.video=function(){var a=b.createElement("video"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('video/ogg; codecs="theora"').replace(/^no$/,""),c.h264=a.canPlayType('video/mp4; codecs="avc1.42E01E"').replace(/^no$/,""),c.webm=a.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,"")}catch(d){}return c},s.audio=function(){var a=b.createElement("audio"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,""),c.mp3=a.canPlayType("audio/mpeg;").replace(/^no$/,""),c.wav=a.canPlayType('audio/wav; codecs="1"').replace(/^no$/,""),c.m4a=(a.canPlayType("audio/x-m4a;")||a.canPlayType("audio/aac;")).replace(/^no$/,"")}catch(d){}return c},s.localstorage=function(){try{return localStorage.setItem(h,h)! ,localStorage.removeItem(h),!0}catch(a){return!1}},s.sessionstorage=fun! ction(){try{return sessionStorage.setItem(h,h),sessionStorage.removeItem(h),!0}catch(a){return!1}},s.webworkers=function(){return!!a.Worker},s.applicationcache=function(){return!!a.applicationCache},s.svg=function(){return!!b.createElementNS&&!!b.createElementNS(r.svg,"svg").createSVGRect},s.inlinesvg=function(){var a=b.createElement("div");return a.innerHTML="<svg/>",(a.firstChild&&a.firstChild.namespaceURI)==r.svg},s.smil=function(){return!!b.createElementNS&&/SVGAnimate/.test(m.call(b.createElementNS(r.svg,"animate")))},s.svgclippaths=function(){return!!b.createElementNS&&/SVGClipPath/.test(m.call(b.createElementNS(r.svg,"clipPath")))};for(var K in s)B(s,K)&&(x=K.toLowerCase(),e[x]=s[K](),v.push((e[x]?"":"no-")+x));return e.input||J(),e.addTest=function(a,b){if(typeof a=="object")for(var d in a)B(a,d)&&e.addTest(d,a[d]);else{a=a.toLowerCase();if(e[a]!==c)return e;b=typeof b=="function"?b():b,typeof f!="undefined"&&f&&(g.className+=" "+(b?"":"no-")+a),e[a]=b}return e},C("! "),i=k=null,function(a,b){function k(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function l(){var a=r.elements;return typeof a=="string"?a.split(" "):a}function m(a){var b=i[a[g]];return b||(b={},h++,a[g]=h,i[h]=b),b}function n(a,c,f){c||(c=b);if(j)return c.createElement(a);f||(f=m(c));var g;return f.cache[a]?g=f.cache[a].cloneNode():e.test(a)?g=(f.cache[a]=f.createElem(a)).cloneNode():g=f.createElem(a),g.canHaveChildren&&!d.test(a)?f.frag.appendChild(g):g}function o(a,c){a||(a=b);if(j)return a.createDocumentFragment();c=c||m(a);var d=c.frag.cloneNode(),e=0,f=l(),g=f.length;for(;e<g;e++)d.createElement(f[e]);return d}function p(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return r.shivMethods?n(c,a,b):b.createElem(c)},a.createDocumentFragment=Function(! "h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMe! thods&&("+l().join().replace(/\w+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(r,b.frag)}function q(a){a||(a=b);var c=m(a);return r.shivCSS&&!f&&!c.hasCSS&&(c.hasCSS=!!k(a,"article,aside,figcaption,figure,footer,header,hgroup,nav,section{display:block}mark{background:#FF0;color:#000}")),j||p(a,c),a}var c=a.html5||{},d=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,e=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,f,g="_html5shiv",h=0,i={},j;(function(){try{var a=b.createElement("a");a.innerHTML="<xyz></xyz>",f="hidden"in a,j=a.childNodes.length==1||function(){b.createElement("a");var a=b.createDocumentFragment();return typeof a.cloneNode=="undefined"||typeof a.createDocumentFragment=="undefined"||typeof a.createElement=="undefined"}()}catch(c){f=!0,j=!0}})();var r={elements:c.elements||"abbr article aside audio bdi canvas data datalist details fig! caption figure footer header hgroup mark meter nav output progress section summary time video",shivCSS:c.shivCSS!==!1,supportsUnknownElements:j,shivMethods:c.shivMethods!==!1,type:"default",shivDocument:q,createElement:n,createDocumentFragment:o};a.html5=r,q(b)}(this,b),e._version=d,e._prefixes=n,e._domPrefixes=q,e._cssomPrefixes=p,e.hasEvent=z,e.testProp=function(a){return G([a])},e.testAllProps=I,e.testStyles=y,g.className=g.className.replace(/(^|\s)no-js(\s|$)/,"$1$2")+(f?" js "+v.join(" "):""),e}(this,this.document),function(a,b,c){function d(a){return"[object Function]"==o.call(a)}function e(a){return"string"==typeof a}function f(){}function g(a){return!a||"loaded"==a||"complete"==a||"uninitialized"==a}function h(){var a=p.shift();q=1,a?a.t?m(function(){("c"==a.t?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){"img"!=a&&m(function(){t.r! emoveChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].on! load()}}var j=j||B.errorTimeout,l=b.createElement(a),o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};1===y[c]&&(r=1,y[c]=[]),"object"==a?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),"img"!=a&&(r||2===y[c]?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i("c"==b?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),1==p.length&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&"[object Opera]"==o.call(a.opera),l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return"[object Array]"==o.call(a)},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b! =x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f<d;f++)g=a[f].split("="),(e=z[g.shift()])&&(c=e(c,g));for(f=0;f<b;f++)c=x[f](c);return c}function g(a,e,f,g,h){var i=b(a),j=i.autoCallback;i.url.split(".").pop().split("?").shift(),i.bypass||(e&&(e=d(e)?e:e[a]||e[g]||e[a.split("/").pop().split("?")[0]]),i.instead?i.instead(a,e,f,g,h):(y[i.url]?i.noexec=!0:y[i.url]=1,f.load(i.url,i.forceCSS||!i.forceJS&&"css"==i.url.split(".").pop().split("?").shift()?"c":c,i.noexec,i.attrs,i.timeout),(d(e)||d(j))&&f.load(function(){k(),e&&e(i.origUrl,h,g),j&&j(i.origUrl,h,g),y[i.url]=2})))}function h(a,b){function c(a,c){if(a){if(e(a))c||(j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}),g(a,j,b,0,h);else if(Object(a)===a)for(n in m=function(){var b=0,c;for(c in a)a.hasOwnProperty(c)&&b++;return b}(),a)a.hasOwnProperty(n)&&(!c&&!--m&&(d(j)?j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}:j[n]=function(a){return function(){var b=[].sl! ice.call(arguments);a&&a.apply(this,b),l()}}(k[n])),g(a[n],j,b,n,h))}el! se!c&&l()}var h=!!a.test,i=a.load||a.both,j=a.callback||f,k=j,l=a.complete||f,m,n;c(h?a.yep:a.nope,!!i),i&&c(i)}var i,j,l=this.yepnope.loader;if(e(a))g(a,0,l,0);else if(w(a))for(i=0;i<a.length;i++)j=a[i],e(j)?g(j,0,l,0):w(j)?B(j):Object(j)===j&&h(j,l);else Object(a)===a&&h(a,l)},B.addPrefix=function(a,b){z[a]=b},B.addFilter=function(a){x.push(a)},B.errorTimeout=1e4,null==b.readyState&&b.addEventListener&&(b.readyState="loading",b.addEventListener("DOMContentLoaded",A=function(){b.removeEventListener("DOMContentLoaded",A,0),b.readyState="complete"},0)),a.yepnope=k(),a.yepnope.executeStack=h,a.yepnope.injectJs=function(a,c,d,e,i,j){var k=b.createElement("script"),l,o,e=e||B.errorTimeout;k.src=a;for(o in d)k.setAttribute(o,d[o]);c=j?h:c||f,k.onreadystatechange=k.onload=function(){!l&&g(k.readyState)&&(l=1,c(),k.onload=k.onreadystatechange=null)},m(function(){l||(l=1,c(1))},e),i?k.onload():n.parentNode.insertBefore(k,n)},a.yepnope.injectCss=function(a,c,d,e,g,i){var e=b.createE! lement("link"),j,c=i?h:c||f;e.href=a,e.rel="stylesheet",e.type="text/css";for(j in d)e.setAttribute(j,d[j]);g||(n.parentNode.insertBefore(e,n),m(c,0))}}(this,document),Modernizr.load=function(){yepnope.apply(window,[].slice.call(arguments,0))}; \ No newline at end of file diff --git a/ui/pages/kimchi-ui.html.tmpl b/ui/pages/kimchi-ui.html.tmpl index aee3c4a..2f592a6 100644 --- a/ui/pages/kimchi-ui.html.tmpl +++ b/ui/pages/kimchi-ui.html.tmpl @@ -33,7 +33,6 @@ <link rel="stylesheet" href="$href('libs/themes/base/jquery-ui.min.css')"> <link rel="stylesheet" href="$href('css/theme-default.min.css')"> -<script src="$href('libs/modernizr.custom.76777.js')"></script> <script src="$href('libs/jquery-1.10.0.min.js')"></script> <script src="$href('libs/jquery-ui.min.js')"></script> <script src="$href('libs/jquery-ui-i18n.min.js')"></script> diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl index d4d5b7e..f289af5 100644 --- a/ui/pages/login.html.tmpl +++ b/ui/pages/login.html.tmpl @@ -32,7 +32,6 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> <link rel="shortcut icon" href="images/logo.ico"> <link rel="stylesheet" href="$href('css/theme-default.min.css')"> -<script src="$href('libs/modernizr.custom.76777.js')"></script> <script src="$href('libs/jquery-1.10.0.min.js')"></script> <script src="$href('libs/jquery-ui.min.js')"></script> <script src="$href('libs/jquery-ui-i18n.min.js')"></script> -- 1.9.3

2 2

[PATCH v2] Auto Topology for Guest Templates
by Christy Perez 11 Nov '14

11 Nov '14

This patchset is a better functioning, but not final, version of the topology logic. Aline asked that I send another version with details for the UI will interact with the cpu_info API. The flow will be: - GET /host/cpu_info: Returns {'threading_enabled': boolean 'sockets': integer 'cores_present': integer 'cores_online': integer 'threads_per_core': integer } - Based on that information, plus the host arch, the UI can display - If host arch is Power: - Display a menu labled SMT, with up to four check-boxes. The check-boxes will be labeled SMT1, SMT2, SMT4, and SMT8. The max SMT value displayed will be dependant upon threads_per_core from above. The default checkbox should be the greatest SMT value (e.g. SMT8). - Display the same box for CPUs as before. I had initially thought about having a drop-down for CPUs instead of the empty field, (with only legal vCPU amounts, like 1,2,4,8, etc.), but that will get complicated with different types of processors, and also be too tedious to use. So, unless someone objects, I think the next best thing to do, is just slightly adjust the number of vCPUs the user asked for in order to make sure that the number is a legal number to use with a topology (since vCPUS must equal sockets * cores * threads). - Else: - Display a menu labeled Hyper-Threading, with only a checkbox labeled HT. - The user's selections from those fields is sent to the get_rec_topology method, which will then return two values: {'topology': {'sockets': sockets, 'cores': cores, 'threads': threads}, 'vcpus': best_vcpus} These values can then be used to create the template: curl -k -u user -X POST -H 'Content-Typ: application/json' -H 'Accept: application/json' \ https://localhost:8001/templates -d'{"name": "test_topo", "cdrom": "/isos/DVD_name.iso", \ "cpus":4, "cpu_info": {"topology": {"sockets": 1, "cores": 2, "threads":2}}}' What doesn't work right now: - The GET for cpu_info. - Some error messages still need to be created. - Some values of vCPUs will return an error that topology isn't supported. Hopefully this description will help the UI developers while I finish. Christy Perez (1): Parts to allow Kimchi to configure the cpu topology. docs/API.md | 2 + src/kimchi/API.json | 6 ++ src/kimchi/control/cpuinfo.py | 35 ++++++++ src/kimchi/i18n.py | 2 + src/kimchi/model/cpuinfo.py | 183 ++++++++++++++++++++++++++++++++++++++++++ src/kimchi/model/host.py | 1 + src/kimchi/model/templates.py | 15 +++- 7 files changed, 243 insertions(+), 1 deletion(-) create mode 100644 src/kimchi/control/cpuinfo.py create mode 100644 src/kimchi/model/cpuinfo.py -- 1.9.3

1 2

[v5] UI: Clone Guest(static message)
by huoyuxin＠linux.vnet.ibm.com 10 Nov '14

10 Nov '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/button.css | 4 ++ ui/css/theme-default/list.css | 18 ++++++ ui/js/src/kimchi.api.js | 17 +++++- ui/js/src/kimchi.guest_main.js | 111 +++++++++++++++++++++++++++++++-------- ui/pages/guest.html.tmpl | 6 ++- ui/pages/i18n.json.tmpl | 1 + 6 files changed, 132 insertions(+), 25 deletions(-) diff --git a/ui/css/theme-default/button.css b/ui/css/theme-default/button.css index 499bf4a..0df53a6 100644 --- a/ui/css/theme-default/button.css +++ b/ui/css/theme-default/button.css @@ -50,6 +50,10 @@ cursor: pointer; } +.btn[disabled] { + opacity: 0.3; +} + .btn:not([disabled]):hover { box-shadow: -2px -2px 2px #dadada, 2px 2px 2px #fff, 3px 3px 3px white inset, -3px -3px 3px rgba(0, 0, 0, .25) inset; diff --git a/ui/css/theme-default/list.css b/ui/css/theme-default/list.css index 8ffee69..ded18eb 100644 --- a/ui/css/theme-default/list.css +++ b/ui/css/theme-default/list.css @@ -275,3 +275,21 @@ text-shadow: -1px -1px 1px #ccc, 1px 1px 1px #fff; padding-left: 10px; } + +.guest-clone { + margin: 10px; +} + +.guest-clone .icon { + background: url('../../images/theme-default/kimchi-loading15x15.gif') no-repeat; + display: inline-block; + width: 20px; + height: 20px; + vertical-align: middle; +} + +.guest-clone .text { + color: #666666; + margin-left: 5px; + text-shadow: -1px -1px 1px #CCCCCC, 1px 1px 1px #FFFFFF; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 5895a07..2f90219 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -695,10 +695,10 @@ var kimchi = { }, 2000); break; case 'finished': - suc(result); + suc && suc(result); break; case 'failed': - err(result); + err && err(result); break; default: break; @@ -1233,5 +1233,18 @@ var kimchi = { success : suc, error : err }); + }, + + cloneGuest: function(vm, suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'vms/'+encodeURIComponent(vm)+"/clone", + type : 'POST', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); } }; diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index dbe8753..2fd5c55 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -15,6 +15,34 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +kimchi.sampleGuestObject = { + "name": "", + "uuid": "", + "state": "shutoff", + "persistent": true, + "icon": null, + "cpus": 0, + "memory": 0, + "stats": { + "net_throughput": 0, + "io_throughput_peak": 100, + "cpu_utilization": 0, + "io_throughput": 0, + "net_throughput_peak": 100 + }, + "screenshot": null, + "graphics": { + "passwd": null, + "passwdValidTo": null, + "type": "vnc", + "port": null, + "listen": "127.0.0.1" + }, + "users": [], + "groups": [], + "access": "full" +}; + kimchi.vmstart = function(event) { var button=$(this); @@ -173,8 +201,24 @@ kimchi.listVmsAuto = function() { if (kimchi.vmTimeout) { clearTimeout(kimchi.vmTimeout); } + var getCloningGuests = function(){ + var guests = []; + kimchi.getTasksByFilter('status=running&target_uri='+encodeURIComponent('^/vms/*'), function(tasks) { + for(var i=0;i<tasks.length;i++){ + var guestUri = tasks[i].target_uri; + var guestName = guestUri.substring(guestUri.lastIndexOf('/')+1, guestUri.length); + guests.push($.extend({}, kimchi.sampleGuestObject, {name: guestName, isCloning: true})); + if(kimchi.trackingTasks.indexOf(tasks[i].id)==-1) + kimchi.trackTask(tasks[i].id, null, function(err){ + kimchi.message.error(err.message); + }, null); + } + }, null, true); + return guests; + }; kimchi.listVMs(function(result, textStatus, jqXHR) { if (result && textStatus=="success") { + result = getCloningGuests().concat(result); if(result.length) { var listHtml = ''; var guestTemplate = kimchi.guestTemplate; @@ -233,14 +277,16 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { imgLoad.attr('src',load_src); //Link the stopped tile to the start action, the running tile to open the console - if (vmRunningBool) { - liveTile.off("click", kimchi.vmstart); - liveTile.on("click", kimchi.openVmConsole); - } - else { - liveTile.off("click", kimchi.openVmConsole); - liveTile.on("click", kimchi.vmstart); - liveTile.hover(function(event){$(this).find('.overlay').show()}, function(event){$(this).find('.overlay').hide()}); + if(!vmObject.isCloning){ + if (vmRunningBool) { + liveTile.off("click", kimchi.vmstart); + liveTile.on("click", kimchi.openVmConsole); + } + else { + liveTile.off("click", kimchi.openVmConsole); + liveTile.on("click", kimchi.vmstart); + liveTile.hover(function(event){$(this).find('.overlay').show()}, function(event){$(this).find('.overlay').hide()}); + } } @@ -257,6 +303,7 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { //Setup the VM Actions var guestActions=result.find("div[name=guest-actions]"); guestActions.find(".shutoff-disabled").prop('disabled', !vmRunningBool ); + guestActions.find(".running-disabled").prop('disabled', vmRunningBool ); if (vmRunningBool) { guestActions.find(".running-hidden").hide(); @@ -276,21 +323,41 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { } //Setup action event handlers - guestActions.find("[name=vm-start]").on({click : kimchi.vmstart}); - guestActions.find("[name=vm-poweroff]").on({click : kimchi.vmpoweroff}); - if (vmRunningBool) { //If the guest is not running, do not enable reset - guestActions.find("[name=vm-reset]").on({click : kimchi.vmreset}); - } - if (vmRunningBool) { //If the guest is not running, do not enable shutdown - guestActions.find("[name=vm-shutdown]").on({click : kimchi.vmshutdown}); - } - guestActions.find("[name=vm-edit]").on({click : kimchi.vmedit}); - guestActions.find("[name=vm-delete]").on({click : kimchi.vmdelete}); + if(!vmObject.isCloning){ + guestActions.find("[name=vm-start]").on({click : kimchi.vmstart}); + guestActions.find("[name=vm-poweroff]").on({click : kimchi.vmpoweroff}); + if (vmRunningBool) { //If the guest is not running, do not enable reset + guestActions.find("[name=vm-reset]").on({click : kimchi.vmreset}); + } + if (vmRunningBool) { //If the guest is not running, do not enable shutdown + guestActions.find("[name=vm-shutdown]").on({click : kimchi.vmshutdown}); + } + guestActions.find("[name=vm-edit]").on({click : kimchi.vmedit}); + guestActions.find("[name=vm-delete]").on({click : kimchi.vmdelete}); + guestActions.find("[name=vm-clone]").click(function(){ + var guest = $(this).closest('li[name=guest]').attr("id"); + kimchi.confirm({ + title : i18n['KCHAPI6006M'], + content : i18n['KCHVM6010M'], + confirm : i18n['KCHAPI6002M'], + cancel : i18n['KCHAPI6003M'] + }, function() { + kimchi.cloneGuest(guest, function(data){ + kimchi.listVmsAuto(); + }); + }, null); + }); + + //Maintain menu open state + var actionMenu=guestActions.find("div[name=actionmenu]"); + if (openMenu) { + $('.popover', actionMenu).toggle(); + } - //Maintain menu open state - var actionMenu=guestActions.find("div[name=actionmenu]"); - if (openMenu) { - $('.popover', actionMenu).toggle(); + }else{ + guestActions.find('.btn').attr('disabled', true); + result.find('.guest-clone').removeClass('hide-content'); + $('.popover', guestActions.find("div[name=actionmenu]")).remove(); } return result; diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl index 43fb350..74206fd 100644 --- a/ui/pages/guest.html.tmpl +++ b/ui/pages/guest.html.tmpl @@ -26,6 +26,9 @@ <div class="guest-general"> <h2 class="title" title="{name}">{name}</h2> </div> + <div class="guest-clone hide-content"> + <span class="icon"></span><span class="text">$_("Cloning")...</span> + </div> </div> <div name="cpu_utilization" class="sortable"> <div class="circleGauge"></div> @@ -56,7 +59,8 @@ <span class="text">$_("Actions")</span><span class="arrow"></span> <div class="popover actionsheet right-side" style="width: 250px"> <button class="button-big shutoff-disabled" name="vm-console" ><span class="text">$_("Connect")</span></button> - <button class="button-big running-disabled" name="vm-edit"><span class="text">$_("Edit")</span></button> + <button class="button-big running-disabled" name="vm-clone"><span class="text">$_("Clone")</span></button> + <button class="button-big" name="vm-edit"><span class="text">$_("Edit")</span></button> <button class="button-big shutoff-hidden" name="vm-reset"><span class="text">$_("Reset")</span></button> <button class="button-big shutoff-hidden" name="vm-shutdown"><span class="text">$_("Shut Down")</span></button> <button class="button-big running-hidden" name="vm-start"><span class="text">$_("Start")</span></button> diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 75f1e43..56abd36 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -128,6 +128,7 @@ "KCHVM6007M": "$_("Note the guest OS may ignore this request. Would you like to continue?")", "KCHVM6008M": "$_("Virtual Machine delete Confirmation")", "KCHVM6009M": "$_("This virtual machine is not persistent. Power Off will delete it. Continue?")", + "KCHVM6010M": "$_("When the target guest has SCSI or iSCSI volumes, they will be cloned on default storage pool. The same will happen when the target pool does not have enough space to clone the volumes. Do you want to continue?")", "KCHVMCD6001M": "$_("This CDROM will be detached permanently and you can re-attach it. Continue to detach it?")", "KCHVMCD6002M": "$_("Attach")", -- 1.7.1

2 1

[PATCH v2 0/5] Clone virtual machine
by Crístian Viana 10 Nov '14

10 Nov '14

This is the difference between this and the previous patchset (v1): - The function "StorageVolumes.create(volume_path)" was rewritten as "StorageVolume.clone(pool, name)". - Patch 2 has been updated to fix the test error (introduced by a commit pushed later). - The function "get_next_clone_name" was moved to the module "kimchi.utils" and was generified (i.e. it can handle different resources other than VMs, such as storage volumes) Crístian Viana (5): Add model function to wait for task Clean up test pool directories Clone storage volume Clone virtual machine Add tests and mockmodel for the cloning feature docs/API.md | 10 ++ src/kimchi/control/storagevolumes.py | 1 + src/kimchi/control/vms.py | 1 + src/kimchi/i18n.py | 5 + src/kimchi/mockmodel.py | 86 ++++++++++- src/kimchi/model/storagevolumes.py | 97 +++++++++++- src/kimchi/model/tasks.py | 28 ++++ src/kimchi/model/vms.py | 280 ++++++++++++++++++++++++++++++++++- src/kimchi/utils.py | 41 +++++ tests/test_model.py | 81 ++++++++-- tests/test_rest.py | 54 +++++++ 11 files changed, 669 insertions(+), 15 deletions(-) -- 1.9.3

2 6

[PATCH V2] Fix content of the SW update list after disable a repository.
by Rodrigo Trujillo 10 Nov '14

10 Nov '14

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> Kimchi lists all RPM packages to be updated when the Host tab is selected, but even after disable some YUM repository and refresh the content of this tab, the previous packages from the disabled repository are still present in list. This patch "deletes" the YumBase object after get the list of packages to be updated. With this, every time the Host tab is selected, a new list will be generated. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/swupdate.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/kimchi/swupdate.py b/src/kimchi/swupdate.py index 85cdfd6..40af8f3 100644 --- a/src/kimchi/swupdate.py +++ b/src/kimchi/swupdate.py @@ -154,6 +154,7 @@ class YumUpdate(object): yb.doLock() self._pkgs = yb.doPackageLists('updates') yb.doUnlock() + del yb except Exception, e: kimchiLock.release() raise OperationFailed('KCHPKGUPD0003E', {'err': str(e)}) -- 1.9.3

2 1

[PATCH V2] storagepool-add: showing Fibre Channel devices
by Rodrigo Trujillo 10 Nov '14

10 Nov '14

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> Fixing a problem in the JS files where getHostPCIDevices was being used to show the FC devices. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.api.js | 2 +- ui/js/src/kimchi.storagepool_add_main.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index ebf826b..6ac2df3 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -1018,7 +1018,7 @@ var kimchi = { }); }, - getHostPCIDevices: function(suc, err) { + getHostFCDevices: function(suc, err) { var url = kimchi.url+'host/devices?_cap=fc_host'; kimchi.requestJSON({ url : url, diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index ffe8fb6..5ef84af 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -142,7 +142,7 @@ kimchi.initStorageAddPage = function() { $('.host-partition').addClass('text-help'); }); - kimchi.getHostPCIDevices(function(data){ + kimchi.getHostFCDevices(function(data){ if(data.length>0){ for(var i=0;i<data.length;i++){ data[i].label = data[i].name; -- 1.9.3

2 1

[PATCH V2] Add PPC console configuration to guest XML
by Rodrigo Trujillo 10 Nov '14

10 Nov '14

When creating a VM from template, add PPC console configuration to xml. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/vmtemplate.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 4e5806f..20df6c2 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -370,6 +370,16 @@ class VMTemplate(object): </devices> </domain> """ % params + + # Adding PPC console configuration + if params['arch'] in ['ppc', 'ppc64']: + ppc_console = """<memballoon model='virtio' /> + <console type='pty'> + <target type='serial' port='1'/> + <address type='spapr-vio' reg='0x30001000'/> + </console>""" + xml = xml.replace("<memballoon model='virtio' />", ppc_console) + return xml def validate(self): -- 1.9.3

2 1

[PATCH] Add PPC console configuration to guest XML
by Rodrigo Trujillo 10 Nov '14

10 Nov '14

When creating a VM from template, add PPC console configuration to xml. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/vmtemplate.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index cfc46f6..d18fc59 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -409,6 +409,16 @@ drive=drive-%(bus)s0-1-0,id=%(bus)s0-1-0'/> </devices> </domain> """ % params + + # Adding PPC console configuration + if params['arch'] in ['ppc', 'ppc64']: + ppc_console = """<memballoon model='virtio' /> + <console type='pty'> + <target type='serial' port='1'/> + <address type='spapr-vio' reg='0x30001000'/> + </console>""" + xml = xml.replace("<memballoon model='virtio' />", ppc_console) + return xml def validate(self): -- 1.9.3

2 15

[PATCHv2 0/7] LDAP authentication and authorization
by lvroyce0210＠gmail.com 10 Nov '14

10 Nov '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Royce Lv (7): Add configuration of LDAP Split PAM and LDAP authentication Add LDAP authentication Fix test cases for authentication Split users and groups for permission query Move validation to user and host change vm permission tag contrib/DEBIAN/control.in | 1 + contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + docs/README.md | 12 ++-- src/kimchi.conf.in | 17 +++++ src/kimchi/auth.py | 157 +++++++++++++++++++++++++++++++----------- src/kimchi/config.py.in | 5 ++ src/kimchi/control/host.py | 7 ++ src/kimchi/i18n.py | 1 + src/kimchi/model/host.py | 97 +++++++++++++++++++++++++- src/kimchi/model/vms.py | 38 +++++----- tests/utils.py | 43 ++++++++---- 12 files changed, 303 insertions(+), 77 deletions(-) -- 1.8.3.2

3 22

[PATCH 0/3] Fixes on featuretests.py
by Aline Manera 10 Nov '14

10 Nov '14

It is needed to make mockmodel uses model with 'test:///default' URI Aline Manera (3): Update FeatureTests to use the same libvirt connection used by Model Set domain type in FeatureTests according libvirt URI Move featuretests.py to /model src/kimchi/featuretests.py | 217 --------------------------------------- src/kimchi/model/config.py | 12 ++- src/kimchi/model/featuretests.py | 210 +++++++++++++++++++++++++++++++++++++ src/kimchi/model/utils.py | 2 +- 4 files changed, 218 insertions(+), 223 deletions(-) delete mode 100644 src/kimchi/featuretests.py create mode 100644 src/kimchi/model/featuretests.py -- 1.9.3

2 5

[PATCH] Adding 'link_detected' to netinfo.py
by Daniel Henrique Barboza 10 Nov '14

10 Nov '14

'Link_detected' returns 'yes' if the network card is attached to a cable (or other media), 'no' if it's disconnected and 'n/a' if the link state can't be determined (if the network interface is down). This is an information that might be useful for some plug-ins - Ginger, for instance - to present to the user. Example of the updated netinfo.get_interface_info call: $ sudo PYTHONPATH=src python Python 2.7.5 (default, Sep 25 2014, 13:52:19) [GCC 4.8.3 20140624 (Red Hat 4.8.3-1)] on linux2 Type "help", "copyright", "credits" or "license" for more information. >>> from kimchi import netinfo >>> netinfo.get_interface_info('em1') {'status': 'active', 'name': 'em1', 'ipaddr': '', 'netmask': '', 'link_detected': 'no', 'type': 'nic'} ---- with em1 interface down ----- >>> netinfo.get_interface_info('em1') {'status': 'inactive', 'name': 'em1', 'ipaddr': '', 'netmask': '', 'link_detected': 'n/a', 'type': 'nic'} >>> Daniel Henrique Barboza (1): netinfo.py: adding 'link_detected' to get_interface_info src/kimchi/netinfo.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) -- 1.8.3.1

3 4

[PATCH] Create common function to generate interface guest XML
by Aline Manera 10 Nov '14

10 Nov '14

And use it on vmtemplate.py and model/vmifaces.py to make sure in both cases the same XML structure will be used. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/model/vmifaces.py | 19 +++++----------- src/kimchi/vmtemplate.py | 29 ++++++------------------ src/kimchi/xmlutils/interface.py | 49 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 35 deletions(-) create mode 100644 src/kimchi/xmlutils/interface.py diff --git a/src/kimchi/model/vmifaces.py b/src/kimchi/model/vmifaces.py index 721bf14..87ada6d 100644 --- a/src/kimchi/model/vmifaces.py +++ b/src/kimchi/model/vmifaces.py @@ -21,10 +21,10 @@ import random import libvirt from lxml import etree, objectify -from lxml.builder import E from kimchi.exception import InvalidOperation, InvalidParameter, NotFoundError from kimchi.model.vms import DOM_STATE_MAP, VMModel +from kimchi.xmlutils.interface import get_iface_xml class VMIfacesModel(object): @@ -53,22 +53,15 @@ class VMIfacesModel(object): for iface in self.get_vmifaces(vm, self.conn)) while True: - mac = VMIfacesModel.random_mac() - if mac not in macs: + params['mac'] = VMIfacesModel.random_mac() + if params['mac'] not in macs: break - children = [E.mac(address=mac)] - ("network" in params.keys() and - children.append(E.source(network=params['network']))) - ("model" in params.keys() and - children.append(E.model(type=params['model']))) - attrib = {"type": params["type"]} - - xml = etree.tostring(E.interface(*children, **attrib)) - + os_distro, os_version = VMModel.vm_get_os_metadata(dom) + xml = get_iface_xml(params, conn.getInfo()[0], os_distro, os_version) dom.attachDeviceFlags(xml, libvirt.VIR_DOMAIN_AFFECT_CURRENT) - return mac + return params['mac'] @staticmethod def get_vmifaces(vm, conn): diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 4e5806f..25f1994 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -23,7 +23,6 @@ import time import urlparse import uuid -from distutils.version import LooseVersion from lxml import etree from lxml.builder import E @@ -33,6 +32,7 @@ from kimchi.imageinfo import probe_image, probe_img_info from kimchi.isoinfo import IsoImage from kimchi.utils import check_url_path, pool_name_from_uri from kimchi.xmlutils.disk import get_disk_xml +from kimchi.xmlutils.interface import get_iface_xml from kimchi.xmlutils.qemucmdline import get_qemucmdline_xml @@ -239,30 +239,15 @@ class VMTemplate(object): ret.append(info) return ret - def _disable_vhost(self): - # Hack to disable vhost feature in Ubuntu LE and SLES LE (PPC) - driver = "" - if self.info['arch'] == 'ppc64' and \ - ((self.info['os_distro'] == 'ubuntu' and LooseVersion( - self.info['os_version']) >= LooseVersion('14.04')) or - (self.info['os_distro'] == 'sles' and LooseVersion( - self.info['os_version']) >= LooseVersion('12'))): - driver = " <driver name='qemu'/>\n " - return driver - def _get_networks_xml(self): - network = """ - <interface type='network'> - <source network='%(network)s'/> - <model type='%(nic_model)s'/> - %(driver)s</interface> - """ networks = "" - net_info = {"nic_model": self.info['nic_model'], - "driver": self._disable_vhost()} + params = {'type': 'network', + 'model': self.info['nic_model']} for nw in self.info['networks']: - net_info['network'] = nw - networks += network % net_info + params['network'] = nw + networks += get_iface_xml(params, self.info['arch'], + self.info['os_distro'], + self.info['os_version']) return networks def _get_input_output_xml(self): diff --git a/src/kimchi/xmlutils/interface.py b/src/kimchi/xmlutils/interface.py new file mode 100644 index 0000000..c76131a --- /dev/null +++ b/src/kimchi/xmlutils/interface.py @@ -0,0 +1,49 @@ +# +# Project Kimchi +# +# Copyright IBM, Corp. 2014 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +import lxml.etree as ET + +from distutils.version import LooseVersion +from lxml.builder import E + + +def get_iface_xml(params, arch=None, os_distro=None, os_version=None): + """ + <interface type='network'> + <source network='default'/> + <model type='virtio'/> + </interface> + """ + interface = E.interface(type=params['type']) + interface.append(E.source(network=params['network'])) + interface.append(E.model(type=params['model'])) + + mac = params.get('mac', None) + if mac is not None: + interface.append(E.mac(address=mac)) + + # Hack to disable vhost feature in Ubuntu LE and SLES LE (PPC) + if arch == 'ppc64' and \ + ((os_distro == 'ubuntu' and + LooseVersion(os_version) >= LooseVersion('14.04')) or + (os_distro == 'sles' and + LooseVersion(os_version >= LooseVersion('12')))): + interface.append(E.driver(name='qemu')) + + return ET.tostring(interface, encoding='utf-8', pretty_print=True) -- 1.9.3

2 2

[PATCH] Use lxml to generate graphics XML and update VMTemplate to use it
by Aline Manera 10 Nov '14

10 Nov '14

Create a new module xmlutils/graphics.py to generate graphics XML and use this new function on vmtemplate.py Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/model/vms.py | 2 +- src/kimchi/vmtemplate.py | 25 +++++------------------ src/kimchi/xmlutils/graphics.py | 45 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 21 deletions(-) create mode 100644 src/kimchi/xmlutils/graphics.py diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index f2e4ae3..942f041 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -212,7 +212,7 @@ class VMsModel(object): if t._get_storage_type() not in ["iscsi", "scsi"]: vol_list = t.fork_vm_storage(vm_uuid) - graphics = params.get('graphics') + graphics = params.get('graphics', {}) stream_protocols = self.caps.libvirt_stream_protocols xml = t.to_vm_xml(name, vm_uuid, libvirt_stream_protocols=stream_protocols, diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 4e5806f..5f7f31e 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -33,6 +33,7 @@ from kimchi.imageinfo import probe_image, probe_img_info from kimchi.isoinfo import IsoImage from kimchi.utils import check_url_path, pool_name_from_uri from kimchi.xmlutils.disk import get_disk_xml +from kimchi.xmlutils.graphics import get_graphics_xml from kimchi.xmlutils.qemucmdline import get_qemucmdline_xml @@ -185,24 +186,6 @@ class VMTemplate(object): return disks_xml - def _get_graphics_xml(self, params): - graphics_xml = """ - <graphics type='%(type)s' autoport='yes' listen='%(listen)s'> - </graphics> - """ - spicevmc_xml = """ - <channel type='spicevmc'> - <target type='virtio' name='com.redhat.spice.0'/> - </channel> - """ - graphics = dict(self.info['graphics']) - if params: - graphics.update(params) - graphics_xml = graphics_xml % graphics - if graphics['type'] == 'spice': - graphics_xml = graphics_xml + spicevmc_xml - return graphics_xml - def to_volume_list(self, vm_uuid): storage_path = self._get_storage_path() fmt = 'raw' if self._get_storage_type() in ['logical'] else 'qcow2' @@ -312,10 +295,12 @@ class VMTemplate(object): params['qemu-namespace'] = '' params['cdroms'] = '' params['qemu-stream-cmdline'] = '' - graphics = kwargs.get('graphics') - params['graphics'] = self._get_graphics_xml(graphics) params['cpu_info'] = self._get_cpu_xml() + graphics = dict(self.info['graphics']) + graphics.update(kwargs.get('graphics', {})) + params['graphics'] = get_graphics_xml(graphics) + # Current implementation just allows to create disk in one single # storage pool, so we cannot mix the types (scsi volumes vs img file) storage_type = self._get_storage_type() diff --git a/src/kimchi/xmlutils/graphics.py b/src/kimchi/xmlutils/graphics.py new file mode 100644 index 0000000..4c69cd9 --- /dev/null +++ b/src/kimchi/xmlutils/graphics.py @@ -0,0 +1,45 @@ +# +# Project Kimchi +# +# Copyright IBM, Corp. 2014 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +import lxml.etree as ET + +from lxml.builder import E + + +def get_graphics_xml(params): + """ + <graphics type='%(type)s' autoport='yes' listen='%(listen)s'/> + + - For spice graphics: + + <channel type='spicevmc'> + <target type='virtio' name='com.redhat.spice.0'/> + </channel> + """ + graphics = E.graphics(type=params['type'], listen=params['listen']) + graphics_xml = ET.tostring(graphics, encoding='utf-8', pretty_print=True) + + if params['type'] == 'vnc': + return graphics_xml + + # For spice graphics, a channel also must be configured + channel = E.channel(type='spicevmc') + channel.append(E.target(type='virtio', name='com.redhat.spice.0')) + channel_xml = ET.tostring(channel, encoding='utf-8', pretty_print=True) + return graphics_xml + channel_xml -- 1.9.3

2 2

Browser based Web Linux Console -- Serial Console
by Yu Xin Huo 07 Nov '14

07 Nov '14

Below are quite promising. http://www.unixmen.com/ajaxterm-a-web-based-terminal-that-help-you-use-ssh-… http://www.web-console.org/ http://www.tecmint.com/shell-in-a-box-a-web-based-ssh-terminal-to-access-re… http://xmodulo.com/access-ssh-terminal-web-browser-linux.html http://www.unixmen.com/keybox-web-based-ssh-console-manage-multiple-ssh-ses…

2 4

[PATCH] bug fix: Properly generate guest disks on VMTemplate
by Aline Manera 06 Nov '14

06 Nov '14

Commits cdd146a9 and 749abbf8 changed the way VMTemplate generates the guest disks XML but, due a merge issue, they did not update the to_vm_xml() function that was pointing to non-existing functions: _get_iscsi_disks_xml() and _get_scsi_disks_xml() Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/vmtemplate.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 4e5806f..19c8ea1 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -155,7 +155,6 @@ class VMTemplate(object): # storage pool, so we cannot mix the types (scsi volumes vs img file) storage_type = self._get_storage_type() storage_path = self._get_storage_path() - storage_type = self._get_storage_type() base_disk_params = {'type': 'disk', 'disk': 'file', 'bus': self.info['disk_bus'], 'format': 'qcow2'} @@ -315,16 +314,7 @@ class VMTemplate(object): graphics = kwargs.get('graphics') params['graphics'] = self._get_graphics_xml(graphics) params['cpu_info'] = self._get_cpu_xml() - - # Current implementation just allows to create disk in one single - # storage pool, so we cannot mix the types (scsi volumes vs img file) - storage_type = self._get_storage_type() - if storage_type == "iscsi": - params['disks'] = self._get_iscsi_disks_xml() - elif storage_type == "scsi": - params['disks'] = self._get_scsi_disks_xml() - else: - params['disks'] = self._get_disks_xml(vm_uuid) + params['disks'] = self._get_disks_xml(vm_uuid) qemu_stream_dns = kwargs.get('qemu_stream_dns', False) libvirt_stream_protocols = kwargs.get('libvirt_stream_protocols', []) -- 1.9.3

2 2

[v6] UI: Clone Guest(with precheck)
by huoyuxin＠linux.vnet.ibm.com 06 Nov '14

06 Nov '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/button.css | 4 + ui/css/theme-default/list.css | 18 +++++ ui/js/src/kimchi.api.js | 34 ++++++++- ui/js/src/kimchi.guest_main.js | 151 +++++++++++++++++++++++++++++++++------ ui/pages/guest.html.tmpl | 6 ++- ui/pages/i18n.json.tmpl | 1 + 6 files changed, 188 insertions(+), 26 deletions(-) diff --git a/ui/css/theme-default/button.css b/ui/css/theme-default/button.css index 499bf4a..0df53a6 100644 --- a/ui/css/theme-default/button.css +++ b/ui/css/theme-default/button.css @@ -50,6 +50,10 @@ cursor: pointer; } +.btn[disabled] { + opacity: 0.3; +} + .btn:not([disabled]):hover { box-shadow: -2px -2px 2px #dadada, 2px 2px 2px #fff, 3px 3px 3px white inset, -3px -3px 3px rgba(0, 0, 0, .25) inset; diff --git a/ui/css/theme-default/list.css b/ui/css/theme-default/list.css index 8ffee69..ded18eb 100644 --- a/ui/css/theme-default/list.css +++ b/ui/css/theme-default/list.css @@ -275,3 +275,21 @@ text-shadow: -1px -1px 1px #ccc, 1px 1px 1px #fff; padding-left: 10px; } + +.guest-clone { + margin: 10px; +} + +.guest-clone .icon { + background: url('../../images/theme-default/kimchi-loading15x15.gif') no-repeat; + display: inline-block; + width: 20px; + height: 20px; + vertical-align: middle; +} + +.guest-clone .text { + color: #666666; + margin-left: 5px; + text-shadow: -1px -1px 1px #CCCCCC, 1px 1px 1px #FFFFFF; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 5895a07..465755c 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -695,10 +695,10 @@ var kimchi = { }, 2000); break; case 'finished': - suc(result); + suc && suc(result); break; case 'failed': - err(result); + err && err(result); break; default: break; @@ -806,12 +806,27 @@ var kimchi = { }); }, - getStoragePoolVolume: function(poolName, volumeName, suc, err) { + getStoragePool: function(poolName, suc, err, async) { + var url = kimchi.url + 'storagepools/' + encodeURIComponent(poolName); + kimchi.requestJSON({ + url : url, + type : 'GET', + contentType : 'application/json', + async : async==undefined?true:async, + timeout: 2000, + dataType : 'json', + success : suc, + error : err + }); + }, + + getStoragePoolVolume: function(poolName, volumeName, suc, err, async) { var url = kimchi.url + 'storagepools/' + encodeURIComponent(poolName) + '/storagevolumes/' + encodeURIComponent(volumeName); kimchi.requestJSON({ url : url, type : 'GET', contentType : 'application/json', + async : async==undefined?true:async, timeout: 2000, dataType : 'json', success : suc, @@ -1233,5 +1248,18 @@ var kimchi = { success : suc, error : err }); + }, + + cloneGuest: function(vm, suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'vms/'+encodeURIComponent(vm)+"/clone", + type : 'POST', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); } }; diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index dbe8753..b13903c 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -15,6 +15,34 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +kimchi.sampleGuestObject = { + "name": "", + "uuid": "", + "state": "shutoff", + "persistent": true, + "icon": null, + "cpus": 0, + "memory": 0, + "stats": { + "net_throughput": 0, + "io_throughput_peak": 100, + "cpu_utilization": 0, + "io_throughput": 0, + "net_throughput_peak": 100 + }, + "screenshot": null, + "graphics": { + "passwd": null, + "passwdValidTo": null, + "type": "vnc", + "port": null, + "listen": "127.0.0.1" + }, + "users": [], + "groups": [], + "access": "full" +}; + kimchi.vmstart = function(event) { var button=$(this); @@ -173,8 +201,24 @@ kimchi.listVmsAuto = function() { if (kimchi.vmTimeout) { clearTimeout(kimchi.vmTimeout); } + var getCloningGuests = function(){ + var guests = []; + kimchi.getTasksByFilter('status=running&target_uri='+encodeURIComponent('^/vms/*'), function(tasks) { + for(var i=0;i<tasks.length;i++){ + var guestUri = tasks[i].target_uri; + var guestName = guestUri.substring(guestUri.lastIndexOf('/')+1, guestUri.length); + guests.push($.extend({}, kimchi.sampleGuestObject, {name: guestName, isCloning: true})); + if(kimchi.trackingTasks.indexOf(tasks[i].id)==-1) + kimchi.trackTask(tasks[i].id, null, function(err){ + kimchi.message.error(err.message); + }, null); + } + }, null, true); + return guests; + }; kimchi.listVMs(function(result, textStatus, jqXHR) { if (result && textStatus=="success") { + result = getCloningGuests().concat(result); if(result.length) { var listHtml = ''; var guestTemplate = kimchi.guestTemplate; @@ -233,14 +277,16 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { imgLoad.attr('src',load_src); //Link the stopped tile to the start action, the running tile to open the console - if (vmRunningBool) { - liveTile.off("click", kimchi.vmstart); - liveTile.on("click", kimchi.openVmConsole); - } - else { - liveTile.off("click", kimchi.openVmConsole); - liveTile.on("click", kimchi.vmstart); - liveTile.hover(function(event){$(this).find('.overlay').show()}, function(event){$(this).find('.overlay').hide()}); + if(!vmObject.isCloning){ + if (vmRunningBool) { + liveTile.off("click", kimchi.vmstart); + liveTile.on("click", kimchi.openVmConsole); + } + else { + liveTile.off("click", kimchi.openVmConsole); + liveTile.on("click", kimchi.vmstart); + liveTile.hover(function(event){$(this).find('.overlay').show()}, function(event){$(this).find('.overlay').hide()}); + } } @@ -257,6 +303,7 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { //Setup the VM Actions var guestActions=result.find("div[name=guest-actions]"); guestActions.find(".shutoff-disabled").prop('disabled', !vmRunningBool ); + guestActions.find(".running-disabled").prop('disabled', vmRunningBool ); if (vmRunningBool) { guestActions.find(".running-hidden").hide(); @@ -276,21 +323,81 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { } //Setup action event handlers - guestActions.find("[name=vm-start]").on({click : kimchi.vmstart}); - guestActions.find("[name=vm-poweroff]").on({click : kimchi.vmpoweroff}); - if (vmRunningBool) { //If the guest is not running, do not enable reset - guestActions.find("[name=vm-reset]").on({click : kimchi.vmreset}); - } - if (vmRunningBool) { //If the guest is not running, do not enable shutdown - guestActions.find("[name=vm-shutdown]").on({click : kimchi.vmshutdown}); - } - guestActions.find("[name=vm-edit]").on({click : kimchi.vmedit}); - guestActions.find("[name=vm-delete]").on({click : kimchi.vmdelete}); + if(!vmObject.isCloning){ + guestActions.find("[name=vm-start]").on({click : kimchi.vmstart}); + guestActions.find("[name=vm-poweroff]").on({click : kimchi.vmpoweroff}); + if (vmRunningBool) { //If the guest is not running, do not enable reset + guestActions.find("[name=vm-reset]").on({click : kimchi.vmreset}); + } + if (vmRunningBool) { //If the guest is not running, do not enable shutdown + guestActions.find("[name=vm-shutdown]").on({click : kimchi.vmshutdown}); + } + guestActions.find("[name=vm-edit]").on({click : kimchi.vmedit}); + guestActions.find("[name=vm-delete]").on({click : kimchi.vmdelete}); + guestActions.find("[name=vm-clone]").click(function(){ + var guest = $(this).closest('li[name=guest]').attr("id"); + kimchi.listVMStorages({ + vm: guest, + storageType: 'disk' + }, function(disks){ + var guestStorage = {}; + for(var i=0; i<disks.length; i++){ + if(disks[i].pool && disks[i].pool!=""){ + var pool, volume; + kimchi.getStoragePool(disks[i].pool, function(data){ + pool = data; + }, undefined, false); + kimchi.getStoragePoolVolume(disks[i].pool, disks[i].vol, function(data){ + volume = data; + }, undefined, false); + if(!guestStorage[pool.name]){ + guestStorage[pool.name] = { + pool: pool, + volumes: [volume], + totalVolumeSize: volume.capacity + }; + }else{ + guestStorage[pool.name].volumes.push(volume); + guestStorage[pool.name].totalVolumeSize += volume.capacity; + } + } + } + var needConfirm = false; + for(x in guestStorage){ + if(guestStorage[x].pool.type.indexOf('scsi')!=-1||guestStorage[x].pool.available<guestStorage[x].totalVolumeSize){ + needConfirm = true; + break; + } + } + if(needConfirm){ + kimchi.confirm({ + title : i18n['KCHAPI6006M'], + content : i18n['KCHVM6010M'], + confirm : i18n['KCHAPI6002M'], + cancel : i18n['KCHAPI6003M'] + }, function() { + kimchi.cloneGuest(guest, function(data){ + kimchi.listVmsAuto(); + }); + }, null); + }else{ + kimchi.cloneGuest(guest, function(data){ + kimchi.listVmsAuto(); + }); + } + }); + }); + + //Maintain menu open state + var actionMenu=guestActions.find("div[name=actionmenu]"); + if (openMenu) { + $('.popover', actionMenu).toggle(); + } - //Maintain menu open state - var actionMenu=guestActions.find("div[name=actionmenu]"); - if (openMenu) { - $('.popover', actionMenu).toggle(); + }else{ + guestActions.find('.btn').attr('disabled', true); + result.find('.guest-clone').removeClass('hide-content'); + $('.popover', guestActions.find("div[name=actionmenu]")).remove(); } return result; diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl index 43fb350..74206fd 100644 --- a/ui/pages/guest.html.tmpl +++ b/ui/pages/guest.html.tmpl @@ -26,6 +26,9 @@ <div class="guest-general"> <h2 class="title" title="{name}">{name}</h2> </div> + <div class="guest-clone hide-content"> + <span class="icon"></span><span class="text">$_("Cloning")...</span> + </div> </div> <div name="cpu_utilization" class="sortable"> <div class="circleGauge"></div> @@ -56,7 +59,8 @@ <span class="text">$_("Actions")</span><span class="arrow"></span> <div class="popover actionsheet right-side" style="width: 250px"> <button class="button-big shutoff-disabled" name="vm-console" ><span class="text">$_("Connect")</span></button> - <button class="button-big running-disabled" name="vm-edit"><span class="text">$_("Edit")</span></button> + <button class="button-big running-disabled" name="vm-clone"><span class="text">$_("Clone")</span></button> + <button class="button-big" name="vm-edit"><span class="text">$_("Edit")</span></button> <button class="button-big shutoff-hidden" name="vm-reset"><span class="text">$_("Reset")</span></button> <button class="button-big shutoff-hidden" name="vm-shutdown"><span class="text">$_("Shut Down")</span></button> <button class="button-big running-hidden" name="vm-start"><span class="text">$_("Start")</span></button> diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 75f1e43..56abd36 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -128,6 +128,7 @@ "KCHVM6007M": "$_("Note the guest OS may ignore this request. Would you like to continue?")", "KCHVM6008M": "$_("Virtual Machine delete Confirmation")", "KCHVM6009M": "$_("This virtual machine is not persistent. Power Off will delete it. Continue?")", + "KCHVM6010M": "$_("When the target guest has SCSI or iSCSI volumes, they will be cloned on default storage pool. The same will happen when the target pool does not have enough space to clone the volumes. Do you want to continue?")", "KCHVMCD6001M": "$_("This CDROM will be detached permanently and you can re-attach it. Continue to detach it?")", "KCHVMCD6002M": "$_("Attach")", -- 1.7.1

1 0

[PATCH v1] Auto Topology for Guest Templates
by Christy Perez 05 Nov '14

05 Nov '14

This patchset is not completely tested, but I'd like feedback on broad concepts, and also to share my methodology with the UI team. If you read the comments (which I'lld delete in the final version), there are some suggestions for how I intend this to interoperate with the UI. In the future, I'd also like to combine the rest of the CPU info scattered across at least the host class and use this new CPUInfoModel instead. But for now, I'd like to focus on getting the backend logic working so that the user can create a template that has an auto-created topology. Christy Perez (1): Parts to allow Kimchi to configure the cpu topology. docs/API.md | 2 + src/kimchi/API.json | 6 ++ src/kimchi/control/cpuinfo.py | 37 +++++++++ src/kimchi/i18n.py | 2 + src/kimchi/model/cpuinfo.py | 176 ++++++++++++++++++++++++++++++++++++++++++ src/kimchi/model/host.py | 1 + src/kimchi/model/templates.py | 13 +++- 7 files changed, 236 insertions(+), 1 deletion(-) create mode 100644 src/kimchi/control/cpuinfo.py create mode 100644 src/kimchi/model/cpuinfo.py -- 1.9.3

2 5

[PATCH 0/8] Clone virtual machines
by Crístian Viana 05 Nov '14

05 Nov '14

Crístian Viana (8): Make function "randomMAC" public Allow updating XML attribute in "xml_item_update" Render different types of data in generate_action_handler Add model function to wait for task Clean up test pool directories Create storage volume based on an existing volume Clone virtual machines Add tests and mockmodel for the cloning feature docs/API.md | 8 + src/kimchi/API.json | 5 + src/kimchi/control/base.py | 37 +++-- src/kimchi/control/host.py | 18 +-- src/kimchi/control/vms.py | 1 + src/kimchi/i18n.py | 4 + src/kimchi/mockmodel.py | 102 ++++++++++++- src/kimchi/model/storagevolumes.py | 73 ++++++++- src/kimchi/model/tasks.py | 28 ++++ src/kimchi/model/vmifaces.py | 18 +-- src/kimchi/model/vms.py | 297 ++++++++++++++++++++++++++++++++++++- src/kimchi/xmlutils/utils.py | 7 +- tests/test_model.py | 83 +++++++++-- tests/test_rest.py | 54 +++++++ 14 files changed, 682 insertions(+), 53 deletions(-) -- 1.9.3

2 30

[v1 0/1]Migrate virtual machines
by Simon Jin 05 Nov '14

05 Nov '14

This patch maybe bugy, only send out to get your early comments Simon Jin (1): Migrate virtual machines docs/API.md | 3 +- src/kimchi/control/vms.py | 1 + src/kimchi/exception.py | 3 + src/kimchi/i18n.py | 11 ++++ src/kimchi/model/vms.py | 138 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 155 insertions(+), 1 deletion(-) -- 1.8.3.1

3 4

Why Disable upload option
by ssdxiao 04 Nov '14

04 Nov '14

Hi kimchier, I am happy to see the feature "upload volume" is supported in kimchi but I found the button is disabled， is there any problem? Now kimchi only supports nginx by default now. Is there any plan to support other web server? For example: lighttpd, apache and so on.

2 3

[PATCH V3] Guest disk hot plug UI
by Wen Wang 04 Nov '14

04 Nov '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V2 -> V3: Minor changes according to JQuery rules. V1 -> V2: Enable CDROM hot plug including detaching. Enable users add and detach disk when vm is running. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 29 +++++++++++------------------ 1 files changed, 11 insertions(+), 18 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 030e112..fba7f05 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -57,17 +57,12 @@ kimchi.guest_edit_main = function() { text: false }); - if(kimchi.thisVMState != "running") { - $('.detach', container).button({ - icons: { - primary: 'ui-icon-trash' - }, - text: false - }); - - } else { - $('.detach', container).remove(); - } + $('.detach', container).button({ + icons: { + primary: 'ui-icon-trash' + }, + text: false + }); $('.save', container).button({ icons: { @@ -443,14 +438,8 @@ kimchi.guest_edit_main = function() { guest['icon'] = guest['icon'] || 'images/icon-vm.png'; $('#form-guest-edit-general').fillWithObject(guest); kimchi.thisVMState = guest['state']; - refreshCDROMs(); - if(kimchi.thisVMState === "running") { - $("#form-guest-edit-general input").prop("disabled", "disabled"); - $("#guest-edit-attach-cdrom-button").remove(); - $("#form-guest-edit-interface .header button").remove(); - } else { - $('#guest-edit-attach-cdrom-button').button({ + $('#guest-edit-attach-cdrom-button').button({ icons: { primary: "ui-icon-plusthick" }, @@ -459,6 +448,10 @@ kimchi.guest_edit_main = function() { event.preventDefault(); kimchi.window.open("guest-storage-add.html"); }); + if(kimchi.thisVMState === "running") { + $("#form-guest-edit-general input").prop("disabled", true); + $("#form-guest-edit-interface .header button").remove(); + } else { $("#action-button-container").removeClass("hidden"); } -- 1.7.1

3 5

[PATCH V4] Guest disk hot plug UI
by Wen Wang 04 Nov '14

04 Nov '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V3 -> v4: Disable CDROM hotplug due to back-end limitatiions V2 -> V3: Minor changes according to JQuery rules. V1 -> V2: Enable CDROM hot plug including detaching. Enable users add and detach disk when vm is running. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 30 ++++++++++++--------------- ui/js/src/kimchi.guest_storage_add.main.js | 18 +++++++++++++--- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index ed8c689..9d87a73 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -57,16 +57,14 @@ kimchi.guest_edit_main = function() { text: false }); - if(kimchi.thisVMState != "running") { - $('.detach', container).button({ - icons: { - primary: 'ui-icon-trash' - }, - text: false - }); - - } else { - $('.detach', container).remove(); + $('.detach', container).button({ + icons: { + primary: 'ui-icon-trash' + }, + text: false + }); + if (kimchi.thisVMState === 'running') { + $('.detach[data-type="cdrom"]', container).remove(); } $('.save', container).button({ @@ -467,14 +465,8 @@ kimchi.guest_edit_main = function() { guest['icon'] = guest['icon'] || 'images/icon-vm.png'; $('#form-guest-edit-general').fillWithObject(guest); kimchi.thisVMState = guest['state']; - refreshCDROMs(); - if(kimchi.thisVMState === "running") { - $("#form-guest-edit-general input").prop("disabled", "disabled"); - $("#guest-edit-attach-cdrom-button").remove(); - $("#form-guest-edit-interface .header button").remove(); - } else { - $('#guest-edit-attach-cdrom-button').button({ + $('#guest-edit-attach-cdrom-button').button({ icons: { primary: "ui-icon-plusthick" }, @@ -483,6 +475,10 @@ kimchi.guest_edit_main = function() { event.preventDefault(); kimchi.window.open("guest-storage-add.html"); }); + if(kimchi.thisVMState === "running") { + $("#form-guest-edit-general input").prop("disabled", true); + $("#form-guest-edit-interface .header button").remove(); + } else { $("#action-button-container").removeClass("hidden"); } diff --git a/ui/js/src/kimchi.guest_storage_add.main.js b/ui/js/src/kimchi.guest_storage_add.main.js index 57eed6a..5df5625 100644 --- a/ui/js/src/kimchi.guest_storage_add.main.js +++ b/ui/js/src/kimchi.guest_storage_add.main.js @@ -24,7 +24,10 @@ kimchi.guest_storage_add_main = function() { label: 'disk', value: 'disk', }]; - kimchi.select('guest-storage-type-list', types); + var typesRunning = [{ + label: 'disk', + value: 'disk' + }]; var storageAddForm = $('#form-guest-storage-add'); var submitButton = $('#guest-storage-button-add'); @@ -32,10 +35,8 @@ kimchi.guest_storage_add_main = function() { var pathTextbox = $('input[name="path"]', storageAddForm); var poolTextbox = $('input[name="pool"]', storageAddForm); var volTextbox = $('input[name="vol"]', storageAddForm); - var selectType = $(typeTextbox).val(); typeTextbox.change(function() { - $('#guest-storage-bus').selectMenu(); var pathObject = {'cdrom': ".path-section", 'disk': '.volume-section'} selectType = $(this).val(); $.each(pathObject, function(type, value) { @@ -84,7 +85,7 @@ kimchi.guest_storage_add_main = function() { options.push({ label: value.name, value: value.name - }); + }); } }); if (options.length) { @@ -109,6 +110,15 @@ kimchi.guest_storage_add_main = function() { }); }); + if (kimchi.thisVMState === 'running') { + types =typesRunning; + $(typeTextbox).val('disk'); + typeTextbox.change(); + poolTextbox.change(); + } + var selectType = $(typeTextbox).val(); + kimchi.select('guest-storage-type-list', types); + var validateCDROM = function(settings) { if (/^((https|http|ftp|ftps|tftp|\/).*)+$/.test(settings['path'])) return true; -- 1.7.1

2 1

[v4] UI: Clone Guest
by huoyuxin＠linux.vnet.ibm.com 04 Nov '14

04 Nov '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/button.css | 4 ++ ui/css/theme-default/list.css | 18 ++++++ ui/js/src/kimchi.api.js | 17 +++++- ui/js/src/kimchi.guest_main.js | 111 +++++++++++++++++++++++++++++++-------- ui/pages/guest.html.tmpl | 6 ++- ui/pages/i18n.json.tmpl | 1 + 6 files changed, 132 insertions(+), 25 deletions(-) diff --git a/ui/css/theme-default/button.css b/ui/css/theme-default/button.css index 499bf4a..0df53a6 100644 --- a/ui/css/theme-default/button.css +++ b/ui/css/theme-default/button.css @@ -50,6 +50,10 @@ cursor: pointer; } +.btn[disabled] { + opacity: 0.3; +} + .btn:not([disabled]):hover { box-shadow: -2px -2px 2px #dadada, 2px 2px 2px #fff, 3px 3px 3px white inset, -3px -3px 3px rgba(0, 0, 0, .25) inset; diff --git a/ui/css/theme-default/list.css b/ui/css/theme-default/list.css index 8ffee69..fc3017b 100644 --- a/ui/css/theme-default/list.css +++ b/ui/css/theme-default/list.css @@ -275,3 +275,21 @@ text-shadow: -1px -1px 1px #ccc, 1px 1px 1px #fff; padding-left: 10px; } + +.guest-clone { + margin: 10px; +} + +.guest-clone .icon { + background: url('../../images/theme-default/loading.gif') no-repeat; + display: inline-block; + width: 20px; + height: 20px; + vertical-align: middle; +} + +.guest-clone .text { + color: #666666; + margin-left: 5px; + text-shadow: -1px -1px 1px #CCCCCC, 1px 1px 1px #FFFFFF; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 5895a07..2f90219 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -695,10 +695,10 @@ var kimchi = { }, 2000); break; case 'finished': - suc(result); + suc && suc(result); break; case 'failed': - err(result); + err && err(result); break; default: break; @@ -1233,5 +1233,18 @@ var kimchi = { success : suc, error : err }); + }, + + cloneGuest: function(vm, suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'vms/'+encodeURIComponent(vm)+"/clone", + type : 'POST', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); } }; diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index dbe8753..2fd5c55 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -15,6 +15,34 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +kimchi.sampleGuestObject = { + "name": "", + "uuid": "", + "state": "shutoff", + "persistent": true, + "icon": null, + "cpus": 0, + "memory": 0, + "stats": { + "net_throughput": 0, + "io_throughput_peak": 100, + "cpu_utilization": 0, + "io_throughput": 0, + "net_throughput_peak": 100 + }, + "screenshot": null, + "graphics": { + "passwd": null, + "passwdValidTo": null, + "type": "vnc", + "port": null, + "listen": "127.0.0.1" + }, + "users": [], + "groups": [], + "access": "full" +}; + kimchi.vmstart = function(event) { var button=$(this); @@ -173,8 +201,24 @@ kimchi.listVmsAuto = function() { if (kimchi.vmTimeout) { clearTimeout(kimchi.vmTimeout); } + var getCloningGuests = function(){ + var guests = []; + kimchi.getTasksByFilter('status=running&target_uri='+encodeURIComponent('^/vms/*'), function(tasks) { + for(var i=0;i<tasks.length;i++){ + var guestUri = tasks[i].target_uri; + var guestName = guestUri.substring(guestUri.lastIndexOf('/')+1, guestUri.length); + guests.push($.extend({}, kimchi.sampleGuestObject, {name: guestName, isCloning: true})); + if(kimchi.trackingTasks.indexOf(tasks[i].id)==-1) + kimchi.trackTask(tasks[i].id, null, function(err){ + kimchi.message.error(err.message); + }, null); + } + }, null, true); + return guests; + }; kimchi.listVMs(function(result, textStatus, jqXHR) { if (result && textStatus=="success") { + result = getCloningGuests().concat(result); if(result.length) { var listHtml = ''; var guestTemplate = kimchi.guestTemplate; @@ -233,14 +277,16 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { imgLoad.attr('src',load_src); //Link the stopped tile to the start action, the running tile to open the console - if (vmRunningBool) { - liveTile.off("click", kimchi.vmstart); - liveTile.on("click", kimchi.openVmConsole); - } - else { - liveTile.off("click", kimchi.openVmConsole); - liveTile.on("click", kimchi.vmstart); - liveTile.hover(function(event){$(this).find('.overlay').show()}, function(event){$(this).find('.overlay').hide()}); + if(!vmObject.isCloning){ + if (vmRunningBool) { + liveTile.off("click", kimchi.vmstart); + liveTile.on("click", kimchi.openVmConsole); + } + else { + liveTile.off("click", kimchi.openVmConsole); + liveTile.on("click", kimchi.vmstart); + liveTile.hover(function(event){$(this).find('.overlay').show()}, function(event){$(this).find('.overlay').hide()}); + } } @@ -257,6 +303,7 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { //Setup the VM Actions var guestActions=result.find("div[name=guest-actions]"); guestActions.find(".shutoff-disabled").prop('disabled', !vmRunningBool ); + guestActions.find(".running-disabled").prop('disabled', vmRunningBool ); if (vmRunningBool) { guestActions.find(".running-hidden").hide(); @@ -276,21 +323,41 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { } //Setup action event handlers - guestActions.find("[name=vm-start]").on({click : kimchi.vmstart}); - guestActions.find("[name=vm-poweroff]").on({click : kimchi.vmpoweroff}); - if (vmRunningBool) { //If the guest is not running, do not enable reset - guestActions.find("[name=vm-reset]").on({click : kimchi.vmreset}); - } - if (vmRunningBool) { //If the guest is not running, do not enable shutdown - guestActions.find("[name=vm-shutdown]").on({click : kimchi.vmshutdown}); - } - guestActions.find("[name=vm-edit]").on({click : kimchi.vmedit}); - guestActions.find("[name=vm-delete]").on({click : kimchi.vmdelete}); + if(!vmObject.isCloning){ + guestActions.find("[name=vm-start]").on({click : kimchi.vmstart}); + guestActions.find("[name=vm-poweroff]").on({click : kimchi.vmpoweroff}); + if (vmRunningBool) { //If the guest is not running, do not enable reset + guestActions.find("[name=vm-reset]").on({click : kimchi.vmreset}); + } + if (vmRunningBool) { //If the guest is not running, do not enable shutdown + guestActions.find("[name=vm-shutdown]").on({click : kimchi.vmshutdown}); + } + guestActions.find("[name=vm-edit]").on({click : kimchi.vmedit}); + guestActions.find("[name=vm-delete]").on({click : kimchi.vmdelete}); + guestActions.find("[name=vm-clone]").click(function(){ + var guest = $(this).closest('li[name=guest]').attr("id"); + kimchi.confirm({ + title : i18n['KCHAPI6006M'], + content : i18n['KCHVM6010M'], + confirm : i18n['KCHAPI6002M'], + cancel : i18n['KCHAPI6003M'] + }, function() { + kimchi.cloneGuest(guest, function(data){ + kimchi.listVmsAuto(); + }); + }, null); + }); + + //Maintain menu open state + var actionMenu=guestActions.find("div[name=actionmenu]"); + if (openMenu) { + $('.popover', actionMenu).toggle(); + } - //Maintain menu open state - var actionMenu=guestActions.find("div[name=actionmenu]"); - if (openMenu) { - $('.popover', actionMenu).toggle(); + }else{ + guestActions.find('.btn').attr('disabled', true); + result.find('.guest-clone').removeClass('hide-content'); + $('.popover', guestActions.find("div[name=actionmenu]")).remove(); } return result; diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl index 43fb350..74206fd 100644 --- a/ui/pages/guest.html.tmpl +++ b/ui/pages/guest.html.tmpl @@ -26,6 +26,9 @@ <div class="guest-general"> <h2 class="title" title="{name}">{name}</h2> </div> + <div class="guest-clone hide-content"> + <span class="icon"></span><span class="text">$_("Cloning")...</span> + </div> </div> <div name="cpu_utilization" class="sortable"> <div class="circleGauge"></div> @@ -56,7 +59,8 @@ <span class="text">$_("Actions")</span><span class="arrow"></span> <div class="popover actionsheet right-side" style="width: 250px"> <button class="button-big shutoff-disabled" name="vm-console" ><span class="text">$_("Connect")</span></button> - <button class="button-big running-disabled" name="vm-edit"><span class="text">$_("Edit")</span></button> + <button class="button-big running-disabled" name="vm-clone"><span class="text">$_("Clone")</span></button> + <button class="button-big" name="vm-edit"><span class="text">$_("Edit")</span></button> <button class="button-big shutoff-hidden" name="vm-reset"><span class="text">$_("Reset")</span></button> <button class="button-big shutoff-hidden" name="vm-shutdown"><span class="text">$_("Shut Down")</span></button> <button class="button-big running-hidden" name="vm-start"><span class="text">$_("Start")</span></button> diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 75f1e43..56abd36 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -128,6 +128,7 @@ "KCHVM6007M": "$_("Note the guest OS may ignore this request. Would you like to continue?")", "KCHVM6008M": "$_("Virtual Machine delete Confirmation")", "KCHVM6009M": "$_("This virtual machine is not persistent. Power Off will delete it. Continue?")", + "KCHVM6010M": "$_("When the target guest has SCSI or iSCSI volumes, they will be cloned on default storage pool. The same will happen when the target pool does not have enough space to clone the volumes. Do you want to continue?")", "KCHVMCD6001M": "$_("This CDROM will be detached permanently and you can re-attach it. Continue to detach it?")", "KCHVMCD6002M": "$_("Attach")", -- 1.7.1

3 2

[v5] UI: Clone Guest(with precheck)
by huoyuxin＠linux.vnet.ibm.com 04 Nov '14

04 Nov '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/button.css | 4 + ui/css/theme-default/list.css | 18 +++++ ui/js/src/kimchi.api.js | 34 ++++++++- ui/js/src/kimchi.guest_main.js | 149 +++++++++++++++++++++++++++++++++------ ui/pages/guest.html.tmpl | 6 ++- ui/pages/i18n.json.tmpl | 1 + 6 files changed, 186 insertions(+), 26 deletions(-) diff --git a/ui/css/theme-default/button.css b/ui/css/theme-default/button.css index 499bf4a..0df53a6 100644 --- a/ui/css/theme-default/button.css +++ b/ui/css/theme-default/button.css @@ -50,6 +50,10 @@ cursor: pointer; } +.btn[disabled] { + opacity: 0.3; +} + .btn:not([disabled]):hover { box-shadow: -2px -2px 2px #dadada, 2px 2px 2px #fff, 3px 3px 3px white inset, -3px -3px 3px rgba(0, 0, 0, .25) inset; diff --git a/ui/css/theme-default/list.css b/ui/css/theme-default/list.css index 8ffee69..ded18eb 100644 --- a/ui/css/theme-default/list.css +++ b/ui/css/theme-default/list.css @@ -275,3 +275,21 @@ text-shadow: -1px -1px 1px #ccc, 1px 1px 1px #fff; padding-left: 10px; } + +.guest-clone { + margin: 10px; +} + +.guest-clone .icon { + background: url('../../images/theme-default/kimchi-loading15x15.gif') no-repeat; + display: inline-block; + width: 20px; + height: 20px; + vertical-align: middle; +} + +.guest-clone .text { + color: #666666; + margin-left: 5px; + text-shadow: -1px -1px 1px #CCCCCC, 1px 1px 1px #FFFFFF; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 5895a07..465755c 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -695,10 +695,10 @@ var kimchi = { }, 2000); break; case 'finished': - suc(result); + suc && suc(result); break; case 'failed': - err(result); + err && err(result); break; default: break; @@ -806,12 +806,27 @@ var kimchi = { }); }, - getStoragePoolVolume: function(poolName, volumeName, suc, err) { + getStoragePool: function(poolName, suc, err, async) { + var url = kimchi.url + 'storagepools/' + encodeURIComponent(poolName); + kimchi.requestJSON({ + url : url, + type : 'GET', + contentType : 'application/json', + async : async==undefined?true:async, + timeout: 2000, + dataType : 'json', + success : suc, + error : err + }); + }, + + getStoragePoolVolume: function(poolName, volumeName, suc, err, async) { var url = kimchi.url + 'storagepools/' + encodeURIComponent(poolName) + '/storagevolumes/' + encodeURIComponent(volumeName); kimchi.requestJSON({ url : url, type : 'GET', contentType : 'application/json', + async : async==undefined?true:async, timeout: 2000, dataType : 'json', success : suc, @@ -1233,5 +1248,18 @@ var kimchi = { success : suc, error : err }); + }, + + cloneGuest: function(vm, suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'vms/'+encodeURIComponent(vm)+"/clone", + type : 'POST', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); } }; diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index dbe8753..48e71f7 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -15,6 +15,34 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +kimchi.sampleGuestObject = { + "name": "", + "uuid": "", + "state": "shutoff", + "persistent": true, + "icon": null, + "cpus": 0, + "memory": 0, + "stats": { + "net_throughput": 0, + "io_throughput_peak": 100, + "cpu_utilization": 0, + "io_throughput": 0, + "net_throughput_peak": 100 + }, + "screenshot": null, + "graphics": { + "passwd": null, + "passwdValidTo": null, + "type": "vnc", + "port": null, + "listen": "127.0.0.1" + }, + "users": [], + "groups": [], + "access": "full" +}; + kimchi.vmstart = function(event) { var button=$(this); @@ -173,8 +201,24 @@ kimchi.listVmsAuto = function() { if (kimchi.vmTimeout) { clearTimeout(kimchi.vmTimeout); } + var getCloningGuests = function(){ + var guests = []; + kimchi.getTasksByFilter('status=running&target_uri='+encodeURIComponent('^/vms/*'), function(tasks) { + for(var i=0;i<tasks.length;i++){ + var guestUri = tasks[i].target_uri; + var guestName = guestUri.substring(guestUri.lastIndexOf('/')+1, guestUri.length); + guests.push($.extend({}, kimchi.sampleGuestObject, {name: guestName, isCloning: true})); + if(kimchi.trackingTasks.indexOf(tasks[i].id)==-1) + kimchi.trackTask(tasks[i].id, null, function(err){ + kimchi.message.error(err.message); + }, null); + } + }, null, true); + return guests; + }; kimchi.listVMs(function(result, textStatus, jqXHR) { if (result && textStatus=="success") { + result = getCloningGuests().concat(result); if(result.length) { var listHtml = ''; var guestTemplate = kimchi.guestTemplate; @@ -233,14 +277,16 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { imgLoad.attr('src',load_src); //Link the stopped tile to the start action, the running tile to open the console - if (vmRunningBool) { - liveTile.off("click", kimchi.vmstart); - liveTile.on("click", kimchi.openVmConsole); - } - else { - liveTile.off("click", kimchi.openVmConsole); - liveTile.on("click", kimchi.vmstart); - liveTile.hover(function(event){$(this).find('.overlay').show()}, function(event){$(this).find('.overlay').hide()}); + if(!vmObject.isCloning){ + if (vmRunningBool) { + liveTile.off("click", kimchi.vmstart); + liveTile.on("click", kimchi.openVmConsole); + } + else { + liveTile.off("click", kimchi.openVmConsole); + liveTile.on("click", kimchi.vmstart); + liveTile.hover(function(event){$(this).find('.overlay').show()}, function(event){$(this).find('.overlay').hide()}); + } } @@ -257,6 +303,7 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { //Setup the VM Actions var guestActions=result.find("div[name=guest-actions]"); guestActions.find(".shutoff-disabled").prop('disabled', !vmRunningBool ); + guestActions.find(".running-disabled").prop('disabled', vmRunningBool ); if (vmRunningBool) { guestActions.find(".running-hidden").hide(); @@ -276,21 +323,79 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { } //Setup action event handlers - guestActions.find("[name=vm-start]").on({click : kimchi.vmstart}); - guestActions.find("[name=vm-poweroff]").on({click : kimchi.vmpoweroff}); - if (vmRunningBool) { //If the guest is not running, do not enable reset - guestActions.find("[name=vm-reset]").on({click : kimchi.vmreset}); - } - if (vmRunningBool) { //If the guest is not running, do not enable shutdown - guestActions.find("[name=vm-shutdown]").on({click : kimchi.vmshutdown}); - } - guestActions.find("[name=vm-edit]").on({click : kimchi.vmedit}); - guestActions.find("[name=vm-delete]").on({click : kimchi.vmdelete}); + if(!vmObject.isCloning){ + guestActions.find("[name=vm-start]").on({click : kimchi.vmstart}); + guestActions.find("[name=vm-poweroff]").on({click : kimchi.vmpoweroff}); + if (vmRunningBool) { //If the guest is not running, do not enable reset + guestActions.find("[name=vm-reset]").on({click : kimchi.vmreset}); + } + if (vmRunningBool) { //If the guest is not running, do not enable shutdown + guestActions.find("[name=vm-shutdown]").on({click : kimchi.vmshutdown}); + } + guestActions.find("[name=vm-edit]").on({click : kimchi.vmedit}); + guestActions.find("[name=vm-delete]").on({click : kimchi.vmdelete}); + guestActions.find("[name=vm-clone]").click(function(){ + var guest = $(this).closest('li[name=guest]').attr("id"); + kimchi.listVMStorages({ + vm: guest, + storageType: 'disk' + }, function(disks){ + var guestStorage = {}; + for(var i=0; i<disks.length; i++){ + var pool, volume; + kimchi.getStoragePool(disks[i].pool, function(data){ + pool = data; + }, undefined, false); + kimchi.getStoragePoolVolume(disks[i].pool, disks[i].vol, function(data){ + volume = data; + }, undefined, false); + if(!guestStorage[pool.name]){ + guestStorage[pool.name] = { + pool: pool, + volumes: [volume], + totalVolumeSize: volume.capacity + }; + }else{ + guestStorage[pool.name].volumes.push(volume); + guestStorage[pool.name].totalVolumeSize += volume.capacity; + } + } + var needConfirm = false; + for(x in guestStorage){ + if(guestStorage[x].pool.type.indexOf('scsi')!=-1||guestStorage[x].pool.available<guestStorage[x].totalVolumeSize){ + needConfirm = true; + break; + } + } + if(needConfirm){ + kimchi.confirm({ + title : i18n['KCHAPI6006M'], + content : i18n['KCHVM6010M'], + confirm : i18n['KCHAPI6002M'], + cancel : i18n['KCHAPI6003M'] + }, function() { + kimchi.cloneGuest(guest, function(data){ + kimchi.listVmsAuto(); + }); + }, null); + }else{ + kimchi.cloneGuest(guest, function(data){ + kimchi.listVmsAuto(); + }); + } + }); + }); + + //Maintain menu open state + var actionMenu=guestActions.find("div[name=actionmenu]"); + if (openMenu) { + $('.popover', actionMenu).toggle(); + } - //Maintain menu open state - var actionMenu=guestActions.find("div[name=actionmenu]"); - if (openMenu) { - $('.popover', actionMenu).toggle(); + }else{ + guestActions.find('.btn').attr('disabled', true); + result.find('.guest-clone').removeClass('hide-content'); + $('.popover', guestActions.find("div[name=actionmenu]")).remove(); } return result; diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl index 43fb350..74206fd 100644 --- a/ui/pages/guest.html.tmpl +++ b/ui/pages/guest.html.tmpl @@ -26,6 +26,9 @@ <div class="guest-general"> <h2 class="title" title="{name}">{name}</h2> </div> + <div class="guest-clone hide-content"> + <span class="icon"></span><span class="text">$_("Cloning")...</span> + </div> </div> <div name="cpu_utilization" class="sortable"> <div class="circleGauge"></div> @@ -56,7 +59,8 @@ <span class="text">$_("Actions")</span><span class="arrow"></span> <div class="popover actionsheet right-side" style="width: 250px"> <button class="button-big shutoff-disabled" name="vm-console" ><span class="text">$_("Connect")</span></button> - <button class="button-big running-disabled" name="vm-edit"><span class="text">$_("Edit")</span></button> + <button class="button-big running-disabled" name="vm-clone"><span class="text">$_("Clone")</span></button> + <button class="button-big" name="vm-edit"><span class="text">$_("Edit")</span></button> <button class="button-big shutoff-hidden" name="vm-reset"><span class="text">$_("Reset")</span></button> <button class="button-big shutoff-hidden" name="vm-shutdown"><span class="text">$_("Shut Down")</span></button> <button class="button-big running-hidden" name="vm-start"><span class="text">$_("Start")</span></button> diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 75f1e43..56abd36 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -128,6 +128,7 @@ "KCHVM6007M": "$_("Note the guest OS may ignore this request. Would you like to continue?")", "KCHVM6008M": "$_("Virtual Machine delete Confirmation")", "KCHVM6009M": "$_("This virtual machine is not persistent. Power Off will delete it. Continue?")", + "KCHVM6010M": "$_("When the target guest has SCSI or iSCSI volumes, they will be cloned on default storage pool. The same will happen when the target pool does not have enough space to clone the volumes. Do you want to continue?")", "KCHVMCD6001M": "$_("This CDROM will be detached permanently and you can re-attach it. Continue to detach it?")", "KCHVMCD6002M": "$_("Attach")", -- 1.7.1

1 0

[v5] UI: Clone Guest(static message)
by huoyuxin＠linux.vnet.ibm.com 04 Nov '14

04 Nov '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/button.css | 4 ++ ui/css/theme-default/list.css | 18 ++++++ ui/js/src/kimchi.api.js | 17 +++++- ui/js/src/kimchi.guest_main.js | 111 +++++++++++++++++++++++++++++++-------- ui/pages/guest.html.tmpl | 6 ++- ui/pages/i18n.json.tmpl | 1 + 6 files changed, 132 insertions(+), 25 deletions(-) diff --git a/ui/css/theme-default/button.css b/ui/css/theme-default/button.css index 499bf4a..0df53a6 100644 --- a/ui/css/theme-default/button.css +++ b/ui/css/theme-default/button.css @@ -50,6 +50,10 @@ cursor: pointer; } +.btn[disabled] { + opacity: 0.3; +} + .btn:not([disabled]):hover { box-shadow: -2px -2px 2px #dadada, 2px 2px 2px #fff, 3px 3px 3px white inset, -3px -3px 3px rgba(0, 0, 0, .25) inset; diff --git a/ui/css/theme-default/list.css b/ui/css/theme-default/list.css index 8ffee69..ded18eb 100644 --- a/ui/css/theme-default/list.css +++ b/ui/css/theme-default/list.css @@ -275,3 +275,21 @@ text-shadow: -1px -1px 1px #ccc, 1px 1px 1px #fff; padding-left: 10px; } + +.guest-clone { + margin: 10px; +} + +.guest-clone .icon { + background: url('../../images/theme-default/kimchi-loading15x15.gif') no-repeat; + display: inline-block; + width: 20px; + height: 20px; + vertical-align: middle; +} + +.guest-clone .text { + color: #666666; + margin-left: 5px; + text-shadow: -1px -1px 1px #CCCCCC, 1px 1px 1px #FFFFFF; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 5895a07..2f90219 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -695,10 +695,10 @@ var kimchi = { }, 2000); break; case 'finished': - suc(result); + suc && suc(result); break; case 'failed': - err(result); + err && err(result); break; default: break; @@ -1233,5 +1233,18 @@ var kimchi = { success : suc, error : err }); + }, + + cloneGuest: function(vm, suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'vms/'+encodeURIComponent(vm)+"/clone", + type : 'POST', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); } }; diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index dbe8753..2fd5c55 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -15,6 +15,34 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +kimchi.sampleGuestObject = { + "name": "", + "uuid": "", + "state": "shutoff", + "persistent": true, + "icon": null, + "cpus": 0, + "memory": 0, + "stats": { + "net_throughput": 0, + "io_throughput_peak": 100, + "cpu_utilization": 0, + "io_throughput": 0, + "net_throughput_peak": 100 + }, + "screenshot": null, + "graphics": { + "passwd": null, + "passwdValidTo": null, + "type": "vnc", + "port": null, + "listen": "127.0.0.1" + }, + "users": [], + "groups": [], + "access": "full" +}; + kimchi.vmstart = function(event) { var button=$(this); @@ -173,8 +201,24 @@ kimchi.listVmsAuto = function() { if (kimchi.vmTimeout) { clearTimeout(kimchi.vmTimeout); } + var getCloningGuests = function(){ + var guests = []; + kimchi.getTasksByFilter('status=running&target_uri='+encodeURIComponent('^/vms/*'), function(tasks) { + for(var i=0;i<tasks.length;i++){ + var guestUri = tasks[i].target_uri; + var guestName = guestUri.substring(guestUri.lastIndexOf('/')+1, guestUri.length); + guests.push($.extend({}, kimchi.sampleGuestObject, {name: guestName, isCloning: true})); + if(kimchi.trackingTasks.indexOf(tasks[i].id)==-1) + kimchi.trackTask(tasks[i].id, null, function(err){ + kimchi.message.error(err.message); + }, null); + } + }, null, true); + return guests; + }; kimchi.listVMs(function(result, textStatus, jqXHR) { if (result && textStatus=="success") { + result = getCloningGuests().concat(result); if(result.length) { var listHtml = ''; var guestTemplate = kimchi.guestTemplate; @@ -233,14 +277,16 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { imgLoad.attr('src',load_src); //Link the stopped tile to the start action, the running tile to open the console - if (vmRunningBool) { - liveTile.off("click", kimchi.vmstart); - liveTile.on("click", kimchi.openVmConsole); - } - else { - liveTile.off("click", kimchi.openVmConsole); - liveTile.on("click", kimchi.vmstart); - liveTile.hover(function(event){$(this).find('.overlay').show()}, function(event){$(this).find('.overlay').hide()}); + if(!vmObject.isCloning){ + if (vmRunningBool) { + liveTile.off("click", kimchi.vmstart); + liveTile.on("click", kimchi.openVmConsole); + } + else { + liveTile.off("click", kimchi.openVmConsole); + liveTile.on("click", kimchi.vmstart); + liveTile.hover(function(event){$(this).find('.overlay').show()}, function(event){$(this).find('.overlay').hide()}); + } } @@ -257,6 +303,7 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { //Setup the VM Actions var guestActions=result.find("div[name=guest-actions]"); guestActions.find(".shutoff-disabled").prop('disabled', !vmRunningBool ); + guestActions.find(".running-disabled").prop('disabled', vmRunningBool ); if (vmRunningBool) { guestActions.find(".running-hidden").hide(); @@ -276,21 +323,41 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { } //Setup action event handlers - guestActions.find("[name=vm-start]").on({click : kimchi.vmstart}); - guestActions.find("[name=vm-poweroff]").on({click : kimchi.vmpoweroff}); - if (vmRunningBool) { //If the guest is not running, do not enable reset - guestActions.find("[name=vm-reset]").on({click : kimchi.vmreset}); - } - if (vmRunningBool) { //If the guest is not running, do not enable shutdown - guestActions.find("[name=vm-shutdown]").on({click : kimchi.vmshutdown}); - } - guestActions.find("[name=vm-edit]").on({click : kimchi.vmedit}); - guestActions.find("[name=vm-delete]").on({click : kimchi.vmdelete}); + if(!vmObject.isCloning){ + guestActions.find("[name=vm-start]").on({click : kimchi.vmstart}); + guestActions.find("[name=vm-poweroff]").on({click : kimchi.vmpoweroff}); + if (vmRunningBool) { //If the guest is not running, do not enable reset + guestActions.find("[name=vm-reset]").on({click : kimchi.vmreset}); + } + if (vmRunningBool) { //If the guest is not running, do not enable shutdown + guestActions.find("[name=vm-shutdown]").on({click : kimchi.vmshutdown}); + } + guestActions.find("[name=vm-edit]").on({click : kimchi.vmedit}); + guestActions.find("[name=vm-delete]").on({click : kimchi.vmdelete}); + guestActions.find("[name=vm-clone]").click(function(){ + var guest = $(this).closest('li[name=guest]').attr("id"); + kimchi.confirm({ + title : i18n['KCHAPI6006M'], + content : i18n['KCHVM6010M'], + confirm : i18n['KCHAPI6002M'], + cancel : i18n['KCHAPI6003M'] + }, function() { + kimchi.cloneGuest(guest, function(data){ + kimchi.listVmsAuto(); + }); + }, null); + }); + + //Maintain menu open state + var actionMenu=guestActions.find("div[name=actionmenu]"); + if (openMenu) { + $('.popover', actionMenu).toggle(); + } - //Maintain menu open state - var actionMenu=guestActions.find("div[name=actionmenu]"); - if (openMenu) { - $('.popover', actionMenu).toggle(); + }else{ + guestActions.find('.btn').attr('disabled', true); + result.find('.guest-clone').removeClass('hide-content'); + $('.popover', guestActions.find("div[name=actionmenu]")).remove(); } return result; diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl index 43fb350..74206fd 100644 --- a/ui/pages/guest.html.tmpl +++ b/ui/pages/guest.html.tmpl @@ -26,6 +26,9 @@ <div class="guest-general"> <h2 class="title" title="{name}">{name}</h2> </div> + <div class="guest-clone hide-content"> + <span class="icon"></span><span class="text">$_("Cloning")...</span> + </div> </div> <div name="cpu_utilization" class="sortable"> <div class="circleGauge"></div> @@ -56,7 +59,8 @@ <span class="text">$_("Actions")</span><span class="arrow"></span> <div class="popover actionsheet right-side" style="width: 250px"> <button class="button-big shutoff-disabled" name="vm-console" ><span class="text">$_("Connect")</span></button> - <button class="button-big running-disabled" name="vm-edit"><span class="text">$_("Edit")</span></button> + <button class="button-big running-disabled" name="vm-clone"><span class="text">$_("Clone")</span></button> + <button class="button-big" name="vm-edit"><span class="text">$_("Edit")</span></button> <button class="button-big shutoff-hidden" name="vm-reset"><span class="text">$_("Reset")</span></button> <button class="button-big shutoff-hidden" name="vm-shutdown"><span class="text">$_("Shut Down")</span></button> <button class="button-big running-hidden" name="vm-start"><span class="text">$_("Start")</span></button> diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 75f1e43..56abd36 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -128,6 +128,7 @@ "KCHVM6007M": "$_("Note the guest OS may ignore this request. Would you like to continue?")", "KCHVM6008M": "$_("Virtual Machine delete Confirmation")", "KCHVM6009M": "$_("This virtual machine is not persistent. Power Off will delete it. Continue?")", + "KCHVM6010M": "$_("When the target guest has SCSI or iSCSI volumes, they will be cloned on default storage pool. The same will happen when the target pool does not have enough space to clone the volumes. Do you want to continue?")", "KCHVMCD6001M": "$_("This CDROM will be detached permanently and you can re-attach it. Continue to detach it?")", "KCHVMCD6002M": "$_("Attach")", -- 1.7.1

1 1

[PATCH] Guest disk hot plug UI
by Wen Wang 04 Nov '14

04 Nov '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V3 -> v4: Disable CDROM hotplug due to back-end limitatiions V2 -> V3: Minor changes according to JQuery rules. V1 -> V2: Enable CDROM hot plug including detaching. Enable users add and detach disk when vm is running. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 30 ++++++++++++--------------- ui/js/src/kimchi.guest_storage_add.main.js | 18 +++++++++++++--- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index ed8c689..9d87a73 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -57,16 +57,14 @@ kimchi.guest_edit_main = function() { text: false }); - if(kimchi.thisVMState != "running") { - $('.detach', container).button({ - icons: { - primary: 'ui-icon-trash' - }, - text: false - }); - - } else { - $('.detach', container).remove(); + $('.detach', container).button({ + icons: { + primary: 'ui-icon-trash' + }, + text: false + }); + if (kimchi.thisVMState === 'running') { + $('.detach[data-type="cdrom"]', container).remove(); } $('.save', container).button({ @@ -467,14 +465,8 @@ kimchi.guest_edit_main = function() { guest['icon'] = guest['icon'] || 'images/icon-vm.png'; $('#form-guest-edit-general').fillWithObject(guest); kimchi.thisVMState = guest['state']; - refreshCDROMs(); - if(kimchi.thisVMState === "running") { - $("#form-guest-edit-general input").prop("disabled", "disabled"); - $("#guest-edit-attach-cdrom-button").remove(); - $("#form-guest-edit-interface .header button").remove(); - } else { - $('#guest-edit-attach-cdrom-button').button({ + $('#guest-edit-attach-cdrom-button').button({ icons: { primary: "ui-icon-plusthick" }, @@ -483,6 +475,10 @@ kimchi.guest_edit_main = function() { event.preventDefault(); kimchi.window.open("guest-storage-add.html"); }); + if(kimchi.thisVMState === "running") { + $("#form-guest-edit-general input").prop("disabled", true); + $("#form-guest-edit-interface .header button").remove(); + } else { $("#action-button-container").removeClass("hidden"); } diff --git a/ui/js/src/kimchi.guest_storage_add.main.js b/ui/js/src/kimchi.guest_storage_add.main.js index 57eed6a..5df5625 100644 --- a/ui/js/src/kimchi.guest_storage_add.main.js +++ b/ui/js/src/kimchi.guest_storage_add.main.js @@ -24,7 +24,10 @@ kimchi.guest_storage_add_main = function() { label: 'disk', value: 'disk', }]; - kimchi.select('guest-storage-type-list', types); + var typesRunning = [{ + label: 'disk', + value: 'disk' + }]; var storageAddForm = $('#form-guest-storage-add'); var submitButton = $('#guest-storage-button-add'); @@ -32,10 +35,8 @@ kimchi.guest_storage_add_main = function() { var pathTextbox = $('input[name="path"]', storageAddForm); var poolTextbox = $('input[name="pool"]', storageAddForm); var volTextbox = $('input[name="vol"]', storageAddForm); - var selectType = $(typeTextbox).val(); typeTextbox.change(function() { - $('#guest-storage-bus').selectMenu(); var pathObject = {'cdrom': ".path-section", 'disk': '.volume-section'} selectType = $(this).val(); $.each(pathObject, function(type, value) { @@ -84,7 +85,7 @@ kimchi.guest_storage_add_main = function() { options.push({ label: value.name, value: value.name - }); + }); } }); if (options.length) { @@ -109,6 +110,15 @@ kimchi.guest_storage_add_main = function() { }); }); + if (kimchi.thisVMState === 'running') { + types =typesRunning; + $(typeTextbox).val('disk'); + typeTextbox.change(); + poolTextbox.change(); + } + var selectType = $(typeTextbox).val(); + kimchi.select('guest-storage-type-list', types); + var validateCDROM = function(settings) { if (/^((https|http|ftp|ftps|tftp|\/).*)+$/.test(settings['path'])) return true; -- 1.7.1

1 1

Hot plug tests fails for scsi-cdrom
by Royce Lv 04 Nov '14

04 Nov '14

After finished patch for scsi cdrom and passed tests against cold plug/vm creation, when I were testing hot plug for cdrom, I got the following error: libvirt: QEMU Driver error : internal error: No device with bus 'scsi' and target 'sda' When debugging and searching, found this reply in libvirt community: https://www.redhat.com/archives/libvirt-users/2013-December/msg00033.html https://www.redhat.com/archives/libvirt-users/2013-December/msg00034.html Quote from libvirt maintainer Daniel B that: " There is no way to hotplug a CDROM device - only disk devices can be hotplugged. For CDROM/Floppy devices it is looking for an existing device with the given name, and then trying to change the removable media in that device. The error you're getting shows that there is no such CDROM device with the name 'vda' in the guest already. " So I think we need to abandon this scsi cdrom patch and just use current ide cdrom. And in UI part, we also need to disable hot plug for cdrom.

3 2

[v3] UI: Clone Guest
by huoyuxin＠linux.vnet.ibm.com 03 Nov '14

03 Nov '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/button.css | 4 + ui/css/theme-default/list.css | 18 +++++ ui/js/src/kimchi.api.js | 34 ++++++++- ui/js/src/kimchi.guest_main.js | 149 +++++++++++++++++++++++++++++++++------ ui/pages/guest.html.tmpl | 6 ++- ui/pages/i18n.json.tmpl | 1 + 6 files changed, 186 insertions(+), 26 deletions(-) diff --git a/ui/css/theme-default/button.css b/ui/css/theme-default/button.css index 499bf4a..0df53a6 100644 --- a/ui/css/theme-default/button.css +++ b/ui/css/theme-default/button.css @@ -50,6 +50,10 @@ cursor: pointer; } +.btn[disabled] { + opacity: 0.3; +} + .btn:not([disabled]):hover { box-shadow: -2px -2px 2px #dadada, 2px 2px 2px #fff, 3px 3px 3px white inset, -3px -3px 3px rgba(0, 0, 0, .25) inset; diff --git a/ui/css/theme-default/list.css b/ui/css/theme-default/list.css index 8ffee69..fc3017b 100644 --- a/ui/css/theme-default/list.css +++ b/ui/css/theme-default/list.css @@ -275,3 +275,21 @@ text-shadow: -1px -1px 1px #ccc, 1px 1px 1px #fff; padding-left: 10px; } + +.guest-clone { + margin: 10px; +} + +.guest-clone .icon { + background: url('../../images/theme-default/loading.gif') no-repeat; + display: inline-block; + width: 20px; + height: 20px; + vertical-align: middle; +} + +.guest-clone .text { + color: #666666; + margin-left: 5px; + text-shadow: -1px -1px 1px #CCCCCC, 1px 1px 1px #FFFFFF; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 5895a07..465755c 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -695,10 +695,10 @@ var kimchi = { }, 2000); break; case 'finished': - suc(result); + suc && suc(result); break; case 'failed': - err(result); + err && err(result); break; default: break; @@ -806,12 +806,27 @@ var kimchi = { }); }, - getStoragePoolVolume: function(poolName, volumeName, suc, err) { + getStoragePool: function(poolName, suc, err, async) { + var url = kimchi.url + 'storagepools/' + encodeURIComponent(poolName); + kimchi.requestJSON({ + url : url, + type : 'GET', + contentType : 'application/json', + async : async==undefined?true:async, + timeout: 2000, + dataType : 'json', + success : suc, + error : err + }); + }, + + getStoragePoolVolume: function(poolName, volumeName, suc, err, async) { var url = kimchi.url + 'storagepools/' + encodeURIComponent(poolName) + '/storagevolumes/' + encodeURIComponent(volumeName); kimchi.requestJSON({ url : url, type : 'GET', contentType : 'application/json', + async : async==undefined?true:async, timeout: 2000, dataType : 'json', success : suc, @@ -1233,5 +1248,18 @@ var kimchi = { success : suc, error : err }); + }, + + cloneGuest: function(vm, suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'vms/'+encodeURIComponent(vm)+"/clone", + type : 'POST', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); } }; diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index dbe8753..48e71f7 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -15,6 +15,34 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +kimchi.sampleGuestObject = { + "name": "", + "uuid": "", + "state": "shutoff", + "persistent": true, + "icon": null, + "cpus": 0, + "memory": 0, + "stats": { + "net_throughput": 0, + "io_throughput_peak": 100, + "cpu_utilization": 0, + "io_throughput": 0, + "net_throughput_peak": 100 + }, + "screenshot": null, + "graphics": { + "passwd": null, + "passwdValidTo": null, + "type": "vnc", + "port": null, + "listen": "127.0.0.1" + }, + "users": [], + "groups": [], + "access": "full" +}; + kimchi.vmstart = function(event) { var button=$(this); @@ -173,8 +201,24 @@ kimchi.listVmsAuto = function() { if (kimchi.vmTimeout) { clearTimeout(kimchi.vmTimeout); } + var getCloningGuests = function(){ + var guests = []; + kimchi.getTasksByFilter('status=running&target_uri='+encodeURIComponent('^/vms/*'), function(tasks) { + for(var i=0;i<tasks.length;i++){ + var guestUri = tasks[i].target_uri; + var guestName = guestUri.substring(guestUri.lastIndexOf('/')+1, guestUri.length); + guests.push($.extend({}, kimchi.sampleGuestObject, {name: guestName, isCloning: true})); + if(kimchi.trackingTasks.indexOf(tasks[i].id)==-1) + kimchi.trackTask(tasks[i].id, null, function(err){ + kimchi.message.error(err.message); + }, null); + } + }, null, true); + return guests; + }; kimchi.listVMs(function(result, textStatus, jqXHR) { if (result && textStatus=="success") { + result = getCloningGuests().concat(result); if(result.length) { var listHtml = ''; var guestTemplate = kimchi.guestTemplate; @@ -233,14 +277,16 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { imgLoad.attr('src',load_src); //Link the stopped tile to the start action, the running tile to open the console - if (vmRunningBool) { - liveTile.off("click", kimchi.vmstart); - liveTile.on("click", kimchi.openVmConsole); - } - else { - liveTile.off("click", kimchi.openVmConsole); - liveTile.on("click", kimchi.vmstart); - liveTile.hover(function(event){$(this).find('.overlay').show()}, function(event){$(this).find('.overlay').hide()}); + if(!vmObject.isCloning){ + if (vmRunningBool) { + liveTile.off("click", kimchi.vmstart); + liveTile.on("click", kimchi.openVmConsole); + } + else { + liveTile.off("click", kimchi.openVmConsole); + liveTile.on("click", kimchi.vmstart); + liveTile.hover(function(event){$(this).find('.overlay').show()}, function(event){$(this).find('.overlay').hide()}); + } } @@ -257,6 +303,7 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { //Setup the VM Actions var guestActions=result.find("div[name=guest-actions]"); guestActions.find(".shutoff-disabled").prop('disabled', !vmRunningBool ); + guestActions.find(".running-disabled").prop('disabled', vmRunningBool ); if (vmRunningBool) { guestActions.find(".running-hidden").hide(); @@ -276,21 +323,79 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { } //Setup action event handlers - guestActions.find("[name=vm-start]").on({click : kimchi.vmstart}); - guestActions.find("[name=vm-poweroff]").on({click : kimchi.vmpoweroff}); - if (vmRunningBool) { //If the guest is not running, do not enable reset - guestActions.find("[name=vm-reset]").on({click : kimchi.vmreset}); - } - if (vmRunningBool) { //If the guest is not running, do not enable shutdown - guestActions.find("[name=vm-shutdown]").on({click : kimchi.vmshutdown}); - } - guestActions.find("[name=vm-edit]").on({click : kimchi.vmedit}); - guestActions.find("[name=vm-delete]").on({click : kimchi.vmdelete}); + if(!vmObject.isCloning){ + guestActions.find("[name=vm-start]").on({click : kimchi.vmstart}); + guestActions.find("[name=vm-poweroff]").on({click : kimchi.vmpoweroff}); + if (vmRunningBool) { //If the guest is not running, do not enable reset + guestActions.find("[name=vm-reset]").on({click : kimchi.vmreset}); + } + if (vmRunningBool) { //If the guest is not running, do not enable shutdown + guestActions.find("[name=vm-shutdown]").on({click : kimchi.vmshutdown}); + } + guestActions.find("[name=vm-edit]").on({click : kimchi.vmedit}); + guestActions.find("[name=vm-delete]").on({click : kimchi.vmdelete}); + guestActions.find("[name=vm-clone]").click(function(){ + var guest = $(this).closest('li[name=guest]').attr("id"); + kimchi.listVMStorages({ + vm: guest, + storageType: 'disk' + }, function(disks){ + var guestStorage = {}; + for(var i=0; i<disks.length; i++){ + var pool, volume; + kimchi.getStoragePool(disks[i].pool, function(data){ + pool = data; + }, undefined, false); + kimchi.getStoragePoolVolume(disks[i].pool, disks[i].vol, function(data){ + volume = data; + }, undefined, false); + if(!guestStorage[pool.name]){ + guestStorage[pool.name] = { + pool: pool, + volumes: [volume], + totalVolumeSize: volume.capacity + }; + }else{ + guestStorage[pool.name].volumes.push(volume); + guestStorage[pool.name].totalVolumeSize += volume.capacity; + } + } + var needConfirm = false; + for(x in guestStorage){ + if(guestStorage[x].pool.type.indexOf('scsi')!=-1||guestStorage[x].pool.available<guestStorage[x].totalVolumeSize){ + needConfirm = true; + break; + } + } + if(needConfirm){ + kimchi.confirm({ + title : i18n['KCHAPI6006M'], + content : i18n['KCHVM6010M'], + confirm : i18n['KCHAPI6002M'], + cancel : i18n['KCHAPI6003M'] + }, function() { + kimchi.cloneGuest(guest, function(data){ + kimchi.listVmsAuto(); + }); + }, null); + }else{ + kimchi.cloneGuest(guest, function(data){ + kimchi.listVmsAuto(); + }); + } + }); + }); + + //Maintain menu open state + var actionMenu=guestActions.find("div[name=actionmenu]"); + if (openMenu) { + $('.popover', actionMenu).toggle(); + } - //Maintain menu open state - var actionMenu=guestActions.find("div[name=actionmenu]"); - if (openMenu) { - $('.popover', actionMenu).toggle(); + }else{ + guestActions.find('.btn').attr('disabled', true); + result.find('.guest-clone').removeClass('hide-content'); + $('.popover', guestActions.find("div[name=actionmenu]")).remove(); } return result; diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl index 43fb350..74206fd 100644 --- a/ui/pages/guest.html.tmpl +++ b/ui/pages/guest.html.tmpl @@ -26,6 +26,9 @@ <div class="guest-general"> <h2 class="title" title="{name}">{name}</h2> </div> + <div class="guest-clone hide-content"> + <span class="icon"></span><span class="text">$_("Cloning")...</span> + </div> </div> <div name="cpu_utilization" class="sortable"> <div class="circleGauge"></div> @@ -56,7 +59,8 @@ <span class="text">$_("Actions")</span><span class="arrow"></span> <div class="popover actionsheet right-side" style="width: 250px"> <button class="button-big shutoff-disabled" name="vm-console" ><span class="text">$_("Connect")</span></button> - <button class="button-big running-disabled" name="vm-edit"><span class="text">$_("Edit")</span></button> + <button class="button-big running-disabled" name="vm-clone"><span class="text">$_("Clone")</span></button> + <button class="button-big" name="vm-edit"><span class="text">$_("Edit")</span></button> <button class="button-big shutoff-hidden" name="vm-reset"><span class="text">$_("Reset")</span></button> <button class="button-big shutoff-hidden" name="vm-shutdown"><span class="text">$_("Shut Down")</span></button> <button class="button-big running-hidden" name="vm-start"><span class="text">$_("Start")</span></button> diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 75f1e43..56abd36 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -128,6 +128,7 @@ "KCHVM6007M": "$_("Note the guest OS may ignore this request. Would you like to continue?")", "KCHVM6008M": "$_("Virtual Machine delete Confirmation")", "KCHVM6009M": "$_("This virtual machine is not persistent. Power Off will delete it. Continue?")", + "KCHVM6010M": "$_("When the target guest has SCSI or iSCSI volumes, they will be cloned on default storage pool. The same will happen when the target pool does not have enough space to clone the volumes. Do you want to continue?")", "KCHVMCD6001M": "$_("This CDROM will be detached permanently and you can re-attach it. Continue to detach it?")", "KCHVMCD6002M": "$_("Attach")", -- 1.7.1

4 4

[WIP PATCH 0/5] Clone VMs
by Crístian Viana 03 Nov '14

03 Nov '14

To clone a VM, try the following command: POST /vms/<vm-name>/clone. This is a work in progress! It's not finished yet and there are bugs! I'm only sending it now to get early feedback. I'm aware of the following issues: - BUG: cannot delete a recently cloned VM. This is because the clone function doesn't refresh the VM storage pools. I already started fixing this. - The storage volumes handling is not implemented. The current implementation should only work for DIR and NFS (well, it doesn't work completely because of the bug described above...). - The mockmodel implementation is missing. - The tests are missing. Crístian Viana (5): Make function "randomMAC" public Register Kimchi's namespace when updating XML Allow to update XML attribute in "xml_item_update" Render different types of data in generate_action_handler Add feature to clone VMs docs/API.md | 5 ++ src/kimchi/control/base.py | 37 ++++++++++---- src/kimchi/control/host.py | 18 ++----- src/kimchi/control/vms.py | 1 + src/kimchi/i18n.py | 1 + src/kimchi/model/vmifaces.py | 18 +++---- src/kimchi/model/vms.py | 116 ++++++++++++++++++++++++++++++++++++++++++- src/kimchi/xmlutils.py | 15 ++++-- 8 files changed, 172 insertions(+), 39 deletions(-) -- 1.9.3

3 16

RFC: Domain snapshots (backend)
by Crístian Viana 03 Nov '14

03 Nov '14

Hi everyone, I'm presenting here my proposal for the feature "Domain snapshots" which is expected to be implemented for Kimchi 1.4. Description A domain snapshot is a "moment in time" of a domain. After a snapshot is created, a domain can be reverted to that snapshot (i.e. reverted to the exact same state it was when the snapshot was created). If a snapshot is created while the domain is stopped, only its disks will be used in that snapshot; otherwise, its memory state will also be used. A snapshot can be created on top of another snapshot, which makes it possible to have a tree-like snapshot structure for each domain. When a snapshot is created, the last snapshot used in that domain execution will be its parent. If there are no previous snapshot in that execution, the new snapshot will have no parent. Existing functions which also deal with snapshots will be updated. REST API Create a domain snapshot Syntax POST /vms//<vm-name>//snapshots Parameters name: The snapshot name (optional). If omitted, a default name will be used. Return An asynchronous Task with "target_uri" containing "/vms/</vm-name/>/snapshots//<new-snapshot-name>/". As expected with any Task, the process can be tracked by checking the corresponding task's status. Look up one domain snapshot Syntax GET /vms//<vm-name>//snapshots//<snapshot-name>/ Parameters None. Return A snapshot structure with the following properties: name: The snapshot name. state: The corresponding domain state when the snapshot was created. created: The time when the snapshot was created (in seconds, since the epoch). parent: The name of the parent snapshot, or an empty string if there is no parent. Look up multiple domain snapshosts Syntax GET /vms//<vm-name>//snapshots Parameters parent: The name of the parent snapshot of the requested snapshots (optional). If omitted, only the "root" snapshots for that domain will be returned. Return A list of the structures returned by the action "Look up one domain snapshot". All snapshots returned by this call will have "parent" as their parents. Update a domain snapshot Syntax PUT /vms//<vm-name>//snapshots//<snapshot-name>/ Parameters: name: The new snapshot name. Return: The structure returned by the action "Look up one domain snapshot" with the updated values. Delete a domain snapshot Syntax DELETE /vms//<vm-name>//snapshots//<snapshot-name>/ Parameters None. Return None. Revert to a domain snapshot Syntax POST /vms//<vm-name>//snapshots//<snapshot-name>//revert Parameters None. Return None. CHANGE: List the current snapshot in a domain Syntax GET /vms//<vm-name>/ Additional parameters None. Additional return current-snapshot: the snapshot name in which the domain execution is on, or an empty string if there is no current snapshot. CHANGE: Delete snapshots when deleting a domain Syntax DELETE /vms//<vm-name>/ Additional parameters None. Additional return None. CHANGE: Clone snapshots when cloning a domain Syntax POST /vms//<vm-name>//clone Additional parameters None. Additional return None. Open discussion 1. When creating a snapshot in a running domain, should we try to minimize the domain's downtime? There's a libvirt flag for that but it increases the memory dump file size. 2. When deleting a snapshot, should we keep their children or should we only delete that snapshot? Keep in mind that snapshots follow a tree-like structure. This feature is already implemented by libvirt, it makes no difference for us in the implementation (it's just a different flag), but we need to think if the user would expect that the snapshot's children will be deleted as well when deleting one snapshot. 3. The properties returned by the action "Look up one domain snapshot" are just the ones I thought it might be useful for now. A snapshot has more properties than that but I'm not sure if we should just dump everything. 4. The property updated by the action "Update a domain snapshot" (i.e. "name") is the only one I thought it might be relevant. Other properties can be updated as well if we want to. Any feedback is welcome. Best regards, Crístian.

2 2

[PATCH 0/7] Use the common get_disk_xml() to generate VMTemplate disks
by Aline Manera 03 Nov '14

03 Nov '14

Aline Manera (7): Make disk type an optional parameter on get_disk_xml() Set guest disk cache to none to support live migration Change VMTemplate._get_scsi_disks_xml() to use the common get_disk_xml() Change VMTemplate._get_iscsi_disks_xml() to use the common get_disk_xml() Change VMTemplate._get_disks_xml() to use the common get_disk_xml() Change VMTemplate._get_disks_xml() to handle all type of disks Remove VMTemplate._get_scsi_disks_xml() and VMTemplate._get_iscsi_disks_xml() src/kimchi/model/vmstorages.py | 1 + src/kimchi/vmtemplate.py | 108 ++++++++++++----------------------------- src/kimchi/xmlutils/disk.py | 10 +++- tests/test_model.py | 3 +- 4 files changed, 42 insertions(+), 80 deletions(-) -- 1.9.3

2 11

[PATCHv2] ISSUE#466: Filter valid format only on volume type of 'file'
by lvroyce0210＠gmail.com 03 Nov '14

03 Nov '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> When volume type is block, filter will prevent volume to be attached due to its format is 'unknown'. Change the filter to only apply to 'file' type, so that block will not be blocked. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/model/vmstorages.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/kimchi/model/vmstorages.py b/src/kimchi/model/vmstorages.py index 055aa50..fea110f 100644 --- a/src/kimchi/model/vmstorages.py +++ b/src/kimchi/model/vmstorages.py @@ -153,17 +153,18 @@ class VMStoragesModel(object): if vol_info['ref_cnt'] != 0: raise InvalidParameter("KCHVMSTOR0016E") - supported_format = { + params['path'] = vol_info['path'] + valid_format = { "disk": ["raw", "bochs", "qcow", "qcow2", "qed", "vmdk"], "cdrom": "iso"} - if vol_info['format'] in supported_format[params['type']]: - if params['type'] == 'disk': + if vol_info['type'] == 'file': + if (params['type'] == 'disk' and + vol_info['format'] in valid_format[params['type']]): params['format'] = vol_info['format'] - else: - raise InvalidParameter("KCHVMSTOR0018E", - {"format": vol_info['format'], - "type": params['type']}) - params['path'] = vol_info['path'] + else: + raise InvalidParameter("KCHVMSTOR0018E", + {"format": vol_info['format'], + "type": params['type']}) params['src_type'] = _check_path(params['path']) if (params['bus'] not in HOTPLUG_TYPE and DOM_STATE_MAP[dom.info()[0]] != 'shutoff'): -- 1.8.3.2

2 3

[PATCH] Edit Template redefined
by Wen Wang 03 Nov '14

03 Nov '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> This patch redesigned "Edit Template" diaguage in "Templates". New "Edit Template" will display all the related information into tabs of "General", "Storage" and "Interface". Due to unfinished back-end work, functions are not fully supported, which will be finished in the future work. Temporary disabled functions: 1) Multiple disk operation with multiple storage pools edit in template for which reason the add button in "Storage" tab is disabled. 2) iSCSI and SCSI storage pool add is removed since we are going to allow this kind of operation in the process of creating a VM. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/template-edit.css | 84 +++++++- ui/js/src/kimchi.template_edit_main.js | 336 ++++++++++++++++++++++---------- ui/pages/template-edit.html.tmpl | 169 +++++++++------- 3 files changed, 402 insertions(+), 187 deletions(-) diff --git a/ui/css/theme-default/template-edit.css b/ui/css/theme-default/template-edit.css index 4975f1b..302c488 100644 --- a/ui/css/theme-default/template-edit.css +++ b/ui/css/theme-default/template-edit.css @@ -17,24 +17,33 @@ */ #template-edit-window { font-size: 13px; - height: 600px; - width: 1000px; + height: 500px; + width: 800px; } -.template-edit-fieldset { - float: left; - padding: 1em; +#edit-template-tabs { + background: none repeat scroll 0 0 transparent; + border: medium none; + height: 100%; + padding: 0; } -.template-edit-wrapper-label, .template-edit-wrapper-controls { +#edit-template-tabs .form-template-inline-wrapper { + display: inline-block; vertical-align: top; - width: 470px; } .template-edit-wrapper-label { - height: 18px; - line-height: 18px; - margin-top: 8px; + vertical-align: top; + min-width: 100px; + height: 35px; + line-height: 35px; + margin: 7px 0 8px; +} + +.template-edit-wrapper-controls { + vertical-align: top; + width: 400px; } .template-edit-wrapper-controls input[type="text"] { @@ -56,7 +65,7 @@ .template-edit-wrapper-controls > .dropdown { margin: 5px 0 0 1px; - width: 440px; + width: 372px; } .template-edit-wrapper-controls input[type="text"][disabled] { @@ -103,3 +112,56 @@ input[type="checkbox"]:CHECKED+.item { background: #f8f8f8 url(../images/theme-default/check-green.png) no-repeat 10px center; } + +#edit-template-tabs .template-tab-header { + margin-bottom: 8px; + padding-bottom: 2px; + font-weight: bold; + border-bottom: 1px solid #999999; + overflow: hidden; +} + +#edit-template-tabs .template-tab-header .action-area { + float: right; + height: 20px; + width: 20px; +} + +#edit-template-tabs .template-storage-cell{ + display: inline-block; + width: 230px; +} + +#edit-template-tabs .template-interface-cell { + display: inline-block; + width: 250px; +} + +#form-template-storage .template-tab-body select { + width: 140px; +} + +#form-template-storage .template-tab-body input { + width: 56px; +} + +#edit-template-tabs .template-tab-body .item { + margin: 5px 0; +} + +#form-template-interface .template-tab-body select { + width: 180px; +} + +#edit-template-tabs .template-tab-body .action-area { + float: right; +} + +#edit-template-tabs .template-tab-body .action-area button { + width: 20px; + height: 20px; +} + +#edit-template-tabs .template-tab-body .hide { + display: none; +} \ No newline at end of file diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index 2f4cc9a..ac6cff8 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -16,14 +16,18 @@ * limitations under the License. */ kimchi.template_edit_main = function() { - var templateEditForm = $('#form-template-edit'); + var templateEditMain = $('#edit-template-tabs'); var origDisks; var origPool; + var origNetworks; var templateDiskSize; - $('#template-name', templateEditForm).val(kimchi.selectedTemplate); - kimchi.retrieveTemplate(kimchi.selectedTemplate, function(template) { + $('#template-name', templateEditMain).val(kimchi.selectedTemplate); + templateEditMain.tabs(); + + var initGeneral = function(template) { origDisks = template.disks; origPool = template.storagepool; + origNetworks = template.networks; for(var i=0;i<template.disks.length;i++){ if(template.disks[i].base){ template["vm-image"] = template.disks[i].base; @@ -37,18 +41,12 @@ kimchi.template_edit_main = function() { if (prop == 'graphics') { value = value["type"]; } - $('input[name="' + prop + '"]', templateEditForm).val(value); - } - var disks = template.disks; - $('input[name="disks"]').val(disks[0].size); - templateDiskSize = $('input[name="disks"]').val(); - if (disks[0].volume) { - var spool_value = $('#form-template-edit [name="storagepool"]').val(); - $('input[name="storagepool"]', templateEditForm).val(spool_value + '/' + disks[0].volume); - $('input[name="disks"]', templateEditForm).attr('disabled','disabled'); + $('input[name="' + prop + '"]', templateEditMain).val(value); } var vncOpt = [{label: 'VNC', value: 'vnc'}]; + $('#template-edit-graphics').append('<option selected>VNC</option>'); + $('#template-edit-graphics').append('<option>Spice</option>'); kimchi.select('template-edit-graphics-list', vncOpt); var enableSpice = function() { if (kimchi.capabilities == undefined) { @@ -61,85 +59,215 @@ kimchi.template_edit_main = function() { } }; enableSpice(); - + }; + var initStorage = function(result) { var scsipools = {}; - kimchi.listStoragePools(function(result) { - var options = []; - if (result && result.length) { - $.each(result, function(index, storagePool) { - if ((storagePool.state=="active") && (storagePool.type !== 'kimchi-iso')) { - if ((storagePool.type == 'iscsi') || (storagePool.type == 'scsi')){ - scsipools[storagePool.name] = []; - kimchi.listStorageVolumes(storagePool.name, function(result) { - if (result && result.length) { - $.each(result, function(index, storageVolume) { - options.push({ - label: storagePool.name + '/' + storageVolume.name, - value: '/storagepools/' + storagePool.name + '/' + storageVolume.name - }); - scsipools[storagePool.name].push(storageVolume) - }); - } - kimchi.select('template-edit-storagePool-list', options); - }); - } - else { - options.push({ - label: storagePool.name, - value: '/storagepools/' + storagePool.name - }); - } + var addStorageItem = function(storageData) { + var nodeStorage = $.parseHTML(kimchi.substitute($("#template-storage-pool-tmpl").html(), storageData)); + $('.template-tab-body', '#form-template-storage').append(nodeStorage); + $('.edit', '#form-template-storage').button({ + icons : {primary : 'ui-icon-pencil'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + var storageItem = $(this).parent().parent(); + $('.template-storage-name', storageItem).hide(); + var currentName = $('.template-storage-name', storageItem).text(); + $('.template-storage-disk', storageItem).hide(); + var currentDisk = $('.template-storage-disk', storageItem).text(); + $('input', storageItem).val(currentDisk).show(); + $('select', storageItem).show(); + if (currentName === 'iscsi' || currentName === 'scsi') { + $('input', storageItem).attr('disabled', true); + } else { + $('input', storageItem).attr('disabled', false); + } + $('.save', storageItem).parent().show(); + $('.delete', storageItem).parent().hide(); + var selectedStorage = $('select', storageItem).val(); + $('.template-storage-name', storageItem).text(selectedStorage).hide(); + $('select', storageItem).show(); + }); + $('.delete', '#form-template-storage').button({ + icons : {primary : 'ui-icon-trash'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + $(this).parent().parent().remove(); + }); + $('.cancel', '#form-template-storage').button({ + icons : {primary : 'ui-icon-arrowreturnthick-1-w'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + var cancelEntity = $(this).parent().parent(); + if($('.template-storage-disk', cancelEntity).text() === '') { + cancelEntity.remove(); + } else { + $('label', cancelEntity).show(); + $('input', cancelEntity).hide(); + $('select', cancelEntity).hide(); + $('.cancel', cancelEntity).parent().hide(); + $('.edit', cancelEntity).parent().show(); + } + }); + $('.save', '#form-template-storage').button({ + icons : {primary : 'ui-icon-disk'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + var storageItem = $(this).parent().parent(); + $('.save', storageItem).parent().hide(); + $('.delete', storageItem).parent().show(); + var selectedStorage = $('select', storageItem).val(); + $('.template-storage-name', storageItem).text(selectedStorage).show(); + $('.template-storage-disk', storageItem).text($('input', storageItem).val()).show(); + $('select', storageItem).hide(); + $('input', storageItem).hide(); + }); + var storageOptions = ''; + $.each(result, function(index, storageEntities) { + if((storageEntities.state === 'active') && (storageEntities.type != 'kimchi-iso') + && (storageEntities.type != 'iscsi') && (storageEntities.type != 'scsi')){ + var isSlected = storageEntities.name === 'default' ? ' selected' : ''; + storageOptions += '<option' + isSlected + '>' + result[index].name + '</option>'; + } + }); + $('select', '#form-template-storage').find('option').remove(); + $('select', '#form-template-storage').append(storageOptions); + $('select', '#form-template-storage').change(function() { + var selectedItem = $(this).parent().parent(); + var tempStorageName = $(this).val(); + if (tempStorageName === 'iscsi' || tempStorageName === 'scsi') { + $('input', selectedItem).attr('disabled', true); + } else { + $('input', selectedItem).attr('disabled', false); + } + $.each(result, function(index, storageEntities) { + if (tempStorageName === storageEntities.name) { + selectedItem.find('.template-storage-type').text(storageEntities.type); } - }); - } - if ($.isEmptyObject(scsipools)) { - kimchi.select('template-edit-storagePool-list', options); + }) + }); + }; + + if ((origDisks && origDisks.length) && (origPool && origPool)) { + splitPool = origPool.split('/'); + var defaultPool; + var defaultType; + $.each(result, function(index, poolEntities) { + if (poolEntities.name === splitPool[splitPool.length-1]) { + defaultType = poolEntities.type; + defaultPool = splitPool[splitPool.length-1] + } + }); + $.each(origDisks, function(index, diskEntities) { + var storageNodeData = { + viewMode : '', + editMode : 'hide', + storageName : defaultPool, + storageType : defaultType, + storageDisk : diskEntities.size + } + addStorageItem(storageNodeData); + }); + } + + $('#template-edit-storage-add-button').button({ + icons: { + primary: "ui-icon-plusthick" + }, + text: false, + disabled: true + }).click(function(event) { + event.preventDefault(); + var storageNodeData = { + viewMode : 'hide', + editMode : '', + storageName : 'default', + storageType : 'dir', + storageDisk : '' } + addStorageItem(storageNodeData); }); - kimchi.listNetworks(function(result) { - if(result && result.length > 0) { - var html = ''; - var tmpl = $('#tmpl-network').html(); - $.each(result, function(index, network) { - if (result[index].state === 'active') - html += kimchi.substitute(tmpl, network); - }); - $('#template-edit-network-list').html(html).show(); - if(template.networks && template.networks.length > 0) { - $('input[name="networks"]', templateEditForm).each(function(index, element) { - var value = $(element).val(); - if(template.networks.indexOf(value) >= 0) { - $(element).prop('checked', true); - } - }); + }; + var initInterface = function(result) { + var addInterfaceItem = function(networkData) { + var nodeInterface = $.parseHTML(kimchi.substitute($('#template-interface-tmpl').html(), networkData)); + $('.template-tab-body', '#form-template-interface').append(nodeInterface); + $('.edit', '#form-template-interface').button({ + icons : {primary : 'ui-icon-pencil'}, + text : false, + disabled : true + }); + $('.delete', '#form-template-interface').button({ + icons : {primary : 'ui-icon-trash'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + $(this).parent().parent().remove(); + }); + $('.cancel', '#form-template-interface').button({ + icons : {primary : 'ui-icon-arrowreturnthick-1-w'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + $(this).parent().parent().remove(); + }); + $('.save', '#form-template-interface').button({ + icons : {primary : 'ui-icon-disk'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + var interItem = $(this).parent().parent(); + $('.save', interItem).parent().hide(); + $('.delete', interItem).parent().show(); + var selectedInterface = $('select', interItem).val(); + $('label', interItem).text(selectedInterface).show(); + $('select', interItem).hide(); + }); + var networkOptions = ''; + for(var i=0;i<result.length;i++){ + if(result[i].state === "active") { + var isSlected = i==0 ? ' selected' : ''; + networkOptions += '<option' + isSlected + '>' + result[i].name + '</option>'; } - } else { - $('#template-edit-network-list').hide(); } - }); - }); - - $('#template-edit-storagePool').change(function() { - storagepool = $(this).val(); - var storageArray = storagepool.split("/"); - if (storageArray.length > 3) { - volumeName = storageArray.pop(); - poolName = storageArray.pop(); - kimchi.getStoragePoolVolume(poolName, volumeName, function(result) { - $('input[name="disks"]', templateEditForm).val(result.capacity / Math.pow(1024,3)); - $('input[name="disks"]', templateEditForm).attr('disabled','disabled'); - return false; - }, function (err) { - kimchi.message.error(err.responseJSON.reason); + $('select', '#form-template-interface').find('option').remove(); + $('select', '#form-template-interface').append(networkOptions); + }; + if(result && result.length > 0) { + $.each(result, function(index, data) { + if($.inArray(data.name, origNetworks) > -1) { + addInterfaceItem({ + mac : '', + network : data.name, + type : 'network', + viewMode : '', + editMode : 'hide' + }); + } }); - } else { - $('input[name="disks"]', templateEditForm).removeAttr('disabled'); - $('input[name="disks"]', templateEditForm).val(templateDiskSize); } - }); - $('input[name="disks"]', templateEditForm).keyup(function() { - templateDiskSize = $('input[name="disks"]', templateEditForm).val(); - }); + $('#template-edit-interface-add-button').button({ + icons: { + primary: 'ui-icon-plusthick' + }, + text: false + }).click(function(evt) { + evt.preventDefault(); + addInterfaceItem({ + mac : '', + network : '', + type : 'network', + viewMode : 'hide', + editMode : '' + }); + }); + }; + kimchi.retrieveTemplate(kimchi.selectedTemplate, initGeneral); + kimchi.listNetworks(initInterface); + kimchi.listStoragePools(initStorage); $('#tmpl-edit-button-save').on('click', function() { var editableFields = [ 'name', 'cpus', 'memory', 'storagepool', 'disks', 'graphics']; @@ -147,33 +275,41 @@ kimchi.template_edit_main = function() { $.each(editableFields, function(i, field) { /* Support only 1 disk at this moment */ if (field == 'disks') { - origDisks[0].size = Number($('#form-template-edit [name="' + field + '"]').val()); + $.each($('#form-template-storage .item'), function(index, diskEntities) { + origDisks[index].size = Number($(this).find('.template-storage-disk').text()); + }) data[field] = origDisks; } else if (field == 'graphics') { - var type = $('#form-template-edit [name="' + field + '"]').val(); + var type = $('#form-template-general [name="' + field + '"]').val(); data[field] = {'type': type}; } else { - data[field] = $('#form-template-edit [name="' + field + '"]').val(); + data[field] = $('#form-template-general [name="' + field + '"]').val(); } }); data['memory'] = Number(data['memory']); data['cpus'] = Number(data['cpus']); - storagepool = data['storagepool']; - storageArray = storagepool.split("/"); - if (storageArray.length > 3){ - /* Support only 1 disk at this moment */ - data["disks"][0].volume = storageArray.pop(); - data['storagepool'] = storageArray.join("/"); - } else if (data["disks"][0].volume) { - delete data["disks"][0].volume; - } - var networks = templateEditForm.serializeObject().networks; - if (networks instanceof Array) { - data.networks = networks; - } else if (networks != null) { - data.networks = [networks]; + + //Fix me: Only support one storage pool now + var storages = $('.template-tab-body .item', '#form-template-storage'); + var storageForUpdate = new Array(); + $.each(storages, function(index, storageEntities) { + var tempName = $('.template-storage-name', storageEntities).text() + tempName = '/storagepools/' + tempName; + storageForUpdate.push(tempName); + }) + data['storagepool'] = storageForUpdate[0]; + + var networks = $('.template-tab-body .item', '#form-template-interface'); + var networkForUpdate = new Array(); + $.each(networks, function(index, networkEntities) { + networkForUpdate.push($('.template-interface-name', networkEntities).text()); + }); + if (networkForUpdate instanceof Array) { + data.networks = networkForUpdate; + } else if (networkForUpdate != null) { + data.networks = [networkForUpdate]; } else { data.networks = []; } diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 5a71d91..d5d2be1 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -28,74 +28,67 @@ <div class="close">X</div> </header> <div class="content"> - <form id="form-template-edit"> + <div id="edit-template-tabs"> <input type="hidden" id="template-name" name="templateName" /> - <fieldset class="template-edit-fieldset"> - <div> + <ul> + <li> + <a href="#form-template-general">$_("General")</a> + </li> + <li> + <a href="#form-template-storage">$_("storage")</a> + </li> + <li> + <a href="#form-template-interface">$_("Interface")</a> + </li> + </ul> + <form id="form-template-general"> + <div class="form-template-inline-wrapper"> <div class="template-edit-wrapper-label"> <label for="template-edit-id-textbox">$_("Name")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-id-textbox" name="name" type="text" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-vendor-textbox">$_("Vendor")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-vendor-textbox" name="os_distro" type="text" disabled="disabled" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-version-textbox">$_("Version")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-version-textbox" name="os_version" type="text" disabled="disabled" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-cpu-textbox">$_("CPU Number")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-cpu-textbox" name="cpus" type="text" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-memory-textbox">$_("Memory (MB)")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-memory-textbox" name="memory" type="text" /> + <div class="template-edit-wrapper-label templ-edit-cdrom"> + <label for="template-edit-cdrom-textbox">$_("CDROM")</label> + </div> + <div class="template-edit-wrapper-label templ-edit-vm-image hide-content"> + <label for="template-edit-vmimage-textbox">$_("Image File")</label> </div> - </div> - <div> <div class="template-edit-wrapper-label"> - <label for="template-edit-disk-textbox">$_("Disk (GB)")</label> + <label>$_("Graphics")</label> </div> + </div> + <div class="form-template-inline-wrapper"> <div class="template-edit-wrapper-controls"> - <input id="template-edit-disk-textbox" name="disks" type="text" /> + <input id="template-edit-id-textbox" name="name" type="text" /> </div> - </div> - </fieldset> - <fieldset class="template-edit-fieldset"> - <div id="templ-edit-cdrom"> - <div class="template-edit-wrapper-label"> - <label for="template-edit-cdrom-textbox">$_("CDROM")</label> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-vendor-textbox" name="os_distro" type="text" disabled="disabled" /> </div> <div class="template-edit-wrapper-controls"> - <input id="template-edit-cdrom-textbox" name="cdrom" type="text" disabled="disabled"/> + <input id="template-edit-version-textbox" name="os_version" type="text" disabled="disabled" /> </div> - </div> - <div id="templ-edit-vm-image" class="hide-content"> - <div class="template-edit-wrapper-label">$_("Image File")</div> - <div class="template-edit-wrapper-controls"><input name="vm-image" type="text" disabled/></div> - </div> - <div> - <div class="template-edit-wrapper-label"> - <label>$_("Graphics")</label> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-cpu-textbox" name="cpus" type="text" /> + </div> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-memory-textbox" name="memory" type="text" /> + </div> + <div class="template-edit-wrapper-controls templ-edit-cdrom"> + <input id="template-edit-cdrom-textbox" name="cdrom" type="text" disabled="disabled" /> + </div> + <div class="template-edit-wrapper-controls templ-edit-vm-image hide-content"> + <input id="template-edit-vmimage-textbox" name="vm-image" type="text" disabled="disabled" /> </div> <div class="template-edit-wrapper-controls"> <div class="btn dropdown popable"> @@ -108,40 +101,26 @@ </div> </div> </div> - <div> - <div class="template-edit-wrapper-label"> - <label>$_("Storage Pool")</label> - </div> - <div class="template-edit-wrapper-controls"> - <div class="btn dropdown popable"> - <input id="template-edit-storagePool" name="storagepool" type="hidden" /> - <span class="text" id="template-edit-storage-label"></span><span class="arrow"></span> - <div class="popover" style="width: 100%"> - <ul class="select-list" id="template-edit-storagePool-list" data-target="template-edit-storagePool" data-label="template-edit-storage-label"> - </ul> - </div> - </div> - </div> + </form> + <form id="form-template-storage"> + <div class="template-tab-header"> + <span class="template-storage-cell">$_("Storage Pool")</span> + <span class="template-storage-cell">$_("Type")</span> + <span class="template-storage-cell">$_("Disk(GB)")</span> + <button type="button" id="template-edit-storage-add-button" class="action-area"></button> </div> - <div> - <div class="template-edit-wrapper-label"> - <label>$_("Network")</label> - </div> - <div class="template-edit-wrapper-controls"> - <ul class="select-list-box" id="template-edit-network-list"> - </ul> - <script id="tmpl-network" type="text/html"> - <li> - <label> - <input name="networks" type="checkbox" value="{name}" /> - <span class="item">{name}</span> - </label> - </li> - </script> - </div> + <div class="template-tab-body"> </div> - </fieldset> - </form> + </form> + <form id="form-template-interface"> + <div class="template-tab-header"> + <span class="template-interface-cell">$_("Network")</span> + <span class="template-interface-cell">$_("Type")</span> + <button type="button" id="template-edit-interface-add-button" class="action-area"></button> + </div> + <div class="template-tab-body"></div> + </form> + </div> </div> <footer> <div class="btn-group"> @@ -152,3 +131,41 @@ <script> kimchi.template_edit_main(); </script> +<script id="template-storage-pool-tmpl" type="text/html"> + <div class='item'> + <span class="template-storage-cell"> + <label class="template-storage-name {viewMode}">{storageName}</label> + <select class="{editMode}"></select> + </span> + <span class="template-storage-cell"> + <label class="template-storage-type">{storageType}</label> + </span> + <span class="template-storage-cell"> + <label class="template-storage-disk {viewMode}">{storageDisk}</label> + <input class="{editMode}" /> + </span> + <span class="action-area {editMode}"> + <button class="save"></button><button class="cancel"></button> + </span> + <span class="action-area {viewMode}"> + <button class="edit"></button><button class="delete"></button> + </span> + </div> +</script> +<script id="template-interface-tmpl" type="text/html"> + <div class="item"> + <span class="template-interface-cell"> + <label class="template-interface-name {viewMode}">{network}</label> + <select class="{editMode}"></select> + </span> + <span class="template-interface-cell"> + <span>{type}</span> + </span> + <span class="action-area {editMode}"> + <button class="save"></button><button class="cancel"></button> + </span> + <span class="action-area {viewMode}"> + <button class="edit"></button><button class="delete"></button> + </span> + </div> +</script> \ No newline at end of file -- 1.7.1

2 4