Author: aschnell
Date: Thu Mar 8 11:56:12 2012
New Revision: 67596
URL: http://svn.opensuse.org/viewcvs/yast?rev=67596&view=rev
Log:
- consistent use of "Channel ID", "WWPN" and "LUN" (discussed with Ihno)
- hide get buttons in zfcp add dialog in config mode
Modified:
trunk/s390/src/dasd/dialogs.ycp
trunk/s390/src/dasd/helps.ycp
trunk/s390/src/modules/DASDController.ycp
trunk/s390/src/modules/ZFCPController.ycp
trunk/s390/src/zfcp/dialogs.ycp
trunk/s390/src/zfcp/helps.ycp
Modified: trunk/s390/src/dasd/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67596&r1=67595&r2=67596&view=diff
==============================================================================
--- trunk/s390/src/dasd/dialogs.ycp (original)
+++ trunk/s390/src/dasd/dialogs.ycp Thu Mar 8 11:56:12 2012
@@ -136,7 +136,7 @@
{
header = `header(
// table header
- `Right(_("Channel")),
+ `Right(_("Channel ID")),
// table header
_("Format"),
// table header
@@ -147,7 +147,7 @@
{
header = `header(
// table header
- `Right(_("Channel")),
+ `Right(_("Channel ID")),
// table header
_("Device"),
// table header
@@ -180,9 +180,9 @@
term content = `VBox(
`HBox(
// text entry
- `InputField(`id(`min_chan), `opt(`hstretch), _("Mi&nimum Channel"), DASDController::filter_min),
+ `InputField(`id(`min_chan), `opt(`hstretch), _("Mi&nimum Channel ID"), DASDController::filter_min),
// text entry
- `InputField(`id(`max_chan), `opt(`hstretch), _("Ma&ximum Channel"), DASDController::filter_max),
+ `InputField(`id(`max_chan), `opt(`hstretch), _("Ma&ximum Channel ID"), DASDController::filter_max),
`VBox (
`Label (""),
// push button
@@ -249,7 +249,7 @@
if (!DASDController::IsValidChannel(filter_min) || !DASDController::IsValidChannel(filter_max))
{
// error popup
- Popup::Error(_("Invalid filter channels."));
+ Popup::Error(_("Invalid filter channel IDs."));
ret = nil;
continue;
}
@@ -477,7 +477,7 @@
`VStretch (),
`TextEntry (`id(`channel), `opt (`hstretch),
// text entry
- _("&Channel Number")
+ _("&Channel ID")
),
`VSpacing (2),
// check box
@@ -518,7 +518,7 @@
if (!DASDController::IsValidChannel(channel))
{
// error popup
- Popup::Error(_("Not a valid channel."));
+ Popup::Error(_("Not a valid channel ID."));
UI::SetFocus(`channel);
ret = nil;
continue;
Modified: trunk/s390/src/dasd/helps.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/helps.ycp?rev=67596&r1=67595&r2=67596&view=diff
==============================================================================
--- trunk/s390/src/dasd/helps.ycp (original)
+++ trunk/s390/src/dasd/helps.ycp Thu Mar 8 11:56:12 2012
@@ -39,8 +39,8 @@
In this dialog, manage DASD disks on your system.</p>") +
/* Disk selection dialog help 2/4 */
-_("<p>To filter the displayed disks, set the <b>Minimum Channel</b> and
-the <b>Maximum Channel</b> and click <b>Filter</b>.</p>
+_("<p>To filter the displayed disks, set the <b>Minimum Channel ID</b> and
+the <b>Maximum Channel ID</b> and click <b>Filter</b>.</p>
") +
/* Disk selection dialog help 4/4 */
@@ -55,8 +55,8 @@
In this dialog, manage DASD disks on your system.</p>") +
/* Disk selection dialog help 2/4 */
-_("<p>To filter the displayed disks, set the <b>Minimum Channel</b> and
-the <b>Maximum Channel</b> and click <b>Filter</b>.</p>
+_("<p>To filter the displayed disks, set the <b>Minimum Channel ID</b> and
+the <b>Maximum Channel ID</b> and click <b>Filter</b>.</p>
") +
/* Disk selection dialog help 3/4 */
@@ -70,7 +70,7 @@
/* Disk add help 1/3 */
"disk_add_config" : _("<p><b><big>Add New DASD Disk</big></b><br>
-To add a disk, enter the <b>Channel Number</b> of the DASD disk as
+To add a disk, enter the <b>Channel ID</b> of the DASD disk as
identifier.</p>") +
/* Disk add help 1/3 */
Modified: trunk/s390/src/modules/DASDController.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.ycp?rev=67596&r1=67595&r2=67596&view=diff
==============================================================================
--- trunk/s390/src/modules/DASDController.ycp (original)
+++ trunk/s390/src/modules/DASDController.ycp Thu Mar 8 11:56:12 2012
@@ -301,7 +301,7 @@
{
ret = maplist (integer index, map d, devices, {
// summary text, %1 is channel, %2 and %3 are Yes or No
- return sformat(_("Channel: %1, Format: %2, DIAG: %3"), d["channel"]:"",
+ return sformat(_("Channel ID: %1, Format: %2, DIAG: %3"), d["channel"]:"",
String::YesNo(d["format"]:false), String::YesNo(d["diag"]:false));
});
}
@@ -314,7 +314,7 @@
ret = maplist (integer index, map d, active_devices, {
// summary text, %1 is channel, %2 is device name, %3 is Yes or No
- return sformat(_("Channel: %1, Device: %2, DIAG: %3"), d["channel"]:"",
+ return sformat(_("Channel ID: %1, Device: %2, DIAG: %3"), d["channel"]:"",
d["dev_name"]:"", String::YesNo(d["diag"]:false));
});
}
Modified: trunk/s390/src/modules/ZFCPController.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.ycp?rev=67596&r1=67595&r2=67596&view=diff
==============================================================================
--- trunk/s390/src/modules/ZFCPController.ycp (original)
+++ trunk/s390/src/modules/ZFCPController.ycp Thu Mar 8 11:56:12 2012
@@ -313,7 +313,7 @@
{
ret = maplist (integer index, map d, devices, {
// summary text, %1 is channel, %2 is WWPN, %3 is LUN
- return sformat(_("Channel: %1, WWPN: %2, ZFCP LUN: %3"),
+ return sformat(_("Channel ID: %1, WWPN: %2, LUN: %3"),
d["detail", "controller_id"]:"", d["detail", "wwpn"]:"",
d["detail", "fcp_lun"]:"");
});
@@ -322,7 +322,7 @@
{
ret = maplist (integer index, map d, devices, {
// summary text, %1 is channel, %2 is WWPN, %3 is LUN, %4 is device name
- return sformat(_("Channel: %1, WWPN: %2, ZFCP LUN: %3, Device: %4"),
+ return sformat(_("Channel ID: %1, WWPN: %2, LUN: %3, Device: %4"),
d["detail", "controller_id"]:"", d["detail", "wwpn"]:"",
d["detail", "fcp_lun"]:"", d["dev_name"]:"");
});
@@ -468,13 +468,13 @@
case 8:
Report::Error (sformat (
// error report, %1 is device identification
- _("%1: ZFCP LUN could not be unregistered."), channel));
+ _("%1: LUN could not be unregistered."), channel));
break;
case 9:
Report::Error (sformat (
// error report, %1 is device identification
- _("%1: ZFCP WWPN could not be unregistered."), channel));
+ _("%1: WWPN could not be unregistered."), channel));
break;
default:
Modified: trunk/s390/src/zfcp/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67596&r1=67595&r2=67596&view=diff
==============================================================================
--- trunk/s390/src/zfcp/dialogs.ycp (original)
+++ trunk/s390/src/zfcp/dialogs.ycp Thu Mar 8 11:56:12 2012
@@ -110,22 +110,22 @@
{
header = `header(
// table header
- `Right(_("Channel Number")),
+ `Right(_("Channel ID")),
// table header
`Right(_("WWPN")),
// table header
- `Right(_("ZFCP-LUN"))
+ `Right(_("LUN"))
);
}
else
{
header = `header(
// table header
- `Right(_("Channel Number")),
+ `Right(_("Channel ID")),
// table header
`Right(_("WWPN")),
// table header
- `Right(_("ZFCP-LUN")),
+ `Right(_("LUN")),
// table header
_("Device")
);
@@ -135,9 +135,9 @@
term content = `VBox(
`HBox(
// text entry
- `InputField(`id(`min_chan), `opt(`hstretch), _("Mi&nimum Channel"), ZFCPController::filter_min),
+ `InputField(`id(`min_chan), `opt(`hstretch), _("Mi&nimum Channel ID"), ZFCPController::filter_min),
// text entry
- `InputField(`id(`max_chan), `opt(`hstretch), _("Ma&ximum Channel"), ZFCPController::filter_max),
+ `InputField(`id(`max_chan), `opt(`hstretch), _("Ma&ximum Channel ID"), ZFCPController::filter_max),
`VBox (
`Label (""),
// push button
@@ -197,7 +197,7 @@
if (!ZFCPController::IsValidChannel(filter_min) || !ZFCPController::IsValidChannel(filter_max))
{
// error popup
- Popup::Error(_("Invalid filter channels."));
+ Popup::Error(_("Invalid filter channel IDs."));
ret = nil;
continue;
}
@@ -239,47 +239,62 @@
/* Minimal text for the help */
string help = ZFCP_HELPS["disk_add"]:"";
- /* Dialog caption */
+ // dialog caption
string caption = _("Add New ZFCP Device");
- string fcp_lun = ZFCPController::previous_settings["fcp_lun"]:"";
- if (!isempty(fcp_lun))
- fcp_lun = ZFCPController::GetNextLUN(fcp_lun);
+ list<string> channels = [];
+ list<string> wwpns = [];
+ list<string> luns = [];
- list<string> items = [];
if (Mode::config ())
{
- items = maplist (integer index, map d, ZFCPController::devices, {
+ channels = maplist(integer index, map d, ZFCPController::devices, {
return d["detail", "controller_id"]:"";
});
- items = toset (items);
+ channels = toset(channels);
+
+ wwpns = maplist(integer index, map d, ZFCPController::devices, {
+ return d["detail", "wwpn"]:"";
+ });
+ wwpns = toset(wwpns);
+
+ luns = maplist(integer index, map d, ZFCPController::devices, {
+ return d["detail", "zfp_lun"]:"";
+ });
+ luns = toset(luns);
}
else
{
- items = maplist (map c, ZFCPController::GetControllers(), {
+ channels = maplist (map c, ZFCPController::GetControllers(), {
return c["sysfs_bus_id"]:"";
});
+
+ wwpns = [ ZFCPController::previous_settings["wwpn"]:"" ];
+
+ string fcp_lun = ZFCPController::previous_settings["fcp_lun"]:"";
+ if (!isempty(fcp_lun))
+ fcp_lun = ZFCPController::GetNextLUN(fcp_lun);
+
+ luns = [ fcp_lun ];
}
- /* Dialog content */
term content = `HBox (`HStretch (), `VBox(
`VStretch (),
- `ComboBox (`id(`channel), `opt (`editable, `hstretch),
- // combo box
- _("&Channel Number"),
- items),
+ // combo box
+ `ComboBox(`id(`channel), `opt (`editable, `hstretch), _("&Channel ID"), channels),
`VSpacing (2),
- `HBox(
- // text entry
- `ComboBox(`id(`wwpn), `opt(`hstretch, `editable), _("&WWPN"),
- [ ZFCPController::previous_settings["wwpn"]:"" ]),
- `PushButton(`id(`get_wwpn), _("Get WWPNs"))
+ `HBox(
+ // combo box
+ `ComboBox(`id(`wwpn), `opt(`hstretch, `editable), _("&WWPN"), wwpns),
+ // push button
+ Mode::config() ? `Empty() : `PushButton(`id(`get_wwpn), _("Get WWPNs"))
),
`VSpacing (2),
- `HBox(
- // text entry
- `ComboBox(`id(`fcp_lun), `opt(`hstretch, `editable), _("&FCP-LUN"), [ fcp_lun ]),
- `PushButton(`id(`get_lun), _("Get LUNs"))
+ `HBox(
+ // combobox
+ `ComboBox(`id(`fcp_lun), `opt(`hstretch, `editable), _("&LUN"), luns),
+ // push button
+ Mode::config() ? `Empty() : `PushButton(`id(`get_lun), _("Get LUNs"))
),
`VStretch ()
), `HStretch ());
@@ -307,7 +322,7 @@
if (!ZFCPController::IsValidChannel(channel))
{
// error popup
- Popup::Error(_("Not a valid channel."));
+ Popup::Error(_("Not a valid channel ID."));
UI::SetFocus(`channel);
ret = nil;
continue;
@@ -315,8 +330,8 @@
channel = ZFCPController::FormatChannel(channel);
- list<string> items = ZFCPController::GetWWPNs(channel);
- UI::ChangeWidget(`wwpn, `Items, items);
+ wwpns = ZFCPController::GetWWPNs(channel);
+ UI::ChangeWidget(`wwpn, `Items, wwpns);
ret = nil;
}
else if (ret == `get_lun)
@@ -327,7 +342,7 @@
if (!ZFCPController::IsValidChannel(channel))
{
// error popup
- Popup::Error(_("Not a valid channel."));
+ Popup::Error(_("Not a valid channel ID."));
UI::SetFocus(`channel);
ret = nil;
continue;
@@ -345,8 +360,8 @@
channel = ZFCPController::FormatChannel(channel);
wwpn = ZFCPController::FormatWWPN(wwpn);
- list<string> items = ZFCPController::GetLUNs(channel, wwpn);
- UI::ChangeWidget(`fcp_lun, `Items, items);
+ luns = ZFCPController::GetLUNs(channel, wwpn);
+ UI::ChangeWidget(`fcp_lun, `Items, luns);
ret = nil;
}
else if (ret == `abort || ret == `cancel)
@@ -367,7 +382,7 @@
if (!ZFCPController::IsValidChannel(channel))
{
// error popup
- Popup::Error(_("Not a valid channel."));
+ Popup::Error(_("Not a valid channel ID."));
UI::SetFocus(`channel);
ret = nil;
continue;
@@ -385,7 +400,7 @@
if (!ZFCPController::IsValidFCPLUN(fcp_lun))
{
// error popup
- Report::Error(_("The entered FCP-LUN is invalid."));
+ Report::Error(_("The entered LUN is invalid."));
UI::SetFocus(`fcp_lun);
ret = nil;
continue;
Modified: trunk/s390/src/zfcp/helps.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/helps.ycp?rev=67596&r1=67595&r2=67596&view=diff
==============================================================================
--- trunk/s390/src/zfcp/helps.ycp (original)
+++ trunk/s390/src/zfcp/helps.ycp Thu Mar 8 11:56:12 2012
@@ -54,11 +54,11 @@
/* Disk add help 1/2 */
"disk_add" : _("<p><b><big>Add New ZFCP Device</big></b><br>
Enter the identifier of the device to add, the
-<b>Channel Number</b> of the ZFCP controller, the worldwide port number
-(<b>WWPN</b>) and the <b>FCP-LUN</b> number.</p>
+<b>Channel ID</b> of the ZFCP controller, the worldwide port number
+(<b>WWPN</b>) and the <b>LUN</b> number.</p>
") +
/* Disk add help 2/2, This is HTML, so finally "<devno>" is displayed as "<devno>" */
-_("<p>The <b>Channel Number</b> must be entered with lowercase letters in a sysfs conforming
+_("<p>The <b>Channel ID</b> must be entered with lowercase letters in a sysfs conforming
format 0.0.<devno>, such as <tt>0.0.5c51</tt>.</p>
<p>The WWPN must be entered with lowercase letters as a 16-digit hex value, such as
<tt>0x5005076300c40e5a</tt>.</p>
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
aschnell＠svn2.opensuse.org