- Kimchi-devel - oVirt List Archives

[PATCH V9 0/7] bug fix: get user and group when VM is running
by shaohef＠linux.vnet.ibm.com 28 Apr '14

28 Apr '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V8 -> V9 move meta feature test to src/kimchi/model/config.py use ElementMaker to construct a metanode. V7 -> V8 add a feature test to probe libvirt support metadata. add namespace for manully metadata. V6 -> V7: After V6 rebase, still find one error code "KCHVM0029E" does not change. V5 -> V6: rebase V4 -> V5: it is wrong to call dom.isPersistent in V4, fix it. V3 -> V4: work around if libvirt do not support metadata API well. V2 -> V3: move the virDomain.metadata and virDomain.setMetadata to model/utils.py add testcase V1 -> V2: libvirt also support virDomain.metadata and virDomain.setMetadata two api. use virDomain.metadata to get the user and group. use virDomain.setMetadata to set the user and group. ShaoHe Feng (7): bug fix: call a method should be followed by "()" add method to test libvirt metadata api are available Add two function to set and get domain xml metadata manually manage the metadata element bug fix: get user and group when vm is living. update test case to set/get user and group when VM is running write the template OS info to vm metadata src/kimchi/featuretests.py | 33 ++++++++++++- src/kimchi/i18n.py | 1 + src/kimchi/model/config.py | 2 + src/kimchi/model/utils.py | 103 +++++++++++++++++++++++++++++++++++++++++ src/kimchi/model/vms.py | 113 +++++++++++++++++++++++++++------------------ tests/test_model.py | 13 ++++++ 6 files changed, 220 insertions(+), 45 deletions(-) -- 1.9.0

3 17

[PATCH 0/4] Host PCI Device Pass Through
by Zhou Zheng Sheng 27 Apr '14

27 Apr '14

Hi, This patch series is to enable Kimchi to assign host PCI devices directly to a VM, thus greately improve VM performance. For example, pass through a NIC to VM to improve guest network throughput, or pass through a video card to VM to enable the guest OS to run 3D video games. Firstly, the user should be able to list all host devices in a tree, so as to determine which PCI devices should be passed through. Once a PCI device is assigned to VM, all the sub-device connected to it would be also assigned to VM. The device listing and device tree formatting is implemented in the patch "list all types of host devices" and "list all host devices in a tree". Secondly, the user should be able to pass the names of the host PCI devices to a VM template. Then the user can create a VM from the template, and the PCI devices would be automatically assigned to the VM when it starts, and automatically released when the VM is powered off. This is implemented in the patch "pass through PCI device to VM". The author also fixed a bug in VM template during the test. The fix is in patch "add disk size error message". All the patches are for back-end. The detailed implementation and testing method are written in the patch commit messages. Zhou Zheng Sheng (4): VM template: add disk size error message host pci pass through: list all types of host devices host pci pass through: list all host devices in a tree host pci pass through: pass through PCI device to VM docs/API.md | 18 +- src/kimchi/API.json | 24 ++- src/kimchi/control/host.py | 21 +++ src/kimchi/control/templates.py | 5 +- src/kimchi/featuretests.py | 9 + src/kimchi/hostdev.py | 307 +++++++++++++++++++++++++++++++++ src/kimchi/i18n.py | 14 ++ src/kimchi/mockmodel.py | 7 +- src/kimchi/model/config.py | 2 + src/kimchi/model/host.py | 15 +- src/kimchi/model/libvirtstoragepool.py | 18 +- src/kimchi/model/templates.py | 58 +++++++ src/kimchi/vmtemplate.py | 43 +++++ tests/test_rest.py | 6 +- tests/test_storagepool.py | 7 +- 15 files changed, 512 insertions(+), 42 deletions(-) create mode 100644 src/kimchi/hostdev.py -- 1.9.0

2 11

[PATCHv3 0/7] Attach guest disks
by lvroyce＠linux.vnet.ibm.com 25 Apr '14

25 Apr '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> This patch need to be changed with Shaohe's metadata patch, and cannot be merged directly.As metadata patch cannot pass all tests. v1>v3, Choose bus type according to os info in metadata. When adding a disk, specify a pool and vol name, so that kimchi can chek ref_cnt to make sure no others using that volume, also volume format is filled to driver so that qcow2 image will not recognized as raw. Tested: 1. when no bus is specified, kimchi chose 'ide' for cdrom and 'virtio' for disk 2. when bus is specified, kimchi attach disk with specified bus. 3. ide does not support hot plug. 4. Disk size for qcow2 and raw is right. Depend on Sheldon's patch: [PATCH]manually manage the metadata element [PATCH]write the template OS info to vm metadata [PATCH]Add two function to set and get domain xml metadata [PATCH]bug fix: get user and group when vm is living. [PATCH]update test case to set/get user and group when VM is running Royce Lv (7): Guest disks: Update doc to support manage guest disks Guest disks: Update api definition and error reporting Guest disks: Choose proper bus for device Guest disks: Abstract vm disk functions Guest disk: deals with disk attachment Multiple pep8 fixes Guest disks: Update testcase docs/API.md | 12 ++-- src/kimchi/API.json | 37 +++++++--- src/kimchi/i18n.py | 28 ++++---- src/kimchi/mockmodel.py | 18 ++--- src/kimchi/model/storagevolumes.py | 9 +-- src/kimchi/model/vmstorages.py | 138 ++++++++++++++++++------------------- src/kimchi/vmdisks.py | 58 ++++++++++++++++ tests/test_model.py | 75 ++++++++++++++++++++ 8 files changed, 265 insertions(+), 110 deletions(-) create mode 100644 src/kimchi/vmdisks.py -- 1.8.3.2

1 7

[PATCH] bug fix: Use secure cookies
by Aline Manera 25 Apr '14

25 Apr '14

From: Aline Manera <alinefm(a)br.ibm.com> Since this cookie does not contain the "secure" attribute, it might also be sent to the site during an unencrypted session. Any information such as cookies, session tokens or user credentials that are sent to the server as clear text, may be stolen and used later for identity theft or user impersonation. Fix it. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/config.py.in | 1 + ui/js/src/kimchi.cookie.js | 1 + 2 files changed, 2 insertions(+) diff --git a/src/kimchi/config.py.in b/src/kimchi/config.py.in index f8a645a..da89e3a 100644 --- a/src/kimchi/config.py.in +++ b/src/kimchi/config.py.in @@ -172,6 +172,7 @@ class KimchiConfig(dict): 'tools.nocache.on': True, 'tools.sessions.on': True, 'tools.sessions.name': 'kimchi', + 'tools.sessions.secure': True, 'tools.sessions.httponly': True, 'tools.sessions.locking': 'explicit', 'tools.sessions.storage_type': 'ram', diff --git a/ui/js/src/kimchi.cookie.js b/ui/js/src/kimchi.cookie.js index d63fb97..2a69407 100644 --- a/ui/js/src/kimchi.cookie.js +++ b/ui/js/src/kimchi.cookie.js @@ -18,6 +18,7 @@ kimchi.cookie = { set: function(key, value, expireDays) { value = encodeURIComponent(value); + value += '; secure' if (expireDays) { var expireDate = new Date(); expireDate.setDate(expireDate.getDate() + expireDays); -- 1.7.10.4

2 1

[V6 0/5] bug fix: get user and group when VM is running
by shaohef＠linux.vnet.ibm.com 25 Apr '14

25 Apr '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V5 -> V6: rebase V4 -> V5: it is wrong to call dom.isPersistent in V4, fix it. V3 -> V4: work around if libvirt do not support metadata API well. V2 -> V3: move the virDomain.metadata and virDomain.setMetadata to model/utils.py add testcase V1 -> V2: libvirt also support virDomain.metadata and virDomain.setMetadata two api. use virDomain.metadata to get the user and group. use virDomain.setMetadata to set the user and group. ShaoHe Feng (5): Add two function to set and get domain xml metadata bug fix: get user and group when vm is living. update test case to set/get user and group when VM is running write the template OS info to vm metadata manually manage the metadata element src/kimchi/i18n.py | 1 + src/kimchi/model/utils.py | 73 +++++++++++++++++++++++++++++++++ src/kimchi/model/vms.py | 102 ++++++++++++++++++++++++++++------------------ tests/test_model.py | 13 ++++++ 4 files changed, 150 insertions(+), 39 deletions(-) -- 1.9.0

3 12

[PATCH V8 0/7] bug fix: get user and group when VM is running
by shaohef＠linux.vnet.ibm.com 25 Apr '14

25 Apr '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V7 -> V8 add a feature test to probe libvirt support metadata. add namespace for manully metadata. V6 -> V7: After V6 rebase, still find one error code "KCHVM0029E" does not change. V5 -> V6: rebase V4 -> V5: it is wrong to call dom.isPersistent in V4, fix it. V3 -> V4: work around if libvirt do not support metadata API well. V2 -> V3: move the virDomain.metadata and virDomain.setMetadata to model/utils.py add testcase V1 -> V2: libvirt also support virDomain.metadata and virDomain.setMetadata two api. use virDomain.metadata to get the user and group. use virDomain.setMetadata to set the user and group. ShaoHe Feng (7): Add two function to set and get domain xml metadata bug fix: get user and group when vm is living. update test case to set/get user and group when VM is running write the template OS info to vm metadata bug fix: call a method should be followed by "()" add method to test libvirt api are available manually manage the metadata element src/kimchi/config.py.in | 14 ++++++- src/kimchi/featuretests.py | 44 ++++++++++++++++++- src/kimchi/i18n.py | 1 + src/kimchi/model/utils.py | 97 ++++++++++++++++++++++++++++++++++++++++++ src/kimchi/model/vms.py | 102 ++++++++++++++++++++++++++++----------------- tests/test_model.py | 13 ++++++ 6 files changed, 229 insertions(+), 42 deletions(-) -- 1.9.0

4 21

[RFC] - Guest Memory/CPU warning
by Rodrigo Trujillo 24 Apr '14

24 Apr '14

Hi all, we have recently merged the patches that allow user to change guest memory and cpu. When user change this parameters, we have some problems: 1- If user assigned more virtual cpus than the amount in the host and start the VM, VM will start normally, but the host server will have the performance heavily declined. 2- If user assigned more virtual memory than the physical amount in the host, the VM does not start and qemu throws an exception like "Cannot allocate memory." Solutions: 1a - Show the number of host physical CPUs in edit Template and edit Guest windows, then warn the user if he assigns a higher number 1b - Show the number of host physical CPUs in edit Template and edit Guest windows, then does not allow to set up a higher number (generate a error during edition) 2a - Show the host MEMORY amount in edit Template and edit Guest windows, then warn the user if he assigns a higher number 2b - Show the host MEMORY amount in edit Template and edit Guest windows, then does not allow to set up a higher number (generate a error during edition) - A third option would be check the numbers before start a guest and warn the user, or does not allow the vm to be started. I would like to implement 1a and 2b. Do you have any thoughts or concerns/suggestions ? Rodrigo Trujillo

2 4

[PATCH] Fix PEP8 in scan.py
by Rodrigo Trujillo 24 Apr '14

24 Apr '14

Fixes pep9 issues in src/kimchi/scan.py and adds it to PEP8_WHITELIST. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- Makefile.am | 1 + src/kimchi/scan.py | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1e4a8be..9785de9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,6 +60,7 @@ PEP8_WHITELIST = \ src/kimchi/repositories.py \ src/kimchi/rollbackcontext.py \ src/kimchi/root.py \ + src/kimchi/scan.py \ src/kimchi/server.py \ src/kimchi/swupdate.py \ src/kimchi/template.py \ diff --git a/src/kimchi/scan.py b/src/kimchi/scan.py index b67e3a5..e50dbbc 100644 --- a/src/kimchi/scan.py +++ b/src/kimchi/scan.py @@ -15,7 +15,7 @@ # # 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 +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # import glob @@ -32,6 +32,7 @@ from kimchi.utils import kimchi_log SCAN_IGNORE = ['/tmp/kimchi-scan-*'] + class Scanner(object): SCAN_TTL = 300 @@ -56,8 +57,8 @@ class Scanner(object): shutil.rmtree(d) self.clean_cb(transient_pool) except OSError as e: - kimchi_log.debug( - "Exception %s occured when cleaning stale pool, ignore" % e.message) + msg = "Exception %s occured when cleaning stale pool, ignore" + kimchi_log.debug(msg % e.message) def scan_dir_prepare(self, name): # clean stale scan storage pools @@ -71,16 +72,18 @@ class Scanner(object): duplicates = "%s/%s*" % (params['pool_path'], iso_name) for f in glob.glob(duplicates): iso_img = IsoImage(f) - if (iso_info['distro'], iso_info['version']) == iso_img.probe(): + if (iso_info['distro'], iso_info['version']) == \ + iso_img.probe(): return - iso_path = iso_name + hashlib.md5(iso_info['path']).hexdigest() + '.iso' + iso_path = iso_name + hashlib.md5(iso_info['path']).hexdigest() + \ + '.iso' link_name = os.path.join(params['pool_path'], os.path.basename(iso_path)) os.symlink(iso_info['path'], link_name) ignore_paths = params.get('ignore_list', []) scan_params = dict(path=params['scan_path'], updater=updater, - ignore_list=ignore_paths + SCAN_IGNORE) + ignore_list=ignore_paths + SCAN_IGNORE) probe_iso(None, scan_params) cb('', True) -- 1.9.0

2 1

[PATCH] User action menu overflows when actions with names longer than a few chars are included
by Adam King 24 Apr '14

24 Apr '14

Update the CSS so the user action menu will expand to accomodate longer action names Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com> --- ui/css/theme-default/topbar.css | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/css/theme-default/topbar.css b/ui/css/theme-default/topbar.css index 7180cd5..b6f2fef 100644 --- a/ui/css/theme-default/topbar.css +++ b/ui/css/theme-default/topbar.css @@ -155,6 +155,7 @@ color: black; padding: 12px 18px; white-space: nowrap; + width: inherit; } .user-menu-item { -- 1.9.0

3 3

[V3] UI: Edit Guest Network Interface
by huoyuxin＠linux.vnet.ibm.com 24 Apr '14

24 Apr '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 | 43 ++++++++++++++++ ui/js/src/kimchi.api.js | 55 +++++++++++++++++++++ ui/js/src/kimchi.guest_edit_main.js | 91 +++++++++++++++++++++++++++++++++++ ui/pages/guest-edit.html.tmpl | 28 +++++++++++ 4 files changed, 217 insertions(+), 0 deletions(-) diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index b4d2105..36f7f75 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -156,3 +156,46 @@ .guest-edit-cdrom-button.detach[disabled] { background-position: -54px -108px; } + +.guest-edit-interface .header { + margin-bottom: 8px; + padding-bottom: 2px; + font-weight: bold; + border-bottom: 1px solid #999999; + overflow: hidden; +} + +.guest-edit-interface .body .item { + margin: 5px 0; +} + +.guest-edit-interface .cell { + display: inline-block; + width: 250px; +} + +.guest-edit-interface .body select { + width: 180px; + padding: 0px; +} + +.guest-edit-interface .action-area { + float: right; +} + +.guest-edit-interface button { + width: 20px; + height: 20px; +} + +.guest-edit-interface .header button { + margin-bottom: 1px; +} + +.guest-edit-interface .body button:not(:last-child) { + margin-right: 2px; +} + +.guest-edit-interface .hide { + display: none; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 29a5770..3c6765c 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -970,5 +970,60 @@ var kimchi = { kimchi.message.error(data.responseJSON.reason); } }); + }, + + getGuestInterfaces: function(name, suc, err) { + var url = kimchi.url+'vms/'+encodeURIComponent(name)+'/ifaces'; + kimchi.requestJSON({ + url : url, + type : 'GET', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err || function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + + createGuestInterface : function(name, interface, suc, err) { + kimchi.requestJSON({ + url : kimchi.url+'vms/'+encodeURIComponent(name)+'/ifaces', + type : 'POST', + contentType : 'application/json', + dataType : 'json', + data : JSON.stringify(interface), + success : suc, + error : err || function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + + deleteGuestInterface : function(vm, mac, suc, err) { + kimchi.requestJSON({ + url : kimchi.url+'vms/'+encodeURIComponent(vm)+'/ifaces/'+encodeURIComponent(mac), + type : 'DELETE', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + + updateGuestInterface : function(vm, mac, interface, suc, err) { + $.ajax({ + url : kimchi.url+'vms/'+encodeURIComponent(vm)+'/ifaces/'+encodeURIComponent(mac), + type : 'PUT', + contentType : 'application/json', + data : JSON.stringify(interface), + 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 8a44b54..2ba6b79 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -78,6 +78,95 @@ kimchi.guest_edit_main = function() { }); }; + var setupInterface = function() { + $(".add", "#form-guest-edit-interface").button({ + icons: { primary: "ui-icon-plusthick" }, + text: false + }).click(function(){ + addItem({ + mac: "", + network: "", + type: "network", + viewMode: "hide", + editMode: "" + }); + }); + var toggleEdit = function(item, on){ + $("label", item).toggleClass("hide", on); + $("select", item).toggleClass("hide", !on); + $(".action-area", item).toggleClass("hide"); + }; + var addItem = function(data) { + var itemNode = $.parseHTML(kimchi.template($('#interface-tmpl').html(),data)); + $(".body", "#form-guest-edit-interface").append(itemNode); + $("select", itemNode).append(networkOptions); + if(data.network!==""){ + $("select", itemNode).val(data.network); + } + $(".edit", itemNode).button({ + disabled: true, + icons: { primary: "ui-icon-pencil" }, + text: false + }).click(function(){ + toggleEdit($(this).parent().parent(), true); + }); + $(".delete", itemNode).button({ + icons: { primary: "ui-icon-trash" }, + text: false + }).click(function(){ + var item = $(this).parent().parent(); + kimchi.deleteGuestInterface(kimchi.selectedGuest, item.prop("id"), function(){ + item.remove(); + }); + }); + $(".save", itemNode).button({ + icons: { primary: "ui-icon-disk" }, + text: false + }).click(function(){ + var item = $(this).parent().parent(); + var interface = { + network: $("select", item).val(), + type: "network" + }; + var postUpdate = function(){ + $("label", item).text(interface.network); + toggleEdit(item, false); + }; + if(item.prop("id")==""){ + kimchi.createGuestInterface(kimchi.selectedGuest, interface, function(data){ + item.prop("id", data.mac); + postUpdate(); + }); + }else{ + kimchi.updateGuestInterface(kimchi.selectedGuest, item.prop("id"), interface, function(){ + postUpdate(); + }); + } + }); + $(".cancel", itemNode).button({ + icons: { primary: "ui-icon-arrowreturnthick-1-w" }, + text: false + }).click(function(){ + var item = $(this).parent().parent(); + $("label", item).text()==="" ? item.remove() : toggleEdit(item, false); + }); + }; + var networkOptions = ""; + kimchi.listNetworks(function(data){ + for(var i=0;i<data.length;i++){ + var isSlected = i==0 ? " selected" : ""; + networkOptions += "<option"+isSlected+">"+data[i].name+"</option>"; + } + kimchi.getGuestInterfaces(kimchi.selectedGuest, function(data){ + for(var i=0;i<data.length;i++){ + data[i].viewMode = ""; + data[i].editMode = "hide"; + addItem(data[i]); + } + }); + }); + }; + var initContent = function(guest) { guest['icon'] = guest['icon'] || 'images/icon-vm.png'; $('#form-guest-edit-general').fillWithObject(guest); @@ -99,6 +188,8 @@ kimchi.guest_edit_main = function() { refreshCDROMs(); }; + setupInterface(); + kimchi.topic('kimchi/vmCDROMAttached').subscribe(onAttached); kimchi.topic('kimchi/vmCDROMReplaced').subscribe(onReplaced); kimchi.topic('kimchi/vmCDROMDetached').subscribe(onDetached); diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index aae9694..552b4c8 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -35,6 +35,9 @@ <li> <a href="#form-guest-edit-storage">$_("Storage")</a> </li> + <li> + <a href="#form-guest-edit-interface">$_("Interface")</a> + </li> </ul> <form id="form-guest-edit-general"> <fieldset class="guest-edit-fieldset"> @@ -101,6 +104,14 @@ </div> </fieldset> </form> + <form id="form-guest-edit-interface" class="guest-edit-interface"> + <div class="header"> + <span class="cell">$_("Network")</span> + <span class="cell">$_("Type")</span> + <button class="add action-area"></button> + </div> + <div class="body"></div> + </form> </div> </div> <footer> @@ -131,6 +142,23 @@ </div> </div> </script> +<script id="interface-tmpl" type="text/html"> + <div class="item" id="{mac}"> + <span class="cell"> + <label class="{viewMode}">{network}</label> + <select class="{editMode}"></select> + </span> + <span class="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> <script type="text/javascript"> kimchi.guest_edit_main(); -- 1.7.1

2 1