February 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67507 - in /trunk/s390/src: dasd/dialogs.ycp zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: aschnell Date: Wed Feb 22 11:16:07 2012 New Revision: 67507 URL: http://svn.opensuse.org/viewcvs/yast?rev=67507&view=rev Log: - show device name in zfcp dialog Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Wed Feb 22 11:16:07 2012 @@ -130,24 +130,9 @@ /* Dialog caption */ string caption = _("DASD Disk Management"); - term header = `header( - // table header - `Right(_("Channel")), - // table header - _("Device"), - // table header - _("Type"), - // table header - _("Access Type"), - // table header - _("Use DIAG"), - // table header - _("Formatted"), - // table header - _("Partition Information") - ); + term header = `Empty(); - if (Mode::config ()) + if (Mode::config()) { header = `header( // table header @@ -156,7 +141,26 @@ _("Format"), // table header _("Use DIAG") - ); + ); + } + else + { + header = `header( + // table header + `Right(_("Channel")), + // table header + _("Device"), + // table header + _("Type"), + // table header + _("Access Type"), + // table header + _("Use DIAG"), + // table header + _("Formatted"), + // table header + _("Partition Information") + ); } list actions = [ Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Wed Feb 22 11:16:07 2012 @@ -69,12 +69,25 @@ list<term> items = []; - items = maplist(integer k, map<string, any> d, devices, { - string channel = d["detail", "controller_id"]:""; - string wwpn = d["detail", "wwpn"]:""; - string fcp_lun = d["detail", "fcp_lun"]:""; - return `item(`id(k), channel, wwpn, fcp_lun); - }); + if (Mode::config()) + { + items = maplist(integer k, map<string, any> d, devices, { + string channel = d["detail", "controller_id"]:""; + string wwpn = d["detail", "wwpn"]:""; + string fcp_lun = d["detail", "fcp_lun"]:""; + return `item(`id(k), channel, wwpn, fcp_lun); + }); + } + else + { + items = maplist(integer k, map<string, any> d, devices, { + string channel = d["detail", "controller_id"]:""; + string wwpn = d["detail", "wwpn"]:""; + string fcp_lun = d["detail", "fcp_lun"]:""; + string dev_name = d["dev_name"]:""; + return `item(`id(k), channel, wwpn, fcp_lun, dev_name); + }); + } return items; } @@ -91,14 +104,32 @@ /* Dialog caption */ string caption = _("Configured ZFCP Devices"); - term header = `header( - // table header - `Right(_("Channel Number")), - // table header - `Right(_("WWPN")), - // table header - `Right(_("ZFCP-LUN")) - ); + term header = `Empty(); + + if (Mode::config()) + { + header = `header( + // table header + `Right(_("Channel Number")), + // table header + `Right(_("WWPN")), + // table header + `Right(_("ZFCP-LUN")) + ); + } + else + { + header = `header( + // table header + `Right(_("Channel Number")), + // table header + `Right(_("WWPN")), + // table header + `Right(_("ZFCP-LUN")), + // table header + _("Device") + ); + } /* Dialog content */ term content = `VBox( -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67506 - in /trunk/s390/src/modules: DASDController.ycp ZFCPController.ycp
by aschnell＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: aschnell Date: Wed Feb 22 10:25:25 2012 New Revision: 67506 URL: http://svn.opensuse.org/viewcvs/yast?rev=67506&view=rev Log: - added tolower in FormatChannel Modified: trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Wed Feb 22 10:25:25 2012 @@ -118,7 +118,7 @@ if (!IsValidChannel(channel)) return channel; - list<string> strs = splitstring(channel, "."); + list<string> strs = splitstring(tolower(channel), "."); strs[2] = String::PadZeros(strs[2]:"", 4); return mergestring(strs, "."); } Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Wed Feb 22 10:25:25 2012 @@ -104,7 +104,7 @@ if (!IsValidChannel(channel)) return channel; - list<string> strs = splitstring(channel, "."); + list<string> strs = splitstring(tolower(channel), "."); strs[2] = String::PadZeros(strs[2]:"", 4); return mergestring(strs, "."); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67505 - /tags/branch-Code-11-SP2-2_17_47/product-creator/
by jsuchome＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: jsuchome Date: Wed Feb 22 08:32:02 2012 New Revision: 67505 URL: http://svn.opensuse.org/viewcvs/yast?rev=67505&view=rev Log: Created tag branch-Code-11-SP2-2_17_47 for product-creator Added: tags/branch-Code-11-SP2-2_17_47/product-creator/ (props changed) - copied from r67504, branches/SuSE-Code-11-SP2-Branch/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67504 - in /branches/SuSE-Code-11-SP2-Branch/product-creator: VERSION package/yast2-product-creator.changes src/Kiwi.ycp src/kiwi_dialogs.ycp
by jsuchome＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: jsuchome Date: Wed Feb 22 08:31:33 2012 New Revision: 67504 URL: http://svn.opensuse.org/viewcvs/yast?rev=67504&view=rev Log: - do not show duplicates in locale entry (bnc#748122) - 2.17.47 Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION Wed Feb 22 08:31:33 2012 @@ -1 +1 @@ -2.17.46 +2.17.47 Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes Wed Feb 22 08:31:33 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 22 08:07:48 CET 2012 - jsuchome(a)suse.cz + +- do not show duplicates in locale entry (bnc#748122) +- 2.17.47 + +------------------------------------------------------------------- Tue Oct 18 11:09:57 CEST 2011 - jsuchome(a)suse.cz - added UI for disk encryption (fate#312486) Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp Wed Feb 22 08:31:33 2012 @@ -80,7 +80,7 @@ string logs_directory = "/tmp"; // all available locales - global list<string> all_locales = []; + global map<string,integer> all_locales = $[]; // all available time zones global list<string> all_timezones = []; Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp Wed Feb 22 08:31:33 2012 @@ -633,15 +633,16 @@ string lang = KiwiConfig["preferences",0,id,0,content_key]:""; list items = []; - if (Kiwi::all_locales == []) + if (Kiwi::all_locales == $[]) { map out = (map) SCR::Execute (.target.bash_output, "/usr/bin/locale -a"); - Kiwi::all_locales = filter (string s, splitstring (out["stdout"]:"", "\n"), { - return s != ""; + foreach (string line, splitstring (out["stdout"]:"", "\n"), { + string code = splitstring (line, ".@")[0]:line; + if (code != "") + Kiwi::all_locales[code] = 1; }); } - foreach (string line, Kiwi::all_locales, { - string code = splitstring (line, ".@")[0]:line; + foreach (string code, integer i, Kiwi::all_locales, { items = add (items, `item (`id (code), code, lang == code)); }); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67503 - in /trunk/s390/src: dasd/dialogs.ycp zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: aschnell Date: Tue Feb 21 20:53:13 2012 New Revision: 67503 URL: http://svn.opensuse.org/viewcvs/yast?rev=67503&view=rev Log: - set focus Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Tue Feb 21 20:53:13 2012 @@ -89,7 +89,7 @@ string device = d["dev_name"]:""; string type = toupper(sformat("%1/%2, %3/%4", substring(tohexstring(d["device_id"]:0 & 0xffff, 4), 2), - substring(tohexstring(d["detail", "cu_model"]:0, 4), 4), + substring(tohexstring(d["detail", "cu_model"]:0, 4), 4), substring(tohexstring(d["sub_device_id"]:0 & 0xffff, 4), 2), substring(tohexstring(d["detail", "dev_model"]:0, 4), 4) )); @@ -491,6 +491,8 @@ UI::ChangeWidget(`id(`channel), `ValidChars, "0123456789abcdefABCDEF."); + UI::SetFocus(`id(`channel)); + symbol ret = nil; while (ret == nil) { Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Tue Feb 21 20:53:13 2012 @@ -263,6 +263,8 @@ UI::ChangeWidget(`id(`wwpn), `ValidChars, "0123456789abcdefABCDEFx"); UI::ChangeWidget(`id(`fcp_lun), `ValidChars, "0123456789abcdefABCDEFx"); + UI::SetFocus(`id(`channel)); + symbol ret = nil; while (ret == nil) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67502 - /trunk/s390/src/zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: aschnell Date: Tue Feb 21 20:49:32 2012 New Revision: 67502 URL: http://svn.opensuse.org/viewcvs/yast?rev=67502&view=rev Log: - set valid chars Modified: trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Tue Feb 21 20:49:32 2012 @@ -261,6 +261,7 @@ UI::ChangeWidget(`id(`channel), `ValidChars, "0123456789abcdefABCDEF."); UI::ChangeWidget(`id(`wwpn), `ValidChars, "0123456789abcdefABCDEFx"); + UI::ChangeWidget(`id(`fcp_lun), `ValidChars, "0123456789abcdefABCDEFx"); symbol ret = nil; while (ret == nil) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67501 - in /trunk/s390/src: dasd/dialogs.ycp modules/DASDController.ycp modules/ZFCPController.ycp zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: aschnell Date: Tue Feb 21 20:23:40 2012 New Revision: 67501 URL: http://svn.opensuse.org/viewcvs/yast?rev=67501&view=rev Log: - more input validation Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Tue Feb 21 20:23:40 2012 @@ -45,6 +45,7 @@ return ret ? `next : `abort; } + /** * Write settings dialog * @return `abort if aborted and `next otherwise @@ -56,6 +57,7 @@ return ret ? `next : `abort; } + /** * Get the list of items for the table of DASD devices * @param min_chan integer minimal channel number @@ -112,6 +114,7 @@ return items; } + /** * Draw the DASD dialog */ Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Tue Feb 21 20:23:40 2012 @@ -253,14 +253,14 @@ GetFilteredDevices() { list<string> min_strs = splitstring(filter_min, "."); - integer min_css = tointeger("0x" + min_strs[0]:"0"); - integer min_lcss = tointeger("0x" + min_strs[1]:"0"); - integer min_chan = tointeger("0x" + min_strs[2]:"0"); + integer min_css = tointeger("0x" + min_strs[0]:""); + integer min_lcss = tointeger("0x" + min_strs[1]:""); + integer min_chan = tointeger("0x" + min_strs[2]:""); list<string> max_strs = splitstring(filter_max, "."); - integer max_css = tointeger("0x" + max_strs[0]:"0"); - integer max_lcss = tointeger("0x" + max_strs[1]:"0"); - integer max_chan = tointeger("0x" + max_strs[2]:"0"); + integer max_css = tointeger("0x" + max_strs[0]:""); + integer max_lcss = tointeger("0x" + max_strs[1]:""); + integer max_chan = tointeger("0x" + max_strs[2]:""); map<integer, map<string, any> > ret = GetDevices(); @@ -271,10 +271,10 @@ max_css, max_lcss, max_chan); ret = filter(integer k, map<string, any> d, ret, { - list<string> tmp_strs = splitstring(d["channel"]:"0.0.0000", "."); - integer tmp_css = tointeger("0x" + tmp_strs[0]:"0"); - integer tmp_lcss = tointeger("0x" + tmp_strs[1]:"0"); - integer tmp_chan = tointeger("0x" + tmp_strs[2]:"0"); + list<string> tmp_strs = splitstring(d["channel"]:"", "."); + integer tmp_css = tointeger("0x" + tmp_strs[0]:""); + integer tmp_lcss = tointeger("0x" + tmp_strs[1]:""); + integer tmp_chan = tointeger("0x" + tmp_strs[2]:""); return tmp_css >= min_css && tmp_lcss >= min_lcss && tmp_chan >= min_chan && tmp_css <= max_css && tmp_lcss <= max_lcss && tmp_chan <= max_chan; @@ -307,7 +307,7 @@ { integer ret = nil; foreach(integer index , map<string, any> d, devices, { - if (d["channel"]:"0.0.0000" == channel) + if (d["channel"]:"" == channel) ret = index; }); return ret; @@ -370,7 +370,7 @@ disks = filter (map<string, any> d, disks, { return tolower(d["device"]:"") == "dasd"; }); disks = maplist (map<string,any> d, disks, { - string channel = d["sysfs_bus_id"]:"0.0.0000"; + string channel = d["sysfs_bus_id"]:""; d["channel"] = channel; boolean active = d["resource", "io", 0, "active"]:false; Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Tue Feb 21 20:23:40 2012 @@ -263,14 +263,14 @@ GetFilteredDevices() { list<string> min_strs = splitstring(filter_min, "."); - integer min_css = tointeger("0x" + min_strs[0]:"0"); - integer min_lcss = tointeger("0x" + min_strs[1]:"0"); - integer min_chan = tointeger("0x" + min_strs[2]:"0"); + integer min_css = tointeger("0x" + min_strs[0]:""); + integer min_lcss = tointeger("0x" + min_strs[1]:""); + integer min_chan = tointeger("0x" + min_strs[2]:""); list<string> max_strs = splitstring(filter_max, "."); - integer max_css = tointeger("0x" + max_strs[0]:"0"); - integer max_lcss = tointeger("0x" + max_strs[1]:"0"); - integer max_chan = tointeger("0x" + max_strs[2]:"0"); + integer max_css = tointeger("0x" + max_strs[0]:""); + integer max_lcss = tointeger("0x" + max_strs[1]:""); + integer max_chan = tointeger("0x" + max_strs[2]:""); map<integer, map<string, any> > ret = GetDevices(); @@ -281,10 +281,10 @@ max_css, max_lcss, max_chan); ret = filter(integer k, map<string, any> d, ret, { - list<string> tmp_strs = splitstring(d["channel"]:"0.0.0000", "."); - integer tmp_css = tointeger("0x" + tmp_strs[0]:"0"); - integer tmp_lcss = tointeger("0x" + tmp_strs[1]:"0"); - integer tmp_chan = tointeger("0x" + tmp_strs[2]:"0"); + list<string> tmp_strs = splitstring(d["channel"]:"", "."); + integer tmp_css = tointeger("0x" + tmp_strs[0]:""); + integer tmp_lcss = tointeger("0x" + tmp_strs[1]:""); + integer tmp_chan = tointeger("0x" + tmp_strs[2]:""); return tmp_css >= min_css && tmp_lcss >= min_lcss && tmp_chan >= min_chan && tmp_css <= max_css && tmp_lcss <= max_lcss && tmp_chan <= max_chan; @@ -317,7 +317,7 @@ { integer ret = nil; foreach(integer index , map<string, any> d, devices, { - if (d["channel"]:"0.0.0000" == channel) + if (d["channel"]:"" == channel) ret = index; }); return ret; Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Tue Feb 21 20:23:40 2012 @@ -44,6 +44,7 @@ return ret ? `next : `abort; } + /** * Write settings dialog * @return `abort if aborted and `next otherwise @@ -69,9 +70,9 @@ list<term> items = []; items = maplist(integer k, map<string, any> d, devices, { - string channel = d["detail", "controller_id"]:"unknown"; - string wwpn = d["detail", "wwpn"]:"unknown"; - string fcp_lun = d["detail", "fcp_lun"]:"unknown"; + string channel = d["detail", "controller_id"]:""; + string wwpn = d["detail", "wwpn"]:""; + string fcp_lun = d["detail", "fcp_lun"]:""; return `item(`id(k), channel, wwpn, fcp_lun); }); @@ -225,7 +226,7 @@ else { items = maplist (map<string, any> c, ZFCPController::GetControllers(), { - string channel = c["sysfs_bus_id"]:"0.0.0000"; + string channel = c["sysfs_bus_id"]:""; return channel; }); } @@ -266,16 +267,55 @@ { ret = (symbol) UI::UserInput(); - if (ret == `get_wwpn){ - list<string> items = ZFCPController::GetWWPNs((string)UI::QueryWidget(`channel, `Value)); - UI::ChangeWidget(`wwpn, `Items, items); - ret=nil; - } - else if (ret == `get_lun){ - list<string> items = ZFCPController::GetLUNs((string)UI::QueryWidget(`channel, `Value), (string)UI::QueryWidget(`wwpn, `Value)); - UI::ChangeWidget(`fcp_lun, `Items, items); - ret=nil; - } + if (ret == `get_wwpn) + { + string channel = (string) UI::QueryWidget(`channel, `Value); + + if (!ZFCPController::IsValidChannel(channel)) + { + // error popup + Popup::Error(_("Not a valid channel.")); + UI::SetFocus(`channel); + ret = nil; + continue; + } + + channel = ZFCPController::FormatChannel(channel); + + list<string> items = ZFCPController::GetWWPNs(channel); + UI::ChangeWidget(`wwpn, `Items, items); + ret = nil; + } + else if (ret == `get_lun) + { + string channel = (string) UI::QueryWidget(`channel, `Value); + string wwpn = (string) UI::QueryWidget(`wwpn, `Value); + + if (!ZFCPController::IsValidChannel(channel)) + { + // error popup + Popup::Error(_("Not a valid channel.")); + UI::SetFocus(`channel); + ret = nil; + continue; + } + + if (!ZFCPController::IsValidWWPN(wwpn)) + { + // error popup + Report::Error(_("The entered WWPN is invalid.")); + UI::SetFocus(`wwpn); + ret = nil; + continue; + } + + channel = ZFCPController::FormatChannel(channel); + wwpn = ZFCPController::FormatWWPN(wwpn); + + list<string> items = ZFCPController::GetLUNs(channel, wwpn); + UI::ChangeWidget(`fcp_lun, `Items, items); + ret = nil; + } else if (ret == `abort || ret == `cancel) { // yes-no popup @@ -378,16 +418,16 @@ { foreach(integer index, selected, { map d = ZFCPController::devices[index]:$[]; - string channel = d["detail", "controller_id"]:"unknown"; - string wwpn = d["detail", "wwpn"]:"unknown"; - string fcp_lun = d["detail", "fcp_lun"]:"unknown"; + string channel = d["detail", "controller_id"]:""; + string wwpn = d["detail", "wwpn"]:""; + string fcp_lun = d["detail", "fcp_lun"]:""; ZFCPController::DeactivateDisk(channel, wwpn, fcp_lun); }); - + ZFCPController::ProbeDisks(); } } - + return `next; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67500 - /trunk/s390/src/zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: aschnell Date: Tue Feb 21 19:09:35 2012 New Revision: 67500 URL: http://svn.opensuse.org/viewcvs/yast?rev=67500&view=rev Log: - simplified UI layout Modified: trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Tue Feb 21 19:09:35 2012 @@ -112,9 +112,7 @@ `PushButton (`id (`filter), _("&Filter")) ) ), - `HBox( - `Table(`id(`table), `opt(`multiSelection), header, []) - ), + `Table(`id(`table), `opt(`multiSelection), header, []), `HBox( `PushButton(`id(`add), Label::AddButton ()), `PushButton(`id(`delete), Label::DeleteButton ()), -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67499 - in /trunk/s390/src/modules: DASDController.ycp ZFCPController.ycp
by aschnell＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: aschnell Date: Tue Feb 21 19:04:06 2012 New Revision: 67499 URL: http://svn.opensuse.org/viewcvs/yast?rev=67499&view=rev Log: - improved logging Modified: trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Tue Feb 21 19:04:06 2012 @@ -410,7 +410,7 @@ return $[ index : d ]; }); - y2milestone("probed dasds %1", devices); + y2milestone("probed DASD devices %1", devices); UI::CloseDialog (); } Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Tue Feb 21 19:04:06 2012 @@ -366,7 +366,8 @@ controllers = filter (map<string,any> c, controllers, { return c["device"]:"" == "zFCP controller"; }); - y2milestone ("Found %1 zfcp controllers", size (controllers)); + + y2milestone ("probed ZFCP controllers %1", controllers); } return controllers; } @@ -404,7 +405,7 @@ return $[ index : d ]; }); - y2milestone("probed zfcps %1", devices); + y2milestone("probed ZFCP devices %1", devices); UI::CloseDialog(); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67498 - in /trunk/s390/src: modules/ZFCPController.ycp zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: aschnell Date: Tue Feb 21 18:59:57 2012 New Revision: 67498 URL: http://svn.opensuse.org/viewcvs/yast?rev=67498&view=rev Log: - removed HexNumSize Modified: trunk/s390/src/modules/ZFCPController.ycp trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Tue Feb 21 18:59:57 2012 @@ -38,30 +38,6 @@ boolean disk_configured = false; -/** - * Update the size of hexa number via adding leading zeros - * @param hex string a hexa number (withou or without leading 0x) - * @param digits the count of digits (excluding leading 0x) - * @return hex string with specified length - */ -global string HexNumSize (string hex, integer digits) { - boolean leading0x = false; - if (substring (hex, 0, 2) == "0x") - { - leading0x = true; - hex = substring (hex, 2); - } - while (size (hex) < digits) - { - hex = "0" + hex; - } - if (leading0x) - { - hex = "0x" + hex; - } - return hex; -} - /** * Data was modified? @@ -592,7 +568,7 @@ } string command = sformat("/sbin/zfcp_disk_configure '%1' '%2' '%3' %4", channel, - HexNumSize(wwpn, 16), HexNumSize(lun, 16), 1); + wwpn, lun, 1); y2milestone("Running command \"%1\"", command); integer ret = (integer) SCR::Execute(.target.bash, command); y2milestone("Command \"%1\" returned with exit code %2", command, ret); @@ -612,7 +588,7 @@ global void DeactivateDisk(string channel, string wwpn, string lun) { string command = sformat("/sbin/zfcp_disk_configure '%1' '%2' '%3' %4", channel, - HexNumSize(wwpn, 16), HexNumSize(lun, 16), 0); + wwpn, lun, 0); y2milestone("Running command \"%1\"", command); integer ret = (integer) SCR::Execute(.target.bash, command); y2milestone("Command \"%1\" returned with exit code %2", command, ret); Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Tue Feb 21 18:59:57 2012 @@ -69,13 +69,9 @@ list<term> items = []; items = maplist(integer k, map<string, any> d, devices, { - string dev_name = d["dev_name"]:""; string channel = d["detail", "controller_id"]:"unknown"; string wwpn = d["detail", "wwpn"]:"unknown"; string fcp_lun = d["detail", "fcp_lun"]:"unknown"; - if (fcp_lun != "unknown") - fcp_lun = ZFCPController::HexNumSize (fcp_lun, 16); - return `item(`id(k), channel, wwpn, fcp_lun); }); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0