- Kimchi-devel - oVirt List Archives

[PATCH] UI: Display iSCSI targets for Selection
by huoyuxin＠linux.vnet.ibm.com 25 Aug '14

25 Aug '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/storage.css | 50 +++++++++++++++++++ ui/js/src/kimchi.api.js | 16 ++++++ ui/js/src/kimchi.storagepool_add_main.js | 76 ++++++++++++++++++++++++++++++ ui/pages/storagepool-add.html.tmpl | 7 ++- 4 files changed, 147 insertions(+), 2 deletions(-) diff --git a/ui/css/theme-default/storage.css b/ui/css/theme-default/storage.css index 4f439e8..cb0caee 100644 --- a/ui/css/theme-default/storage.css +++ b/ui/css/theme-default/storage.css @@ -593,3 +593,53 @@ center no-repeat; padding: 0 20px 0 26px; } + +.storage-admin .filter-select { + display: inline-block; + position: relative; +} + +.storage-admin .filter-select input { + border: 1px solid #CCCCCC; + border-radius: 1px; + font-size: 14px; + color: #666666; + padding: 3px 3px 3px 10px; + height: 30px; + width: 493px; +} + +.storage-admin .filter-select input::-ms-clear { + display: none; +} + +.storage-admin .filter-select .arrow { + display: inline-block; + vertical-align: middle; + position: relative; + left: -25px; +} + +.storage-admin .filter-select .option { + border-style: solid; + border-color: #CCCCCC; + border-width: 0px 1px 1px 1px; + border-radius: 1px; + font-size: 14px; + background-color: white; + width: 506px; + max-height: 140px; + overflow: auto; + color: #666666; + position: absolute; + z-index: 1000; +} + +.storage-admin .filter-select .option .item { + padding: 5px 10px; + cursor: pointer; +} + +.storage-admin .filter-select .option .item:hover { + background-color: #DDDDDD; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 4562992..d89919e 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -1098,5 +1098,21 @@ var kimchi = { kimchi.message.error(data.responseJSON.reason); } }); + }, + + getISCSITargets : function(server, port, suc, err) { + server = encodeURIComponent(server); + port = encodeURIComponent(port); + kimchi.requestJSON({ + url : kimchi.url + 'storageservers/'+server+'/storagetargets?_target_type=iscsi&_server_port='+port, + 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.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index ecbc682..49ba9e1 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -34,6 +34,78 @@ kimchi.storagepool_add_main = function() { }); }; +kimchi.storageFilterSelect = function(id, isUpdate) { + var input = $('input', '#'+id); + var options = $(".option", '#'+id); + var filter = function(container, key){ + container.children().each(function(){ + $(this).css("display", $(this).text().indexOf(key)==-1 ? "none" : ""); + }); + }; + if(!isUpdate){ + $('.arrow', '#'+id).click(function(){ + options.toggleClass("hide-content"); + }); + input.focus(function(){ + options.removeClass("hide-content"); + }).on("keyup", function(){ + filter(options, input.val()); + }); + } + options.children().each(function(){ + $(this).click(function(){ + input.val($(this).text()); + $('.option', "#iSCSITarget").addClass("hide-content"); + filter(options, ""); + }); + }); +}; + +kimchi.initISCSITargets = function(){ + var loadTargets = function(server, port, callback){ + var isUpdate = $(".option", "#iSCSITarget").children().length > 0; + $(".option", "#iSCSITarget").empty(); + $('input', "#iSCSITarget").val("loading targets..."); + kimchi.getISCSITargets(server, port, function(data){ + if(data.length==0){ + $('input', "#iSCSITarget").val("no targets is got."); + }else{ + for(var i=0; i<data.length; i++){ + var itemNode = $.parseHTML("<div class='item'>"+data[i].target+"</div>"); + $(".option", "#iSCSITarget").append(itemNode); + } + kimchi.storageFilterSelect('iSCSITarget', isUpdate); + $('input', "#iSCSITarget").attr("readonly", false); + $('input', "#iSCSITarget").val(""); + $('input', "#iSCSITarget").trigger("focus"); + } + callback(); + }, function(data){ + $('input', "#iSCSITarget").val("failed to load targets."); + kimchi.message.error(data.responseJSON.reason); + callback(); + }); + }; + var triggerLoadTarget = function(){ + var server = $("#iscsiserverId").val().trim(); + var port = $("#iscsiportId").val().trim(); + if(server!="" && port!="" && !$("#iscsiserverId").hasClass("invalid-field") && !$("#iscsiportId").hasClass("invalid-field")){ + $("#iscsiserverId").attr("disabled", true); + $("#iscsiportId").attr("disabled", true); + loadTargets(server, port, function(){ + $("#iscsiserverId").attr("disabled", false); + $("#iscsiportId").attr("disabled", false); + }); + } + }; + $("#iscsiserverId").change(function(){ + triggerLoadTarget(); + }); + $("#iscsiportId").change(function(){ + triggerLoadTarget(); + }); +}; + kimchi.initStorageAddPage = function() { kimchi.listHostPartitions(function(data) { if (data.length > 0) { @@ -160,6 +232,10 @@ kimchi.initStorageAddPage = function() { $('#iscsiportId').keyup(function(event) { $(this).toggleClass("invalid-field",!/^[0-9]+$/.test($(this).val())); }); + $('#iscsiserverId').keyup(function(event) { + $(this).toggleClass("invalid-field",!kimchi.isServer($(this).val().trim())); + }); + kimchi.initISCSITargets(); }; /* Returns 'true' if all form fields were filled, 'false' if diff --git a/ui/pages/storagepool-add.html.tmpl b/ui/pages/storagepool-add.html.tmpl index 1eb2029..ee19ed5 100644 --- a/ui/pages/storagepool-add.html.tmpl +++ b/ui/pages/storagepool-add.html.tmpl @@ -23,7 +23,7 @@ <!DOCTYPE html> <html> <body> - <div class="window storage-window"> + <div class="window storage-window storage-admin"> <header> <h1 class="title">$_("Define a New Storage Pool")</h1> <div class="close">X</div> @@ -119,7 +119,10 @@ <h2>4. $_("Target")</h2> <div class="field"> <p class="text-help">$_("The iSCSI target on iSCSI server")</p> - <input id="iscsiTargetId" type="text" class="text storage-base-input-width"> + <span class="filter-select" id="iSCSITarget"> + <div><input id="iscsiTargetId" type="text" readonly><a class="ui-icon ui-icon-triangle-1-s arrow"></a></div> + <div class="option hide-content"></div> + </span> </div> </section> <section class="form-section"> -- 1.7.1

3 2

[PATCH 0/2] Allow admin user change permission settings when VM is running
by Wen Wang 25 Aug '14

25 Aug '14

Changes: 1) Have the "Manage Media" function deleted from "Action" list 2) Enable "Edit" whether VM is running or off 3) Disable edit function of "General", "Storage", "Interface" except "replace" of the cdrom under "Storage". Wen Wang (2): UI: Delete Manage Media function from action list Allow admin user change permission settings when VM is running ui/js/src/kimchi.guest_edit_main.js | 54 ++++++++++++++++++++++---------- ui/js/src/kimchi.guest_main.js | 14 -------- ui/pages/guest-edit.html.tmpl | 2 +- ui/pages/guest-media.html.tmpl | 57 ----------------------------------- ui/pages/guest.html.tmpl | 1 - 5 files changed, 38 insertions(+), 90 deletions(-) delete mode 100644 ui/pages/guest-media.html.tmpl

3 10

[PATCH V2 0/2] Allow admin user change settings when VM is running
by Wen Wang 25 Aug '14

25 Aug '14

Changes: V1 -> V2: 1) Have the "ui/css/theme-default/guest-media.css" deleted 2) Have the "edit" button in interface tab deleted when VM is running 1) Have the "Manage Media" function deleted from "Action" list 2) Enable "Edit" whether VM is running or off 3) Disable edit function of "General", "Storage", "Interface" except "replace" of the cdrom under "Storage". Wen Wang (2): UI: Delete Manage Media function from action list Allow admin user change permission settings when VM is running ui/css/theme-default/guest-media.css | 42 ------------------------- ui/js/src/kimchi.guest_edit_main.js | 56 ++++++++++++++++++++++----------- ui/js/src/kimchi.guest_main.js | 14 -------- ui/pages/guest-edit.html.tmpl | 2 +- ui/pages/guest-media.html.tmpl | 57 ---------------------------------- ui/pages/guest.html.tmpl | 1 - 6 files changed, 39 insertions(+), 133 deletions(-) delete mode 100644 ui/css/theme-default/guest-media.css delete mode 100644 ui/pages/guest-media.html.tmpl

2 7

[PATCH 0/2] Warn before Power Off non-persistent VM
by Christy Perez 21 Aug '14

21 Aug '14

Adding a new field for VM properties, and a new error message. Note: The error message needs Portuguese and Chinese translation. Christy Perez (2): Add persistent flag to VM info Display appropriate warning for Power Off of non-persistent VM docs/API.md | 2 ++ po/en_US.po | 3 +++ po/pt_BR.po | 3 +++ po/zh_CN.po | 3 +++ src/kimchi/model/vms.py | 3 ++- ui/js/src/kimchi.guest_main.js | 6 +++++- ui/pages/i18n.json.tmpl | 1 + 7 files changed, 19 insertions(+), 2 deletions(-) -- 1.9.3

3 9

[PATCH V2] Bugfix UI: Change button text to indicate user network is generating
by Wen Wang 21 Aug '14

21 Aug '14

V1 -> V2: 1)Change the create button from "Creating..." to "Create" when error occurs. 2)Disable input when creating a new network. When network is generating, if the network is not up, we bring the network up first, then we create the network. During the time we bring the network up(less than 10s), we change the text as well as the layout of the button to indicate this process is working. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.network.js | 10 ++++++++++ ui/pages/i18n.json.tmpl | 1 + 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index c8f983f..4ee7249 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -207,6 +207,11 @@ kimchi.initNetworkCreation = function() { network.persistent = result.persistent; kimchi.addNetworkItem(network); $("#networkConfig").dialog("close"); + }, function(data) { + kimchi.message.error(data.responseJSON.reason); + $("#networkFormOk").button("enable"); + $("#networkName").removeAttr("readonly"); + $("#networkFormOk span").text(i18n.KCHAPI6005M); }); }); }); @@ -270,6 +275,9 @@ kimchi.openNetworkDialog = function(okCallback) { title : i18n.KCHNET6003M }); $("#networkFormOk").on("click", function() { + $("#networkFormOk").button("disable"); + $("#networkName").prop("readonly", "readonly"); + $("#networkFormOk span").text(i18n.KCHAPI6008M); okCallback(); }); $("#enableVlan").on("click", function() { @@ -337,6 +345,8 @@ kimchi.cleanNetworkDialog = function() { $("#networkDestinationLabel").text($("#networkDestinationID li:first-child").text()); $("#networkFormOk").off("click"); $("#networkFormOk").button("disable"); + $("#networkFormOk span").text(i18n.KCHAPI6005M); + $("#networkName").removeAttr("readonly"); $("#networkVlanID").toggle(false); $("#labelNetworkVlanID").toggle(false); $("#enableVlan").prop("checked", false); diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index ccfb081..cbcd077 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -49,6 +49,7 @@ "KCHAPI6005M": "$_("Create")", "KCHAPI6006M": "$_("Warning")", "KCHAPI6007M": "$_("Save")", + "KCHAPI6008M": "$_("Creating...")", "KCHGRD6001M": "$_("Loading...")", "KCHGRD6002M": "$_("An error occurs while checking for packages update.")", -- 1.7.1

3 3

[PATCH v2] Bug fix: Github #354
by Daniel Henrique Barboza 21 Aug '14

21 Aug '14

v2: - fixed "make check" issue The following patch fixes the issue described in Github #354: "storage: used nfs source path need to be filtered out in creation page" https://github.com/kimchi-project/kimchi/issues/354 Daniel Henrique Barboza (1): model/storagetargets: filtering used nfs paths src/kimchi/model/storagetargets.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- 1.8.3.1

4 4

[PATCH] Change function that verifies network interface status
by Ramon Medeiros 21 Aug '14

21 Aug '14

LTC Bugzilla #115031 - LTCTest: build-8: List interfaces which are active The old way does just consider if the interface has connectivity, not the interface status. The new file can determine if the interface is up or down and if cable is connected or not. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- src/kimchi/netinfo.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/kimchi/netinfo.py b/src/kimchi/netinfo.py index 5fd6130..276c0b7 100644 --- a/src/kimchi/netinfo.py +++ b/src/kimchi/netinfo.py @@ -29,7 +29,7 @@ BONDING_PATH = '/sys/class/net/*/bonding' WLAN_PATH = '/sys/class/net/*/wireless' NET_BRPORT = '/sys/class/net/%s/brport' NET_MASTER = '/sys/class/net/%s/master' -NET_STATE = '/sys/class/net/%s/operstate' +NET_STATE = '/sys/class/net/%s/carrier' PROC_NET_VLAN = '/proc/net/vlan/' BONDING_SLAVES = '/sys/class/net/%s/bonding/slaves' BRIDGE_PORTS = '/sys/class/net/%s/brif' @@ -101,8 +101,21 @@ def is_bondlave(nic): def operstate(dev): - return open(NET_STATE % dev).readline().strip() + status = None + + # try to read interface status + try: + status = open(NET_STATE % dev).readline().strip() + except IOError: + pass + + # when IOError is raised, interface is down + if status == None: + return "down" + # if value is 1, cable is connected + # 0 corresponds to no interface up with no cable + return "up" def get_vlan_device(vlan): """ Return the device of the given VLAN. """ -- 1.8.3.1

2 2

[PATCH] Bugfix: Log out from Administrator tab raises popup errors
by Wen Wang 21 Aug '14

21 Aug '14

This bug turns out to be caused by we change the login format from login-window to tranditional login format. After the logout, we can no longer and there is no need to update the pages and popup a login window. Now we redirect to login.html after logout. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.main.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index 613ab41..ba54b26 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -239,7 +239,7 @@ kimchi.main = function() { // Perform logging out via Ajax request. $('#btn-logout').on('click', function() { kimchi.logout(function() { - updatePage(); + document.location.href = "login.html"; }, function(err) { kimchi.message.error(err.responseJSON.reason); }); -- 1.7.1

3 5

[RFC] UI Mockup - ISO Pool: Download from URL and Upload
by Hongliang Wang 21 Aug '14

21 Aug '14

Agree with Aline's proposal to add a button in ISO line of storage pool tab: And then pop out a window: And then show progress. Here we'll have 2 options: progress with percentage indication and only running/finished status. Option 1: Option 2: For option 1, we need back-end support that enables in-time notification of completion percentage when uploading a file with 2 pieces of information: total file size, and received file size.

5 10

[PATCH 0/2] Warn users about non-persistent guests when using Power Off
by Christy Perez 21 Aug '14

21 Aug '14

Someone reported that their guests (not created by Kimchi) were being deleted if they used Kimchi to shut them down. This small patchset adds a warning message and also increases the size of the confirmation dialog in the UI to fit the new text. Note: It still needs the Chinese translation. Christy Perez (2): Add Power-Off warning for non-persistent guests Make the confirmation dialog bigger po/en_US.po | 15 ++++++++++++--- po/kimchi.pot | 10 ++++++++-- po/pt_BR.po | 16 +++++++++++++--- po/zh_CN.po | 10 ++++++++-- ui/css/theme-default/message.css | 4 ++-- ui/pages/i18n.json.tmpl | 1 + 6 files changed, 44 insertions(+), 12 deletions(-) -- 1.9.3

3 5