- Kimchi-devel - oVirt List Archives

[PATCH] issue #435: Fix resource authorization logic
by Crístian Viana 24 Sep '14

24 Sep '14

The current logic is broken. Therefore, some cases which should allow a user to have access to a VM may fail. For example, if one VM has only group permission but no user permission, users who are members of the allowed groups are not able to access that VM. Other cases may behave wrong as well. Change the authorization logic so it works in all cases. Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- src/kimchi/control/base.py | 9 +++------ tests/test_authorization.py | 5 ++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/kimchi/control/base.py b/src/kimchi/control/base.py index 6391a1a..2e0816f 100644 --- a/src/kimchi/control/base.py +++ b/src/kimchi/control/base.py @@ -160,13 +160,10 @@ class Resource(object): users = self.data.get("users", None) groups = self.data.get("groups", None) - if (users is not None or groups is not None) and \ - user_role and user_role != 'admin' and \ - (user_name not in users or - (groups and list(set(user_groups) & set(groups)) == [])): - return False + if (users is None and groups is None) or user_role == 'admin': + return True - return True + return user_name in users or len(set(user_groups) & set(groups)) > 0 def update(self): try: diff --git a/tests/test_authorization.py b/tests/test_authorization.py index a74e3c7..2c342a5 100644 --- a/tests/test_authorization.py +++ b/tests/test_authorization.py @@ -121,10 +121,13 @@ class AuthorizationTests(unittest.TestCase): model.vms_create({'name': u'test-usera', 'template': '/templates/test'}) model.vm_update(u'test-usera', {'users': [ 'userA' ], 'groups': []}) + model.vms_create({'name': u'test-groupa', 'template': '/templates/test'}) + model.vm_update(u'test-groupa', {'groups': [ 'groupA' ]}) + resp = self.request('/vms', '{}', 'GET') self.assertEquals(200, resp.status) vms_data = json.loads(resp.read()) - self.assertEquals([ u'test-me' ], [ v['name'] for v in vms_data ]) + self.assertEquals([ u'test-groupa', u'test-me' ], sorted([ v['name'] for v in vms_data ])) resp = self.request('/vms', req, 'POST') self.assertEquals(403, resp.status) -- 1.9.3

2 1

[PATCH V3] Bugfix:#424 Edit Template, "Disk (GB)" is changing with storage pool
by Wen Wang 24 Sep '14

24 Sep '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V2 -> V3: Make the value of "Disk(GB)" inputbox consistent with user input. If choosing iSCSI or SCSI, inputbox is disabled and value of "Disk(GB)" is refreshed with the system. If changing back, the value stays the same with user last input. V1 -> V2: Considering iSCSI and SCSI situation that we need to have the input box disabled when choosing iSCSI and SCSI for storage pool and enable when choosing others. This patch fix the bug that value of "Disk(GB)" input box is changing with the item of "Storage Pool" in "Templates" --> "Actions" --> "Edit" -->"Edit Templates" dialogue. This might be comfusing to user when changing the "Storage Pool", "Disk(GB)" is changed with it without even notice. This might confuse the users and is not necessary. Solved by removing the change. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.template_edit_main.js | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index cb43091..d2bbe23 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -40,6 +40,7 @@ kimchi.template_edit_main = function() { } var disks = template.disks; $('input[name="disks"]').val(disks[0].size); + kimchi.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); @@ -128,19 +129,16 @@ kimchi.template_edit_main = function() { $('input[name="disks"]', templateEditForm).attr('disabled','disabled'); return false; }, function (err) { + $('input[name="disks"]', templateEditForm).val(kimchi.templateDiskSize); kimchi.message.error(err.responseJSON.reason); }); } else { - if (origPool == storagepool) { - // Previous disk size value - $('input[name="disks"]', templateEditForm).val(origDisks[0].size); - } else { - // Default disk size value - $('input[name="disks"]', templateEditForm).val(10); - } $('input[name="disks"]', templateEditForm).removeAttr('disabled'); } }); + $('input[name="disks"]', templateEditForm).keyup(function() { + kimchi.templateDiskSize = $('input[name="disks"]', templateEditForm).val(); + }); $('#tmpl-edit-button-save').on('click', function() { var editableFields = [ 'name', 'cpus', 'memory', 'storagepool', 'disks', 'graphics']; -- 1.7.1

2 2

Bugs in test matrix updated
by Crístian Viana 23 Sep '14

23 Sep '14

Hi everyone! The bugs listed in the test matrix for the 1.3 release have been updated because a lot of them have been fixed. Great work! Please take a look at the table to make sure the ones still there are actually open: https://github.com/kimchi-project/kimchi/wiki/Testing-1.3 Also, I'd like to remind you that tomorrow is the last day before the 1.3 GA release, so let's focus on the remaining bugs! :-) Best regards, Crístian.

1 0

[PATCH] Adding ability to pass an optional custom MAC address when users add an interface to a cold vm.
by bbaude＠redhat.com 23 Sep '14

23 Sep '14

From: Brent Baude <bbaude(a)redhat.com> Feature to add a custom mac address when creating network interfaces. --- docs/API.md | 1 + src/kimchi/API.json | 4 ++++ src/kimchi/i18n.py | 2 ++ src/kimchi/model/vmifaces.py | 25 +++++++++++++++++++++---- tests/test_model.py | 10 ++++++++++ ui/css/theme-default/guest-edit.css | 4 ++-- ui/js/src/kimchi.guest_edit_main.js | 18 ++++++++++++------ ui/pages/guest-edit.html.tmpl | 11 ++++++++--- 8 files changed, 60 insertions(+), 15 deletions(-) diff --git a/docs/API.md b/docs/API.md index c070fa7..02daa37 100644 --- a/docs/API.md +++ b/docs/API.md @@ -223,6 +223,7 @@ Represents all network interfaces attached to a Virtual Machine. interface type is network. * type: The type of VM network interface that libvirt supports. Now kimchi just supports 'network' type. + * custommac: A custom mac address for the interface ### Sub-Resource: Virtual Machine Network Interface diff --git a/src/kimchi/API.json b/src/kimchi/API.json index 1319531..a020e1e 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -334,6 +334,10 @@ "type": "string", "pattern": "^ne2k_pci|i82551|i82557b|i82559er|rtl8139|e1000|pcnet|virtio$", "error": "KCHVMIF0006E" + }, + "custommac": { + "description": "optional custom mac address for the network interface", + "type": "string" } } }, diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 9e66c68..8d024f9 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -105,6 +105,8 @@ messages = { "KCHVMIF0006E": _("Invalid network model card specified for virtual machine interface"), "KCHVMIF0007E": _("Specify type and network to add a new virtual machine interface"), "KCHVMIF0008E": _("Specify type and network to update a virtual machine interface"), + "KCHVMIF0009E": _("The custom MAC address %(custommac)s is not properly formatted as 12 character hexidecimal value seperated by colons(:)"), + "KCHTMPL0001E": _("Template %(name)s already exists"), "KCHTMPL0002E": _("Template %(name)s does not exist"), diff --git a/src/kimchi/model/vmifaces.py b/src/kimchi/model/vmifaces.py index 66b3827..2b3b31d 100644 --- a/src/kimchi/model/vmifaces.py +++ b/src/kimchi/model/vmifaces.py @@ -18,6 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import random +import re import libvirt from lxml import etree, objectify @@ -45,6 +46,13 @@ class VMIfacesModel(object): random.randint(0x00, 0xff)] return ':'.join(map(lambda x: "%02x" % x, mac)) + def validMac(mymac): + pattern = r'^(?i)([0-9A-F]{2}[:-]){5}([0-9A-F]{2})$' + if bool(re.match(pattern, mac)) is not True: + return False + else: + return True + conn = self.conn.get() networks = conn.listNetworks() + conn.listDefinedNetworks() @@ -60,6 +68,14 @@ class VMIfacesModel(object): for iface in self.get_vmifaces(vm, self.conn)) mac = randomMAC() + if 'custommac' not in params: + mac = randomMAC() + else: + if len(params['custommac']) == 0: + mac = randomMAC() + else: + mac = params["custommac"] + while True: if mac not in macs: break @@ -73,10 +89,11 @@ class VMIfacesModel(object): attrib = {"type": params["type"]} xml = etree.tostring(E.interface(*children, **attrib)) - - dom.attachDeviceFlags(xml, libvirt.VIR_DOMAIN_AFFECT_CURRENT) - - return mac + if validMac(mac): + dom.attachDeviceFlags(xml, libvirt.VIR_DOMAIN_AFFECT_CURRENT) + return mac + else: + raise NotFoundError("KCHVMIF0009E", {'custommac': mac}) @staticmethod def get_vmifaces(vm, conn): diff --git a/tests/test_model.py b/tests/test_model.py index 5774c82..13b5269 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -219,6 +219,16 @@ class ModelTests(unittest.TestCase): self.assertEquals("default", iface['network']) self.assertEquals("e1000", iface["model"]) + # custom MAC address test + iface_args = {"type": "network", + "network": "test-network", + "model": "virtio", + "custommac": "52:54:00:17:cd:e7"} + mac = inst.vmifaces_create('kimchi-ifaces', iface_args) + iface = inst.vmiface_lookup('kimchi-ifaces', mac) + self.assertEquals("52:54:00:17:cd:e7", iface['mac']) + rollback.prependDefer(inst.vmiface_delete, 'kimchi-ifaces', mac) + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_vm_disk(self): disk_path = '/tmp/existent2.iso' diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index 74c2237..f0e1bb0 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -112,7 +112,7 @@ #form-guest-edit-storage .cell, .guest-edit-interface .cell { display: inline-block; - width: 250px; + width: 150px; } #form-guest-edit-storage .cell.dev { @@ -130,7 +130,7 @@ } .guest-edit-interface .body select { - width: 180px; + width: 150px; padding: 0px; } diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 938dfd9..a7c822a 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -175,7 +175,10 @@ kimchi.guest_edit_main = function() { var toggleEdit = function(item, on){ $("label", item).toggleClass("hide", on); $("select", item).toggleClass("hide", !on); - $(".action-area", item).toggleClass("hide"); + $("input", item).toggleClass("hide", !on); + $(".action-area#editmode", item).toggleClass("hide", !on); + $(".action-area#viewmode", item).toggleClass("hide", on); + }; var addItem = function(data) { var itemNode = $.parseHTML(kimchi.substitute($('#interface-tmpl').html(),data)); @@ -211,20 +214,23 @@ kimchi.guest_edit_main = function() { var item = $(this).parent().parent(); var interface = { network: $("select", item).val(), - type: "network" + type: "network", + custommac: $("input",item).val().toLowerCase() }; - var postUpdate = function(){ + var postUpdate = function(mymac){ $("label", item).text(interface.network); - toggleEdit(item, false); + $("label#custommac", item).text(mymac); + toggleEdit(item.prop, false); }; if(item.prop("id")==""){ kimchi.createGuestInterface(kimchi.selectedGuest, interface, function(data){ item.prop("id", data.mac); - postUpdate(); + $("label#custommac", item).text(data.mac) + postUpdate(data.mac); }); }else{ kimchi.updateGuestInterface(kimchi.selectedGuest, item.prop("id"), interface, function(){ - postUpdate(); + postUpdate(data.mac); }); } }); diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 0b7dad3..0aa9f3b 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -108,7 +108,8 @@ <div class="header"> <span class="cell">$_("Network")</span> <span class="cell">$_("Type")</span> - <button class="add action-area"></button> + <span class="cell">$_("MAC")</span> + <button id="interfaceadd" class="add action-area"></button> </div> <div class="body"></div> </form> @@ -192,10 +193,14 @@ <span class="cell"> <span>{type}</span> </span> - <span class="action-area {editMode}"> + <span class="cell"> + <label class="{viewMode}" id="custommac">{mac}</label> + <input type="text" id="insertmac" class="{editMode}"/> + </span> + <span class="action-area {editMode}" id="editmode"> <button class="save"></button><button class="cancel"></button> </span> - <span class="action-area {viewMode}"> + <span class="action-area {viewMode}" id="viewmode"> <button class="edit"></button><button class="delete"></button> </span> <div> -- 1.9.3

5 6

[PATCH V2] Detect and enable help page from plugins tabs
by Rodrigo Trujillo 23 Sep '14

23 Sep '14

V1: Kimchi is currently not able to configure and open help pages of any plugin tab. This patch fixes this problem and removes the HELP button if the plugin does not have a help configured properly. Help pages for a plugin tab follow same Kimchi system: - html help file should have the same name of plugin html tab file - html files should be in plugin's " ui/pages/help/<LANG> " path - plugin should add following lines to <PLUGIN_NAME>.conf: * [/help] * tools.staticdir.on = True * tools.nocache.on = True - plugins should add a <help> element with tab help html name in "ui/config/tab-ext.xml", for each configured tab. If this element does not exist, 'Help' will be disabled V2: - Changed the way that tab help html is being checked. - Now, all tabs have the help html file checked (per language) You can check enabling Sample plugin. Go to plugin Sample tab. For en_US, the help button will be enabled. But if you logout and change to other language, the help button will be disabled, because the sample plugin does not have help in other languages. Rodrigo Trujillo (1): Detect and enable help pages for tabs and plugin tabs plugins/sample/sample.conf.in | 4 ++++ plugins/sample/ui/pages/help/en_US/tab.html | 1 + src/kimchi/config.py.in | 1 + src/kimchi/utils.py | 9 ++++++-- ui/js/src/kimchi.main.js | 36 ++++++++++++++++++++++++++++- 5 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 plugins/sample/ui/pages/help/en_US/tab.html -- 1.9.3

2 4

[PATCH V3] Bugfix#426: When no interface available, creating network popup error
by Wen Wang 23 Sep '14

23 Sep '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V2 -> V3: Change the align of "No interfaces found" that is aligned in another line. Using ".show()", ".hide()" instead of "prop()". V1 -> V2: Add an indicator "(No interfaces found)" in "bridged" option under Network tab when there exists no bridged interface. This patch fix the the issue when creating a network that lack of interface options pops up errors Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/network.css | 6 ++++++ ui/js/src/kimchi.network.js | 11 ++++++----- ui/pages/tabs/network.html.tmpl | 9 +++++++-- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ui/css/theme-default/network.css b/ui/css/theme-default/network.css index 6f690ed..5d07468 100644 --- a/ui/css/theme-default/network.css +++ b/ui/css/theme-default/network.css @@ -170,6 +170,12 @@ height: 200px; } +.network-config .section-container .bridged-inline { + display: inline-block; + vertical-align: top; + max-width: 520px; +} + .network-config .section-header { font-weight: bold; font-size: 14px; diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 4ee7249..7194f93 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -247,17 +247,16 @@ kimchi.openNetworkDialog = function(okCallback) { kimchi.getInterfaces(function(result) { var options = []; $('#networkDestinationID').selectMenu(); - $("#networkDestinationID").on('click',function(){ - }); var nics = {}; for (var i = 0; i < result.length; i++) { options.push({label:result[i].name,value:result[i].name}); nics[result[i].name] = result[i]; } - $("#networkDestinationID").selectMenu("setData", options); + result.length>0 && $("#networkDestinationID").selectMenu("setData", options); onChange = function() { $("#networkDestinationLabel").text($("#networkDestinationID li:first-child").text()); - if (nics[$("#networkDestinationLabel").text()].type === "bridge") { + $("#networkDestinationID li:first-child").addClass("active"); + if (result.length>0 && nics[$("#networkDestinationLabel").text()].type === "bridge") { $("#enableVlan").prop("checked", false); $("#enableVlan").prop("disabled", true); $("#networkVlanID").val(""); @@ -268,8 +267,8 @@ kimchi.openNetworkDialog = function(okCallback) { } }; $("#networkDestinationLabel").on("change", onChange); - onChange(); kimchi.setDefaultNetworkType(result.length!==0); + onChange(); }); $("#networkConfig").dialog({ title : i18n.KCHNET6003M @@ -318,10 +317,12 @@ kimchi.setDefaultNetworkType = function(isInterfaceAvail) { $("#networkTypeNat").prop("checked", !isInterfaceAvail); if (!isInterfaceAvail) { kimchi.enableBridgeOptions(false); + $("#networkBriDisabledLabel").show(); } else { $("#bridgeOptions").slideDown(100); $("#networkVlanID").toggle(false); $("#labelNetworkVlanID").toggle(false); + $("#networkBriDisabledLabel").hide(); } }; diff --git a/ui/pages/tabs/network.html.tmpl b/ui/pages/tabs/network.html.tmpl index 214fb01..6a6e5f7 100644 --- a/ui/pages/tabs/network.html.tmpl +++ b/ui/pages/tabs/network.html.tmpl @@ -65,8 +65,13 @@ <label for="networkTypeNat">$_("NAT: outbound physical network connection only")</label> </div> <div class="input-container"> - <input type="radio" id="networkTypeBri" name="networkType" value="bridged" /> - <label for="networkTypeBri">$_("Bridged: Virtual machines are connected to physical network directly")</label> + <div class="bridged-inline"> + <input type="radio" id="networkTypeBri" name="networkType" value="bridged" /> + </div> + <div class="bridged-inline"> + <label for="networkTypeBri">$_("Bridged: Virtual machines are connected to physical network directly")</label><br /> + <label id="networkBriDisabledLabel" style="display:none">$_("(No interfaces found)")</label> + </div> </div> <div id="bridgeOptions"> <div> -- 1.7.1

2 2

[PATCH] help i18n: Add new languages to build process
by Aline Manera 23 Sep '14

23 Sep '14

Commit c9649834 was reverted because wildcard can not be used to list subdirectories: [alinefm@alinefm kimchi]$ sudo ./autogen.sh --system ui/pages/help/Makefile.am:17: error: required directory ui/pages/help/$(dir does not exist ui/pages/help/Makefile.am:17: error: required directory ui/pages/help/$(wildcard does not exist ui/pages/help/Makefile.am:17: error: required directory ui/pages/help/*/)) does not exist ui/pages/help/Makefile.am:17: error: required directory ui/pages/help/$(dir does not exist ui/pages/help/Makefile.am:17: error: required directory ui/pages/help/$(wildcard does not exist ui/pages/help/Makefile.am:17: error: required directory ui/pages/help/*/)) does not exist autoreconf: automake failed with exit status: 1 So manually list the new languages supported for help. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/pages/help/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/pages/help/Makefile.am b/ui/pages/help/Makefile.am index fa9786b..5c04319 100644 --- a/ui/pages/help/Makefile.am +++ b/ui/pages/help/Makefile.am @@ -14,7 +14,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -SUBDIRS = en_US pt_BR zh_CN +SUBDIRS = zh_CN it_IT en_US zh_TW pt_BR ja_JP ru_RU ko_KR fr_FR de_DE es_ES DITA_HTML_FILES = $(patsubst %.dita,%.html,$(wildcard */*.dita)) HTML_FILES = $(if $(DITA_HTML_FILES), $(DITA_HTML_FILES), $(wildcard */*.html)) -- 1.9.3

2 2

[PATCH] Bugfix: Overlap issue occurs on the Power Off confirmation dialog
by Wen Wang 23 Sep '14

23 Sep '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> This patch fixes the bug that layout of confirm dialogue display rightly when changing the languages. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/message.css | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ui/css/theme-default/message.css b/ui/css/theme-default/message.css index 2631a18..c530f84 100644 --- a/ui/css/theme-default/message.css +++ b/ui/css/theme-default/message.css @@ -79,7 +79,7 @@ max-width: 100%; max-height: 100%; width: 350px; - height: 170px; + height: 200px; z-index: 9999; } -- 1.7.1

3 3

[PATCH] Bugfix#: Prevent overlap issue occurs under General tab on Edit
by Wen Wang 23 Sep '14

23 Sep '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> This patch fix the bug that occurs when changing languages which might contain long words that cause problems of layout in "General" tab under "Edit" for VM. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/guest-edit.css | 10 ++++---- ui/pages/guest-edit.html.tmpl | 38 +++++++++++++++------------------- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index f6cf214..75032c6 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -33,6 +33,10 @@ padding: 1em; } +#form-guest-edit-general .edit-general-inline { + display: inline-block; +} + #form-guest-edit-storage input[readonly] { background: none; border-color: transparent; @@ -43,16 +47,12 @@ padding-right: 0; } -.guest-edit-wrapper-label, .guest-edit-wrapper-controls { - display: inline-block; -} - .guest-edit-wrapper-label { height: 38px; line-height: 38px; margin-top: 5px; vertical-align: top; - width: 100px; + min-width: 100px; } #form-guest-edit-storage .guest-edit-wrapper-label { diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 0eaa08d..3003ab1 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -44,48 +44,44 @@ </ul> <form id="form-guest-edit-general"> <fieldset class="guest-edit-fieldset"> - <div> + <div class="edit-general-inline"> <div class="guest-edit-wrapper-label"> <label for="guest-edit-id-textbox"> $_("Name") </label> </div> - <div class="guest-edit-wrapper-controls"> - <input id="guest-edit-id-textbox" - name="name" type="text" /> - </div> - </div> - <div> <div class="guest-edit-wrapper-label"> <label for="guest-edit-cores-textbox"> $_("CPUs") </label> </div> + <div class="guest-edit-wrapper-label"> + <label for="guest-edit-memory-textbox"> + $_("Memory (MB)") + </label> + </div> + <div class="guest-edit-wrapper-label"> + <label for="guest-edit-icon-textbox"> + $_("Icon") + </label> + </div> + </div> + <div class="edit-general-inline"> + <div class="guest-edit-wrapper-controls"> + <input id="guest-edit-id-textbox" + name="name" type="text" /> + </div> <div class="guest-edit-wrapper-controls"> <input id="guest-edit-cores-textbox" name="cpus" type="text" /> </div> - </div> - <div> - <div class="guest-edit-wrapper-label"> - <label for="guest-edit-memory-textbox"> - $_("Memory (MB)") - </label> - </div> <div class="guest-edit-wrapper-controls"> <input id="guest-edit-memory-textbox" name="memory" type="text" /> </div> - </div> - <div> - <div class="guest-edit-wrapper-label"> - <label for="guest-edit-icon-textbox"> - $_("Icon") - </label> - </div> <div class="guest-edit-wrapper-controls"> <input id="guest-edit-icon-textbox" -- 1.7.1

3 2

[PATCH] Bug 431 Fix
by huoyuxin＠linux.vnet.ibm.com 23 Sep '14

23 Sep '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storage_main.js | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index 28b2b58..9a45b65 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -21,7 +21,7 @@ kimchi.doListStoragePools = function() { if (result && result.length) { var listHtml = ''; $.each(result, function(index, value) { - value.usage = parseInt(value.allocated / value.capacity * 100) || 0; + value.usage = Math.round(value.allocated / value.capacity * 100) || 0; value.capacity = kimchi.changetoProperUnit(value.capacity,1); value.allocated = kimchi.changetoProperUnit(value.allocated,1); value.enableExt = value.type==="logical" ? "" : "hide-content"; @@ -313,7 +313,12 @@ kimchi.initLogicalPoolExtend = function() { $("input[type='checkbox']:checked", "#logicalPoolExtend").each(function(){ devicePaths.push($(this).prop('value')); }) - kimchi.updateStoragePool($("#logicalPoolExtend").dialog("option", "poolName"),{disks: devicePaths}); + kimchi.updateStoragePool($("#logicalPoolExtend").dialog("option", "poolName"),{disks: devicePaths},function(data){ + var item = $("#"+$("#logicalPoolExtend").dialog("option", "poolName")); + $(".usage", $(".storage-name", item)).text((Math.round(data.allocated/data.capacity*100)||0)+"%"); + $(".storage-text", $(".storage-capacity", item)).text(kimchi.changetoProperUnit(data.capacity,1)); + $(".storage-text", $(".storage-allocate", item)).text(kimchi.changetoProperUnit(data.allocated,1)); + }); $(this).dialog("close"); } }] -- 1.7.1

2 1