Author: mzugec Date: Wed Jun 13 18:27:17 2007 New Revision: 38443 URL: http://svn.opensuse.org/viewcvs/yast?rev=38443&view=rev Log: added validator for InitiatorName (#245364) Modified: trunk/iscsi-client/VERSION trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/src/dialogs.ycp trunk/iscsi-client/src/widgets.ycp Modified: trunk/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/VERSION?rev=38443&r1=38442&r2=38443&view=diff ============================================================================== --- trunk/iscsi-client/VERSION (original) +++ trunk/iscsi-client/VERSION Wed Jun 13 18:27:17 2007 @@ -1 +1 @@ -2.15.0 +2.15.1 Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi-client.changes?rev=38443&r1=38442&r2=38443&view=diff ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Wed Jun 13 18:27:17 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jun 13 18:26:24 CEST 2007 - mzugec@suse.cz + +- added validator for InitiatorName (#245364) +- 2.15.1 + +------------------------------------------------------------------- Fri May 11 16:05:00 CEST 2007 - mzugec@suse.cz - tested and fixed with iBFT card hardware (#256227) Modified: trunk/iscsi-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/dialogs.ycp?rev=38443&r1=38442&r2=38443&view=diff ============================================================================== --- trunk/iscsi-client/src/dialogs.ycp (original) +++ trunk/iscsi-client/src/dialogs.ycp Wed Jun 13 18:27:17 2007 @@ -47,6 +47,8 @@ `MinWidth( 16, `TextEntry(`id(`initiator_name), /*`opt(`notify),*/ _("Initiator Name")) ) ), "init" : initInitName, + "validate_type" : `function, + "validate_function" : validateInitName, "store" : storeInitName, "help" : HELPS["initiator_name"]:"" ], Modified: trunk/iscsi-client/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/widgets.ycp?rev=38443&r1=38442&r2=38443&view=diff ============================================================================== --- trunk/iscsi-client/src/widgets.ycp (original) +++ trunk/iscsi-client/src/widgets.ycp Wed Jun 13 18:27:17 2007 @@ -173,8 +173,6 @@ } void initInitName(string key){ -// initiatorname = ((map)SCR::Execute(.target.bash_output, "grep -v '^#' /etc/iscsi/initiatorname.iscsi|grep InitiatorName|cut -d'=' -f2|tr -d '\n'"))["stdout"]:""; - y2milestone("initiatorname %1", IscsiClient::initiatorname); UI::ChangeWidget(`initiator_name, `Value, IscsiClient::initiatorname); if (size(IscsiClient::getiBFT()["iSCSI_INITIATOR_NAME"]:"")>0){ @@ -183,6 +181,39 @@ } } +boolean validateInitName(string key, map event){ +/* + Targets definitions start with "Target" and the target name. + The target name must be a globally unique name, the iSCSI + standard defines the "iSCSI Qualified Name" as follows: + + iqn.yyyy-mm.reversed domain name[:identifier] + + "yyyy-mm" is the date at which the domain is valid and the identifier + is freely selectable. For further details please check the iSCSI spec. +*/ + + string i_name = (string)UI::QueryWidget(`initiator_name, `Value); + // regexp for "iqn.yyyy-mm." + string reg1 = "^iqn\.[[:digit:]]\{4\}\-[[:digit:]]\{2\}\."; + // regexp for "cz.suse" or just "suse" + string reg2 = "[[:alnum:]\.]*[[:alnum:]]"; + // regexp for [:identifier] + string reg3 = "[:[:alnum:]*.{,1}]*"; + + boolean correct = regexpmatch(i_name, sformat("%1%2%3\$", reg1, reg2, reg3)); + + if (!correct) Popup::Warning(_("Incorrect InitiatorName +Correct syntax is +iqn.yyyy-mm.reversed domain name[:identifier] + +Example: +iqn.2007-04.cz.server:storage.disk.sdb +")); + + return correct; +} + symbol storeInitName (string key, map event){ if ((string)UI::QueryWidget(`initiator_name, `Value) != IscsiClient::initiatorname){ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org