March 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67739 - in /trunk/storage: package/yast2-storage.changes storage/src/include/custom_part_dialogs.ycp storage/src/modules/FileSystems.ycp
by fehr＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: fehr Date: Thu Mar 29 12:30:00 2012 New Revision: 67739 URL: http://svn.opensuse.org/viewcvs/yast?rev=67739&view=rev Log: prevent invalid size values in tmpfs size (bnc#754326) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_dialogs.ycp trunk/storage/storage/src/modules/FileSystems.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Mar 29 12:30:00 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 12:14:35 CEST 2012 - fehr(a)suse.de + +- prevent invalid size values in tmpfs size (bnc#754326) + +------------------------------------------------------------------- Fri Mar 23 11:55:48 CET 2012 - aschnell(a)suse.de - hide instead of disable some unavailable fstab mount options Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Thu Mar 29 12:30:00 2012 @@ -227,7 +227,8 @@ } else if( pospct==nil && (!Storage::HumanStringToByte( query, sz ) || - sz<entry[`min_size]:1 )) + sz<entry[`min_size]:1 || + !regexpmatch( query, "^[0-9]+[KMGkmg]$"))) { Popup::Error(entry[`error_text]:""); ret = `error; @@ -255,20 +256,20 @@ ret = `error; } } - if( valid_chars != "" && size(query)>0 && ret != `error ) - { - if( nil != findfirstnotof( query, valid_chars )) - { - Popup::Error(entry[`error_text]:""); - ret = `error; - } - } if( str_length != 0 && size(query) > str_length && ret != `error ) { Popup::Error(entry[`error_text]:""); ret = `error; } } + if( valid_chars != "" && size(query)>0 && ret != `error ) + { + if( nil != findfirstnotof( query, valid_chars )) + { + Popup::Error(entry[`error_text]:""); + ret = `error; + } + } y2milestone( "DoInputChecks value %1 ret %2", query, ret ); return( ret ); } Modified: trunk/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/File… ============================================================================== --- trunk/storage/storage/src/modules/FileSystems.ycp (original) +++ trunk/storage/storage/src/modules/FileSystems.ycp Thu Mar 29 12:30:00 2012 @@ -341,7 +341,7 @@ `min_size : 100*1024, `valid_chars : "0123456789kKmMgG%", // popup text - `error_text : _("Value must be above 100k or between 1% and 200%. Try again."), + `error_text : _("Invalid Size specified. Use number followed by K, M, G or %.\nValue must be above 100k or between 1% and 200%. Try again."), `error_text_percent : _("Value must be between 1% and 200%. Try again."), `type : `text, `str_opt : "size=%1", -- 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] r67738 - /tags/stable-2_22_1/online-update/
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 12:21:58 2012 New Revision: 67738 URL: http://svn.opensuse.org/viewcvs/yast?rev=67738&view=rev Log: Created tag stable-2_22_1 for online-update Added: tags/stable-2_22_1/online-update/ - copied from r67737, trunk/online-update/ -- 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] r67737 - in /trunk/online-update: VERSION package/yast2-online-update.changes src/inst_you.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 12:21:00 2012 New Revision: 67737 URL: http://svn.opensuse.org/viewcvs/yast?rev=67737&view=rev Log: - corectly handle the output of installation's ContinueCancel popup - 2.22.1 Modified: trunk/online-update/VERSION trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/inst_you.ycp Modified: trunk/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/VERSION?rev=67737&… ============================================================================== --- trunk/online-update/VERSION (original) +++ trunk/online-update/VERSION Thu Mar 29 12:21:00 2012 @@ -1 +1 @@ -2.22.0 +2.22.1 Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-onli… ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Thu Mar 29 12:21:00 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 29 12:18:57 CEST 2012 - jsuchome(a)suse.cz + +- corectly handle the output of installation's ContinueCancel popup +- 2.22.1 + +------------------------------------------------------------------- Wed Jan 25 08:42:18 CET 2012 - jsuchome(a)suse.cz - confirmed license Modified: trunk/online-update/src/inst_you.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/inst_you.ycp?r… ============================================================================== --- trunk/online-update/src/inst_you.ycp (original) +++ trunk/online-update/src/inst_you.ycp Thu Mar 29 12:21:00 2012 @@ -219,7 +219,7 @@ !Popup::ContinueCancel(OnlineUpdate::more_selected_message)) { // user wants to re-examine the selection - ret = nil; + ret_sel = nil; } } } until (ret_sel == `cancel || ret_sel == `accept); -- 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] r67736 - /tags/stable-2_22_2/ldap-server/
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 12:19:09 2012 New Revision: 67736 URL: http://svn.opensuse.org/viewcvs/yast?rev=67736&view=rev Log: Created tag stable-2_22_2 for ldap-server Added: tags/stable-2_22_2/ldap-server/ (props changed) - copied from r67735, trunk/ldap-server/ -- 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] r67735 - in /trunk/ldap-server: VERSION package/yast2-ldap-server.changes src/Makefile.am yast2-ldap-server.spec.in
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 12:18:44 2012 New Revision: 67735 URL: http://svn.opensuse.org/viewcvs/yast?rev=67735&view=rev Log: - fixed build failure (symlink to find include file) - 2.22.2 Modified: trunk/ldap-server/VERSION trunk/ldap-server/package/yast2-ldap-server.changes trunk/ldap-server/src/Makefile.am trunk/ldap-server/yast2-ldap-server.spec.in Modified: trunk/ldap-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/VERSION?rev=67735&r1… ============================================================================== --- trunk/ldap-server/VERSION (original) +++ trunk/ldap-server/VERSION Thu Mar 29 12:18:44 2012 @@ -1 +1 @@ -2.22.1 +2.22.2 Modified: trunk/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/package/yast2-ldap-s… ============================================================================== --- trunk/ldap-server/package/yast2-ldap-server.changes (original) +++ trunk/ldap-server/package/yast2-ldap-server.changes Thu Mar 29 12:18:44 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 29 10:21:20 CEST 2012 - jsuchome(a)suse.cz + +- fixed build failure (symlink to find include file) +- 2.22.2 + +------------------------------------------------------------------- Thu Mar 22 11:28:19 CET 2012 - jsuchome(a)suse.cz - PasswordPolicyDialog moved to users module (fate#313143) Modified: trunk/ldap-server/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/Makefile.am?rev=… ============================================================================== --- trunk/ldap-server/src/Makefile.am (original) +++ trunk/ldap-server/src/Makefile.am Thu Mar 29 12:18:44 2012 @@ -27,6 +27,11 @@ LdapServer.pm \ LdapDatabase.ycp +ldap-server: + ln -sf . ldap-server + +ycpchook = ldap-server + EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) include $(top_srcdir)/Makefile.am.common Modified: trunk/ldap-server/yast2-ldap-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/yast2-ldap-server.sp… ============================================================================== --- trunk/ldap-server/yast2-ldap-server.spec.in (original) +++ trunk/ldap-server/yast2-ldap-server.spec.in Thu Mar 29 12:18:44 2012 @@ -3,8 +3,11 @@ @HEADER@ Group: System/YaST License: GPL-2.0+ ; MIT -BuildRequires: boost-devel gcc-c++ libldapcpp-devel libtool perl-Digest-SHA1 perl-gettext perl-X500-DN pkg-config update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-ldap-client -Requires: acl net-tools perl perl-Digest-SHA1 perl-gettext perl-X500-DN yast2 yast2-ca-management yast2-ldap-client yast2-perl-bindings yast2-users +BuildRequires: boost-devel gcc-c++ libldapcpp-devel libtool perl-Digest-SHA1 perl-gettext perl-X500-DN pkg-config update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-ldap-client yast2-users +Requires: acl net-tools perl perl-Digest-SHA1 perl-gettext perl-X500-DN yast2 yast2-ca-management yast2-ldap-client yast2-perl-bindings + +# users/ldap_dialogs.ycp +Requires: yast2-users >= 2.22.3 # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 -- 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] r67734 - in /branches/SuSE-Code-11-SP2-Branch/autoinstallation: VERSION package/autoyast2.changes src/clients/ayast_probe.ycp src/modules/AutoinstStorage.ycp
by ug＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: ug Date: Thu Mar 29 11:10:12 2012 New Revision: 67734 URL: http://svn.opensuse.org/viewcvs/yast?rev=67734&view=rev Log: device guessing code in autoyast can ignore configured devices now (patch is in SP2) Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/VERSION branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/ayast_probe.ycp branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstStorage.ycp Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/VERSION Thu Mar 29 11:10:12 2012 @@ -1 +1 @@ -2.17.56 +2.17.57 Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes Thu Mar 29 11:10:12 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 4 17:36:34 CET 2012 - ug(a)suse.de + +- the device guessing code in autoyast can ignore configured + devices now - like USB sticks (bnc#736530) +- 2.17.57 + +------------------------------------------------------------------- Mon Jan 2 12:54:54 CET 2012 - ug(a)suse.de - ask-dialog for password displays too small field for password Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/ayast_probe.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/ayast_probe.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/ayast_probe.ycp Thu Mar 29 11:10:12 2012 @@ -12,6 +12,7 @@ { import "Stage"; + import "Storage"; Stage::Set( "initial" ); import "AutoInstallRules"; import "Label"; @@ -50,6 +51,18 @@ text = text + sformat("<tr><td>%1</td><td> = </td><td>%2<br></td></tr>",k,v); }); text = text + "</table>"; + text = text + "<h3>Storage Data</h3>"; + + map<string,map> tm = Storage::GetTargetMap(); + + foreach( string k, map v, tm, ``{ + text = text + "<h2>" + k + "</h2><table>"; + foreach( string key, any value, (map<string,any>)v, ``{ + text = sformat("%1<tr><td>%2</td><td> = </td><td>%3<br></td></tr>", text, key, value); + }); + text = text + "</table>"; + }); + UI::OpenDialog( `opt(`defaultsize), `VBox( `RichText( text ), Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstStorage.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstStorage.ycp Thu Mar 29 11:10:12 2012 @@ -45,6 +45,9 @@ // some architectures need a boot partition. Do we have one? global boolean planHasBoot = false; + // list of devices to ignore when guessing devices + global list<string> tabooDevices = []; + /** * Function sets internal variable, which indicates, that any * settings were modified, to "true" @@ -88,9 +91,12 @@ string mbr_disk = ""; if( after == "" ) { foreach (string device, map disk, initial_target_map, ``{ - if (disk["type"]:`jo == `CT_DMRAID || - disk["type"]:`jo == `CT_MDPART || - disk["type"]:`jo == `CT_DMMULTIPATH) + if ( + ( disk["type"]:`jo == `CT_DMRAID || + disk["type"]:`jo == `CT_MDPART || + disk["type"]:`jo == `CT_DMMULTIPATH ) && + !contains( tabooDevices, device ) + ) { mbr_disk = device; } @@ -99,7 +105,7 @@ if( after == "" && mbr_disk == "" ) { foreach (string device, map disk, initial_target_map, ``{ - if (disk["bios_id"]:"" == "0x80") + if (disk["bios_id"]:"" == "0x80" && !contains( tabooDevices, device ) ) { mbr_disk = device; } @@ -110,7 +116,7 @@ if( mbr_disk == "" ) { foreach (string device, map disk, initial_target_map, ``{ if( disk["type"]:`x == `CT_DISK ) { - if( device == after ) + if( device == after || contains( tabooDevices, device ) ) continue; mbr_disk = device; break; @@ -507,6 +513,80 @@ d["partitions"] = sort( map x, map y, d["partitions"]:[], ``( x["partition_nr"]:99 < y["partition_nr"]:99 )); return d; }); + + // fill tabooDevice list with devices to ignore + map <string, map> initial_target_map = Storage::GetTargetMap(); + foreach ( map drive, settings, ``{ + if( drive["device"]:"" != "" ) { + // if <device> is set, it can not end in the taboo list + continue; + } + + /* XML example + <drive> + <skip_list config:type="list"> + <listentry> + <skip_key>driver</skip_key> + <skip_value>usb-storage</skip_value> + </listentry> + <listentry> + <skip_key>size_k</skip_key> + <skip_value>1048576</skip_value> + <skip_if_less_than config:type="boolean">true</skip_if_less_than> + </listentry> + </skip_list> + ... + */ + foreach (string device, map disk, initial_target_map, ``{ + foreach( map<string,any> toSkip, drive["skip_list"]:[], ``{ + string skipKey = toSkip["skip_key"]:"__missing_key__"; + string skipType = ""; + + if( is(disk[skipKey]:nil, string) ) + skipType = "string"; + else if( is(disk[skipKey]:nil, integer) ) + skipType = "integer"; + else if( is(disk[skipKey]:nil, symbol) ) + skipType = "symbol"; + else + y2error("skipKey '%1' is of unknown type. Will be ignored.", skipKey); + + if( skipType == "string" ) { + string skipValue = toSkip["skip_value"]:"__missing__"; + if( disk[skipKey]:"__not_found__" == skipValue ) { + tabooDevices = add( tabooDevices, device ); + y2milestone("%1 added to device taboo list (%2 == %3)", device, skipKey, skipValue); + break; + } + } else if( skipType == "integer" ) { + integer skipValue = tointeger(toSkip["skip_value"]:"0"); + boolean skipValueLess = toSkip["skip_if_less_than"]:false; + boolean skipValueMore = toSkip["skip_if_more_than"]:false; + boolean skipValueEqual = toSkip["skip_if_equal"]:true; + if( skipValueLess && disk[skipKey]:0 < skipValue ) { + tabooDevices = add( tabooDevices, device ); + y2milestone("%1 added to device taboo list (%2 < %3)", device, disk[skipKey]:0, skipValue ); + } else if( skipValueMore && disk[skipKey]:0 > skipValue ) { + tabooDevices = add( tabooDevices, device ); + y2milestone("%1 added to device taboo list (%2 > %3)", device, disk[skipKey]:0, skipValue ); + } + if( skipValueEqual && disk[skipKey]:0 == skipValue ) { + tabooDevices = add( tabooDevices, device ); + y2milestone("%1 added to device taboo list (%2 == %3)", device, skipKey, skipValue); + break; + } + } else if( skipType == "symbol" ) { + string skipValue = toSkip["skip_value"]:"`nothing"; + if( sformat("%1",disk[skipKey]:`nothing) == skipValue ) { + tabooDevices = add( tabooDevices, device ); + y2milestone("%1 added to device taboo list (%2 == %3)", device, skipKey, skipValue); + break; + } + } + }); + }); + }); + settings = udev2dev(settings); settings = mountBy(settings); settings = region4resize(settings); -- 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] r67733 - in /branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src: IscsiLioData.ycp IscsiLioServer.ycp widgets.ycp
by fehr＠svn2.opensuse.org 28 Mar '12

28 Mar '12

Author: fehr Date: Wed Mar 28 19:39:55 2012 New Revision: 67733 URL: http://svn.opensuse.org/viewcvs/yast?rev=67733&view=rev Log: update Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioServer.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp Wed Mar 28 19:39:55 2012 @@ -78,7 +78,7 @@ while( size(filter( string s, used, ``(s==ret)))>0 ) { count = count+1; - ret = base + "_" + tostring(count); + ret = base + "_" + count; } y2milestone( "CreateLunName p:%1 ret:%2", p, ret ); return( ret ); @@ -92,7 +92,7 @@ while( haskey( tcm, ret )) { count = count+1; - ret = base + "_" + tostring(count); + ret = base + "_" + count; } y2milestone( "CreateTcmKey base:%1 p:%2 ret:%3", base, p, ret ); return( ret ); @@ -233,6 +233,12 @@ SetTgt(data,tgt,tpg,m); } +global boolean HasTarget( string tgt, integer tpg ) + { + return( haskey( data["tgt"]:$[], tgt ) && + haskey( data["tgt",tgt]:$[], tpg )); + } + global boolean HasIncomingAuth( string tgt, integer tpg ) { map m = GetTgt(data,tgt,tpg); @@ -276,6 +282,18 @@ return( ret ); } +global boolean SetNetworkPortal( string tgt, integer tpg, string np ) + { + y2milestone( "SetNetworkPortal tgt:%1 tpg:%2 np:%3", tgt, tpg, np ); + string kt = tgt + " " + tpg + " "; + if( size(data["tgt",tgt,tpg,"ep","np"]:[])>0 ) + LogExecCmd( "lio_node --delnp " + kt + + sformat( "%1:%2", data["tgt",tgt,tpg,"ep","np",0,"ip"]:"", + data["tgt",tgt,tpg,"ep","np",0,"port"]:1 )); + boolean ret = LogExecCmd( "lio_node --addnp " + kt + np ); + return( ret ); + } + global list<list> GetTargets() { list<list> ret = []; @@ -418,8 +436,7 @@ y2milestone( "ParseAuthData tgt:%1 tpg:%2 clnt:%3", tgt, tpg, clnt ); string cmd = ""; if( size(tgt)>0 ) - cmd = "lio_node --showchapauth " + tgt + " " + tostring(tpg) + - " " + clnt; + cmd = "lio_node --showchapauth " + tgt + " " + tpg + " " + clnt; else cmd = "lio_node --showchapdiscauth"; map out = (map)SCR::Execute(.target.bash_output, cmd ); @@ -574,7 +591,7 @@ tgmap[tgt,tpg] = $[ "ep" : endp[tgt,tpg]:$[], "clnt" : $[] ]; y2milestone( "ParseConfigLio tgt:%1 tpg:%2", tgt, tpg ); - string cmd = "lio_node --listlunacls " + tgt + " " + tostring(tpg); + string cmd = "lio_node --listlunacls " + tgt + " " + tpg; out = (map)SCR::Execute(.target.bash_output, cmd ); ls = SplitStringNE( out["stdout"]:"", "\n" ); i=0; @@ -648,7 +665,7 @@ ret = CreateTcmKey( data["tcm"]:$[], ret, p ); cmd = cmd + ret + " " + p; if( file ) - cmd = cmd + " " + tostring(bl[2]:1); + cmd = cmd + " " + bl[2]:1; } if( size(ret)>0 && !LogExecCmd( cmd ) ) ret = ""; @@ -660,17 +677,25 @@ return( ret ); } +global boolean DoRemoveLun( string tgt, integer tpg, integer l ) + { + string kt = tgt + " " + tpg + " " + l; + boolean ret = LogExecCmd( "lio_node --dellun " + kt ); + y2milestone( "DoRemoveLun tgt:%1 tpg:%2 l:%3 ret:%4", tgt, tpg, l, ret ); + return( ret ); + } + boolean ActivateLun( string tgt, integer tpg, integer lun, map lm ) { y2milestone( "ActivateLun tgt:%1 tpg:%2 lun:%3", tgt, tpg, lun ); - string kt = tgt + " " + tostring(tpg) + " " + tostring(lun); + string kt = tgt + " " + tpg + " " + lun; boolean ok = true; boolean done = false; if( haskey( data["tgt",tgt,tpg,"ep","lun"]:$[], lun ) ) { if( data["tgt",tgt,tpg,"ep","lun",lun,"tcm_key"]:"" != lm["tcm_key"]:"" || data["tgt",tgt,tpg,"ep","lun",lun,"nm"]:"" != lm["nm"]:"" ) - ok = LogExecCmd( "lio_node --dellun " + kt ); + ok = DoRemoveLun( tgt, tpg, lun ); else done = true; } @@ -689,6 +714,12 @@ return( ok ); } +global boolean EnableTpg( string tgt, integer tpg ) + { + boolean ret = LogExecCmd( "lio_node --enabletpg " + tgt + " " + tpg ); + return( ret ); + } + global boolean ActivateConfigIetd( map dat ) { string cmd = ""; @@ -698,13 +729,13 @@ { foreach( integer tpg, map d, m, { - string kt = key + " " + tostring(tpg); + string kt = key + " " + tpg; foreach( integer l, map lun, d["ep","lun"]:$[], { ok = ActivateLun( key, tpg, l, lun ) && ok; }); if( !IsTpgActive( key, tpg )) - ok = LogExecCmd( "lio_node --enabletpg " + kt ) && ok; + ok = EnableTpg( key, tpg ) && ok; }); }); y2milestone( "ActivateConfigIetd ok:%1", ok ); @@ -737,6 +768,24 @@ return( ret ); } +global boolean AddTarget( string tgt, integer tpg ) + { + boolean ret = LogExecCmd( "lio_node --addtpg " + tgt + " " + tpg ); + if( ret ) + ret = EnableTpg( tgt, tpg ); + y2milestone( "AddTarget tgt:%1 tpg:%2 ret:%3", tgt, tpg, ret ); + return( ret ); + } + +global boolean DelTarget( string tgt, integer tpg ) + { + boolean ret = LogExecCmd( "lio_node --deltpg " + tgt + " " + tpg ); + if( ret && size( data["tgt",tgt]:$[] )<=1 ) + ret = LogExecCmd( "lio_node --deliqn " + tgt ); + y2milestone( "DelTarget tgt:%1 tpg:%2 ret:%3", tgt, tpg, ret ); + return( ret ); + } + global void UpdateConfig() { data = ParseConfigLio(); Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioServer.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioServer.ycp Wed Mar 28 19:39:55 2012 @@ -184,16 +184,6 @@ // get changes from perl module map<string, any> changes = IscsiLioData::GetChanges(); list<string> connected = IscsiLioData::GetConnected(); - // plus add there all targets except with active sessions (it means delete and create as new each target) -/* - foreach(string key,any value, IscsiServerFunctions::getTargets(), { - if ((!contains(connected, key))&&(!contains(changes["add"]:[], key))&&(!contains(changes["del"]:[], key))){ - changes["del"] = add (changes["del"]:[], key); - changes["add"] = add (changes["add"]:[], key); - y2milestone("modified key %1", key); - } - }); -*/ // delete targets foreach(string row, changes["del"]:[], { if (!contains(connected, row)){ Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp Wed Mar 28 19:39:55 2012 @@ -243,14 +243,25 @@ ret = `add; break; case(`delete): - // add a new item - if (Popup::ContinueCancel(_("Really delete this item?"))) + // remove a item + any del = UI::QueryWidget(`id(`server),`CurrentItem); + y2milestone("handleTable del:%1",del); + if (del != nil) { - integer del=tointeger( UI::QueryWidget(`id(`server), `CurrentItem) ); - string target = ((term)UI::QueryWidget(`id(`server), `Item(del)))[1]:""; - IscsiServerFunctions::setDelChanges( target ); - IscsiServerFunctions::removeTarget( ((term)UI::QueryWidget(`id(`server), `Item(del)))[1]:"" ); - initTable(""); + if(Popup::ContinueCancel(_("Really delete the selected item?"))) + { + list it=(list)UI::QueryWidget(`id(`server), `Items); + term i = it[(integer)del]:`Empty(); + y2milestone("handleTable item:%1",i); + if( IscsiLioData::DelTarget( i[1]:"", tointeger(i[2]:"-1") )) + { + it = remove( it, (integer)del ); + UI::ChangeWidget(`id(`server), `Items, it); + IscsiLioData::UpdateConfig(); + } + } + else + y2milestone("handleTable Delete canceled"); } break; case(`edit): @@ -373,87 +384,6 @@ else Popup::Error(_("Cannot use the same secret for incoming and outgoing authentication.")); return ret; } -// ************** Add Target Dialog ****************** -// initialize function for create new target -void initAddTarget(string key){ -// some proposed values - string target = "iqn"; - string date = ((map<string, any>)SCR::Execute(.target.bash_output, "date +%Y-%m"))["stdout"]:""; - string domain = ((map<string, any>)SCR::Execute(.target.bash_output, "dnsdomainname"))["stdout"]:""; - string uuid = ((map<string, any>)SCR::Execute(.target.bash_output, "uuidgen"))["stdout"]:""; - uuid = deletechars(uuid, "\n"); - if (size(domain)>0){ - domain = (splitstring(domain, "\n"))[0]:""; - list<string> tmp_list=splitstring(domain, "."); - domain = sformat("%1.%2", tmp_list[1]:"", tmp_list[0]:""); - } else domain="com.example"; - target = deletechars(sformat("%1.%2.%3", target, date, domain), "\n"); - y2milestone("init values for add_target %1", target); - UI::ChangeWidget(`id(`target), `Value, target); - UI::ChangeWidget(`id(`identifier), `Value, uuid); - UI::ChangeWidget(`id(`tpg), `ValidChars, String::CDigit()); - UI::ChangeWidget(`id(`tpg), `Value, "1"); - list<term> ip = (list<term>)UI::QueryWidget(`id(`ipaddr), `Items); - string s =ip[0,1]:""; - y2milestone("initAddTarget ip:%1", s ); - UI::ChangeWidget(`id(`ipaddr), `Value, s); - UI::ChangeWidget(`id(`port), `ValidChars, String::CDigit()); - UI::ChangeWidget(`id(`port), `Value, "3260"); -} - -/* -symbol handleAddTarget (string table, map event){ - symbol ret = nil; - if(event["EventReason"]:"" == "Activated"){ - switch((symbol)event["ID"]:nil){ - case(`add) : y2internal("add"); - return `lun_add; - case(`edit) : y2internal("edit"); - break; - case(`delete) : y2internal("delete"); - break; - case(`expert) : y2internal("expert"); - return `expert; - - } - } -} -*/ - -// save values -void storeAddTarget(string option_id, map option_map){ - list<map<string, any> > old = []; - string target = tostring( sformat("%1:%2",UI::QueryWidget(`id(`target), `Value), UI::QueryWidget(`id(`identifier), `Value)) ); -// string lun = sformat("%1 Path=%2,Type=fileio",UI::QueryWidget(`id(`lun), `Value), UI::QueryWidget(`id(`path), `Value) ); -// add/modify that values - list<map<string, any> > items = []; - foreach(term row, (list<term>)UI::QueryWidget(`lun_table, `Items), { - items = add(items, $["KEY":row[1]:"", "VALUE":row[2]:""]); - }); - y2milestone("Add target %1", target); - IscsiServerFunctions::addNewTarget(target, items); - curr_target = target; -} - -// validate function checks if target/lun are unique and not empty -boolean validateAddTarget(string key, map event){ - string target = tostring( UI::QueryWidget(`id(`target), `Value) ); -// string lun = tostring( UI::QueryWidget(`id(`lun), `Value) ); - string type = "no"; - if (( size(target)==0 && (Popup::Error(_("The target cannot be empty."))==nil) ) || - ( IscsiServerFunctions::ifExists("Target", target) && (Popup::Error(_("The target already exists."))==nil) )){ - UI::SetFocus(`id(`target)); - return false; - } -/* - if ((size(lun)==0 && (Popup::Error(_("The logical unit definition cannot be empty."))==nil))|| - ( IscsiServerFunctions::ifExists("Lun", lun) && (Popup::Error(_("The logical unit already exists."))==nil))){ - UI::SetFocus(`id(`lun)); - return false; - } -*/ - return true; -} // **************** Target Auth ******************* // handle authentication dialog @@ -587,17 +517,9 @@ if(Popup::ContinueCancel(_("Really delete the selected item?"))) { y2milestone("Delete LUN %1 from table", del); - list items=[]; - integer count=0; - foreach(term row, (list<term>)UI::QueryWidget(`lun_table, `Items), - { - if (count!=del) - { - items=add(items, `item(`id(size(items)),row[1]:"", row[2]:"")); - } - count = count + 1; - }); - UI::ChangeWidget(`id(`lun_table), `Items, items); + list it=(list)UI::QueryWidget(`lun_table, `Items); + it = remove( it, (integer)del ); + UI::ChangeWidget(`id(`lun_table), `Items, it); } else y2milestone("Delete canceled"); @@ -636,7 +558,50 @@ void storeModify(string option_id, map option_map) { boolean chg = false; - foreach(term row, (list<term>)UI::QueryWidget(`lun_table, `Items), + if( !IscsiLioData::HasTarget( curr_target, curr_tpg ) ) + { + chg = true; + if( !IscsiLioData::AddTarget( curr_target, curr_tpg )) + { + string txt = sformat( _("Problem creating target %1 with tpg %2"), + curr_target, curr_tpg ); + Popup::Error( txt ); + } + } + string ipp = IscsiLioData::GetNetworkPortal( curr_target, curr_tpg )[0]:""; + string ip = (string)UI::QueryWidget(`ipaddr, `Value ); + integer port = tointeger(UI::QueryWidget(`port, `Value )); + y2milestone( "storeModify ip:%1 port:%2 ipp:%3", ip, port, ipp ); + string np = sformat( "%1:%2", ip, port ); + if( size(ip)>0 && np != ipp ) + { + chg = true; + if( !IscsiLioData::SetNetworkPortal( curr_target, curr_tpg, np )) + { + string txt = sformat( _("Problem setting network portal to %1"), np ); + Popup::Error( txt ); + } + } + list<term> it = (list<term>)UI::QueryWidget(`lun_table, `Items); + list<integer> nll = maplist( term t, it, ``(tointeger(t[1]:"-1"))); + list<integer> oll = maplist( list lli, + IscsiLioData::GetLunList( curr_target, curr_tpg ), + ``(lli[0]:-1)); + y2milestone( "storeModify oll:%1", oll ); + y2milestone( "storeModify nll:%1", nll ); + foreach( integer l, oll, + { + if( !contains( nll, l )) + { + chg = true; + if( !IscsiLioData::DoRemoveLun( curr_target, curr_tpg, l )) + { + string txt = sformat( _("Problem removing lun %1"), l ); + Popup::Error( txt ); + } + } + }); + foreach(term row, it, { map lun = $[ "lun" : tointeger(row[1]:"-1"), "nm" : row[2]:"", @@ -647,7 +612,7 @@ chg = true; if( !IscsiLioData::DoUpdateLun( curr_target, curr_tpg, lun )) { - string txt = sformat( _("Problem seting lun %1 (name:%2) to path %3"), + string txt = sformat( _("Problem setting lun %1 (name:%2) to path %3"), lun["lun"]:-1, lun["nm"]:"", lun["path"]:"" ); Popup::Error( txt ); } @@ -660,4 +625,82 @@ } } +// ************** Add Target Dialog ****************** +// initialize function for create new target +void initAddTarget(string key) + { + // some proposed values + string target = "iqn"; + string date = ((map<string, any>)SCR::Execute(.target.bash_output, "date +%Y-%m"))["stdout"]:""; + string domain = ((map<string, any>)SCR::Execute(.target.bash_output, "dnsdomainname"))["stdout"]:""; + string uuid = ((map<string, any>)SCR::Execute(.target.bash_output, "uuidgen"))["stdout"]:""; + uuid = deletechars(uuid, "\n"); + if (size(domain)>0) + { + domain = (splitstring(domain, "\n"))[0]:""; + list<string> tmp_list=splitstring(domain, "."); + domain = sformat("%1.%2", tmp_list[1]:"", tmp_list[0]:""); + } + else + domain="com.example"; + target = deletechars(sformat("%1.%2.%3", target, date, domain), "\n"); + y2milestone("init values for add_target %1", target); + UI::ChangeWidget(`id(`target), `Value, target); + UI::ChangeWidget(`id(`identifier), `Value, uuid); + UI::ChangeWidget(`id(`tpg), `ValidChars, String::CDigit()); + UI::ChangeWidget(`id(`tpg), `Value, "1"); + list<term> ip = (list<term>)UI::QueryWidget(`id(`ipaddr), `Items); + string s =ip[0,1]:""; + y2milestone("initAddTarget ip:%1", s ); + UI::ChangeWidget(`id(`ipaddr), `Value, s); + UI::ChangeWidget(`id(`port), `ValidChars, String::CDigit()); + UI::ChangeWidget(`id(`port), `Value, "3260"); + } + +list uiTarget() + { + integer tpg = nil; + tpg = tointeger(UI::QueryWidget(`id(`tpg),`Value)); + return( [ (string)UI::QueryWidget(`id(`target), `Value), + (string)UI::QueryWidget(`id(`identifier), `Value), + tpg ] ); + } + +void storeAddTarget(string option_id, map option_map) + { + list target = uiTarget(); + y2milestone( "storeAddTarget %1", target ); + curr_target = sformat( "%1:%2", target[0]:"", target[1]:"" ); + curr_tpg = target[2]:-1; + storeModify(option_id,option_map); + } + + +// validate function checks if target/tpg are unique and not empty +boolean validateAddTarget(string key, map event) + { + list target = uiTarget(); + y2milestone( "validateAddTarget %1", target ); + boolean ret = true; + if( size(target[0]:"")==0 ) + { + Popup::Error(_("The target cannot be empty.")); + UI::SetFocus(`id(`target)); + ret = false; + } + else if( target[2]:nil==nil ) + { + Popup::Error(_("The target portal group cannot be empty.")); + UI::SetFocus(`id(`tpg)); + ret = false; + } + else if( IscsiLioData::HasTarget(sformat( "%1:%2", target[0]:"", target[1]:"" ), target[2]:-1 )) + { + Popup::Error(_("The target already exists.")); + UI::SetFocus(`id(`target)); + ret = false; + } + return ret; + } + } -- 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] r67732 - /tags/stable-2_22_5/yast2/
by gs＠svn2.opensuse.org 28 Mar '12

28 Mar '12

Author: gs Date: Wed Mar 28 12:06:03 2012 New Revision: 67732 URL: http://svn.opensuse.org/viewcvs/yast?rev=67732&view=rev Log: Created tag stable-2_22_5 for yast2 Added: tags/stable-2_22_5/yast2/ (props changed) - copied from r67731, trunk/yast2/ -- 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] r67731 - in /trunk/yast2: VERSION package/yast2.changes
by gs＠svn2.opensuse.org 28 Mar '12

28 Mar '12

Author: gs Date: Wed Mar 28 12:05:38 2012 New Revision: 67731 URL: http://svn.opensuse.org/viewcvs/yast?rev=67731&view=rev Log: Revert the change in FileUtils::Exists() - 2.22.5 Modified: trunk/yast2/VERSION trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=67731&r1=67730… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Wed Mar 28 12:05:38 2012 @@ -1 +1 @@ -2.22.4 +2.22.5 Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Wed Mar 28 12:05:38 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Mar 28 11:58:34 CEST 2012 - gs(a)suse.de + +- Revert the change in FileUtils::Exists() (change is not needed + here but will cause failure of testsuites) +- 2.22.5 + +------------------------------------------------------------------- Wed Feb 22 12:57:01 UTC 2012 - mfilka(a)suse.com - bnc#694582 - added @ as it is allowed in authority part of URI. -- 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] r67730 - in /branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server: ./ agents/ doc/ doc/autodocs/ src/ src/IscsiLioData.ycp testsuite/
by fehr＠svn2.opensuse.org 28 Mar '12

28 Mar '12

Author: fehr Date: Wed Mar 28 12:01:30 2012 New Revision: 67730 URL: http://svn.opensuse.org/viewcvs/yast?rev=67730&view=rev Log: added IscsiLioData.ycp set svn:ignore Added: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/ (props changed) branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/agents/ (props changed) branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/doc/ (props changed) branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/doc/autodocs/ (props changed) branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/ (props changed) branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/testsuite/ (props changed) Added: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp Wed Mar 28 12:01:30 2012 @@ -0,0 +1,747 @@ +/** + * File: modules/IscsiLioData.ycp + * Package: Configuration Data of iscsi-lio-server + * Summary: IscsiLioServer data manipulation functions + * Authors: Thomas Fehr <fehr(a)suse.cz> + * + * $Id$ + * + * Representation of the configuration of iscsi-lio-server. + */ + +{ + +module "IscsiLioData"; + +textdomain "iscsi-lio-server"; + +map<string,any> data = $[]; + +list<string> SplitStringNE( string str, string delim ) + { + return( filter( string s, splitstring(str,delim), ``(size(s)>0))); + } + +integer MyFind( string s, string pat ) + { + integer ret = search( s, pat ); + if(ret==nil) + ret=-1; + return( ret ); + } + +map<string,any> GetTgt( map<string,any> data, string tgt, integer tpg ) + { + map<string,any> m = data["tgt",tgt,tpg]:$[]; + if( size(tgt)==0 ) + m = data; + return( m ); + } + +void SetTgt( map<string,any>& data, string tgt, integer tpg, map<string,any> m ) + { + if( size(tgt)==0 ) + data = m; + else + data["tgt",tgt] = $[ tpg : m ]; + } + +string FindTcmKey( string p ) + { + string ret = maplist( string key, map du, + filter( string k, map m, data["tcm"]:$[], + ``(m["path"]:""==p)), + ``(key))[0]:""; + y2milestone( "FindTcmKey p:%1 ret:%2", p, ret ); + return( ret ); + } + +string ReplaceSlashUs( string i ) + { + string ret = ""; + integer count=0; + foreach( string s, SplitStringNE( i, "/" ), + { + if( count>0 ) + ret = ret + "_"; + ret = ret + s; + count = count+1; + }); + return( ret ); + } + +global string CreateLunName( list<string> used, string p ) + { + string ret = ReplaceSlashUs( p ); + string base = ret; + integer count = 0; + while( size(filter( string s, used, ``(s==ret)))>0 ) + { + count = count+1; + ret = base + "_" + tostring(count); + } + y2milestone( "CreateLunName p:%1 ret:%2", p, ret ); + return( ret ); + } + +string CreateTcmKey( map<string,map> tcm, string base, string p ) + { + string ret = base + ReplaceSlashUs( p ); + string base = ret; + integer count = 0; + while( haskey( tcm, ret )) + { + count = count+1; + ret = base + "_" + tostring(count); + } + y2milestone( "CreateTcmKey base:%1 p:%2 ret:%3", base, p, ret ); + return( ret ); + } + +map<string,any> AddLun( map<string,any> tgt, string val ) + { + if( !haskey( tgt, "ep" )) + tgt["ep"] = $[ "lun" : $[] ]; + list<string> sl = SplitStringNE( val, " \t" ); + y2milestone( "AddLun sl:%1", sl ); + if( size(sl[0]:"")>0 && size(sl[1]:"")>0) + { + integer l = tointeger( sl[0]:"" ); + if( l!=nil && !haskey( tgt["ep","lun"]:$[],l)) + tgt["ep","lun",l] = $[]; + if( haskey( tgt["ep","lun"]:$[],l )) + { + list<string> tmps = SplitStringNE( sl[1]:"", "," ); + sl = []; + foreach( string s, tmps, + { + sl = (list<string>)merge( sl, splitstring( s, "=" )); + }); + y2milestone( "AddLun sl:%1", sl ); + while( size(sl)>0 ) + { + if( sl[0]:""=="Path" && size(sl)>1 ) + { + string tk = FindTcmKey( sl[1]:"" ); + if( size(tk)>0 ) + tgt["ep","lun",l,"tcm_key"] = tk; + else + tgt["ep","lun",l,"path"] = sl[1]:""; + list<string> used = + maplist( integer i, map m, tgt["ep","lun"]:$[], + ``(m["nm"]:"")); + y2milestone( "AddLun used:%1", used ); + tgt["ep","lun",l,"nm"] = CreateLunName( used, sl[1]:"" ); + sl = remove( sl, 0 ); + } + sl = remove( sl, 0 ); + } + } + if( size(tgt["ep","lun",l,"path"]:"")==0 && size(tgt["ep","lun",l,"tcm_key"]:"")==0) + tgt["ep","lun"] = remove( tgt["ep","lun"]:$[], l ); + } + return( tgt ); + } + +map<string,any> AddIncoming( map<string,any> tgt, string val ) + { + list<string> sl = SplitStringNE( val, " \t" ); + if( size(sl[0]:"")>0 && size(sl[1]:"")>0) + tgt["incoming"] = add( tgt["incoming"]:[], [ sl[0]:"", sl[1]:"" ] ); + return( tgt ); + } + +map<string,any> AddOutgoing( map<string,any> tgt, string val ) + { + list<string> sl = SplitStringNE( val, " \t" ); + if( size(sl[0]:"")>0 && size(sl[1]:"")>0) + tgt["outgoing"] = [ sl[0]:"", sl[1]:"" ]; + return( tgt ); + } + +global map<string,any> ParseConfigIetd( map<string, any> rv ) + { + map<string,any> data = $[]; + string target = ""; + integer tpg = 1; + foreach( map v, (list<map>)rv["value"]:[], + { + string name = toupper( v["name"]:"" ); + string val = v["value"]:""; + if( contains( ["ISNSSERVER", "ISNSACCESSCONTROL"], name )) + data[name] = val; + else if( name == "TARGET" ) + { + if( !haskey( data, "tgt" )) + data["tgt"] = $[]; + if( !haskey( data["tgt"]:$[], val )) + data["tgt",val] = $[ tpg : $[]]; + target = val; + } + else if( name == "LUN" && size(target)>0 ) + data["tgt",target,tpg] = AddLun( data["tgt",target,tpg]:$[], val ); + else if( name == "INCOMINGUSER" ) + { + map<string,any> m = GetTgt(data,target,tpg); + m = AddIncoming( m, val ); + SetTgt(data,target,tpg,m); + } + else if( name == "OUTGOINGUSER" ) + { + map<string,any> m = GetTgt(data,target,tpg); + m = AddOutgoing( m, val ); + SetTgt(data,target,tpg,m); + } + }); + return( data ); + } + +boolean IsTpgActive( string tgt, integer tpg ) + { + return( data["tgt",tgt,tpg,"ep","enabled"]:false ); + } + +boolean LogExecCmd( string cmd ) + { + y2milestone( "Executing cmd:%1", cmd ); + map ret = (map<string,any>)SCR::Execute(.target.bash_output, cmd ); + if( ret["exit"]:-1!=0 ) + y2error( "Error ret:%1", ret ); + else + y2milestone( "Ret:%1", ret ); + return( ret["exit"]:-1==0 ); + } + +global void AddNewTarget( string name, integer tpg, list<string> lun ) + { + y2milestone( "AddNewTarget name:%1 tpg:%2", name, tpg ); + if( !haskey( data, "tgt" )) + data["tgt"] = $[]; + data["tgt",name] = $[ tpg : $[] ]; + foreach( string s, lun, + { + data["tgt",name,tpg] = AddLun( data["tgt",name,tpg]:$[], s ); + }); + } + +global void SetAuth( string tgt, integer tpg, list<string> incom, string outgo ) + { + map<string,any> m = GetTgt(data,tgt,tpg); + foreach( string s, incom, ``{m=AddIncoming( m, s );}); + if( size(outgo)>0 ) + m = AddOutgoing( m, outgo ); + SetTgt(data,tgt,tpg,m); + } + +global boolean HasIncomingAuth( string tgt, integer tpg ) + { + map m = GetTgt(data,tgt,tpg); + y2milestone( "HasIncomingAuth m:%1 ret:%2", m["incoming"]:[], size(m["incoming"]:[])>0 ); + return( size(m["incoming"]:[])>0 ); + } + +global boolean HasOutgoingAuth( string tgt, integer tpg ) + { + map m = GetTgt(data,tgt,tpg); + y2milestone( "HasOutgoingAuth m:%1 ret:%2", m["outgoing"]:[], size(m["outgoing"]:[])>1 ); + return( size(m["outgoing"]:[])>1 ); + } + +global boolean HasAuth( string tgt, integer tpg ) + { + return( HasIncomingAuth(tgt,tpg)||HasOutgoingAuth(tgt,tpg) ); + } + +global map<integer,map> GetLun( string tgt, integer tpg ) + { + map<integer,map> ret = data["tgt",tgt,tpg,"ep","lun"]:$[]; + return( ret ); + } + +global list<list> GetLunList( string tgt, integer tpg ) + { + list<list> ret = maplist( integer l, map m, data["tgt",tgt,tpg,"ep","lun"]:$[], + { + return( [ l, m["nm"]:"", data["tcm",m["tcm_key"]:"","path"]:"" ] ); + }); + return( ret ); + } + +global list<string> GetNetworkPortal( string tgt, integer tpg ) + { + list<string> ret = maplist( map n, data["tgt",tgt,tpg,"ep","np"]:[], + { + return( sformat( "%1:%2", n["ip"]:"", n["port"]:1 )); + }); + return( ret ); + } + +global list<list> GetTargets() + { + list<list> ret = []; + foreach( string key, map<integer,map> m, data["tgt"]:$[], + { + foreach( integer tpg, map dummy, m, + { + ret = add( ret, [ key, tpg ] ); + y2milestone( "GetTargets key:%1 tpg:%2", key, tpg ); + y2milestone( "GetTargets ret:%1", ret ); + }); + }); + y2milestone( "GetTargets ret:%1", ret ); + return( ret ); + } + +global string GetExportLun( integer l, map m ) + { + string p = m["path"]:""; + if( size(p)==0 ) + p = data["tcm",m["tcm_key"]:"","path"]:""; + string ret = tostring(l) + " Path=" + p + ",Type=fileio"; + return( ret ); + } + +global list<map<string,any> > GetExportAuth( string tgt, integer tpg ) + { + list<map<string,any> > ret = []; + map<string,any> m = GetTgt(data,tgt,tpg); + foreach( list s, (list<list>)m["incoming"]:[], + { + ret = add( ret, $[ "KEY" : "IncomingUser", + "VALUE" : s[0]:"" + " " + s[1]:"" ] ); + }); + if( size(m["outgoing"]:[])>1 ) + ret = add( ret, $[ "KEY" : "OutgoingUser", + "VALUE" : m["outgoing",0]:"" + " " + m["outgoing",1]:"" ] ); + return( ret ); + } + +global map<string,any> GetExportTargets() + { + map<string,any> ret = $[]; + foreach( list s, GetTargets(), + { + list tgt = [ $[ "KEY" : "Target", "VALUE" : s[0]:"" ], + $[ "KEY" : "Tpg", "VALUE" : tostring(s[1]:1) ] ]; + foreach( integer i, map m, data["tgt",s[0]:"",s[1]:1,"ep","lun"]:$[], + { + tgt = add( tgt, $[ "KEY" : "Lun", "VALUE" : GetExportLun(i,m) ] ); + }); + tgt = union( tgt, GetExportAuth(s[0]:"",s[1]:1) ); + ret[s[0]:""] = tgt; + }); + return( ret ); + } + +global map<string,any> GetData() + { + return data; + } + +global void SetData(map<string,any> dat) + { + data = dat; + } + +global void ClearData() + { + data = $[]; + } + +global map<string, any> GetChanges() + { + return( $[] ); + } + +global map<string, any> GetConfig() + { + return( $[] ); + } + +global list<string> GetIpAddr() + { + map out = (map) SCR::Execute (.target.bash_output, "ifconfig" ); + list<string> ls = filter( string ln, splitstring( out["stdout"]:"", "\n" ), + ``(search(ln,"inet addr:")!=nil)); + ls = maplist( string s, ls, + { + integer pos = search(s,"inet addr:"); + s = substring( s, pos+10 ); + pos = findfirstof(s,"\t "); + if( pos!=nil ) + s = substring( s, 0, pos ); + return(s); + }); + ls = filter( string s, ls, ``(substring( s, 0, 4 )!="127.")); + ls = add( ls, "" ); + y2milestone( "GetIpAddr ls:%1", ls ); + return( ls ); + } + +global list<string> GetConnected() + { + string cmd = "find /sys/kernel/config/target/iscsi -name info"; + map<string,any> ret = (map<string,any>)SCR::Execute(.target.bash_output, cmd ); + list<string> ls = SplitStringNE( ret["stdout"]:"", "\n" ); + y2milestone( "GetConnected ls:%1", ls ); + map<string,boolean> state = $[]; + string inact = "No active iSCSI Session "; + string act = "InitiatorName: "; + foreach( string f, ls, + { + cmd = "head -1 " + f; + ret = (map<string,any>)SCR::Execute(.target.bash_output, cmd ); + if( ret["exit"]:-1==0 ) + { + if( substring( ret["stdout"]:"", 0, size(inact) )==inact ) + state[f] = false; + else if( substring( ret["stdout"]:"", 0, size(act) )==act ) + state[f] = true; + } + }); + y2milestone( "GetConnected state:%1", state ); + state = mapmap( string s, boolean b, state, + { + ls = splitstring( s, "/" ); + return( $[ ls[6]:"" + " " + ls[7]:"" + " " + ls[9]:"" : b ] ); + }); + y2milestone( "GetConnected state:%1", state ); + ls = maplist( string s, boolean b, filter( string s, boolean b, state, ``(b)), + ``(splitstring( s, " " )[2]:"")); + y2milestone( "GetConnected ret:%1", ls ); + return( ls ); + } + +void ParseAuthData( string tgt, integer tpg, string clnt, + list& chap, list& mutual ) + { + y2milestone( "ParseAuthData tgt:%1 tpg:%2 clnt:%3", tgt, tpg, clnt ); + string cmd = ""; + if( size(tgt)>0 ) + cmd = "lio_node --showchapauth " + tgt + " " + tostring(tpg) + + " " + clnt; + else + cmd = "lio_node --showchapdiscauth"; + map out = (map)SCR::Execute(.target.bash_output, cmd ); + list<string> ls = SplitStringNE( out["stdout"]:"", "\n" ); + integer i=0; + while( i<size(ls) ) + { + if( search(ls[i]:"", "password_mutual:" )!=nil ) + mutual[1] = SplitStringNE( ls[i]:"", " " )[1]:""; + if( search(ls[i]:"", "userid_mutual:" )!=nil ) + mutual[0] = SplitStringNE( ls[i]:"", " " )[1]:""; + if( search(ls[i]:"", "password:" )!=nil ) + chap[1] = SplitStringNE( ls[i]:"", " " )[1]:""; + if( search(ls[i]:"", "userid:" )!=nil ) + chap[0] = SplitStringNE( ls[i]:"", " " )[1]:""; + i=i+1; + } + } + +global map<string,any> ParseConfigLio() + { + map<string, any> tcm = $[]; + map out = (map)SCR::Execute(.target.bash_output, "tcm_node --listhbas" ); + list<string> ls = SplitStringNE( out["stdout"]:"", "\n" ); + integer i=0; + while( i<size(ls) ) + { + while( i<size(ls) && search(ls[i]:"", "\\---" )!=0 ) + i=i+1; + string hba = splitstring( ls[i]:"", " " )[1]:""; + string nm = ""; + i=i+1; + integer pos = MyFind( ls[i]:"", "\\---" ); + while( i<size(ls) && pos!=0 ) + { + if( pos>0 ) + { + nm = SplitStringNE( ls[i]:"", " " )[1]:""; + y2milestone( "ParseConfigLio nm=%1", nm ); + } + if( search(ls[i]:"", "TCM FILEIO")!=nil ) + { + pos = search(ls[i]:"", "File:"); + if( pos!=nil ) + { + string p = SplitStringNE( substring(ls[i]:"",pos), " " )[1]:""; + string key = hba + "/" + nm; + if( size(p)>0 ) + tcm[key] = $[ "path" : p, "type" : `fileio ]; + y2milestone( "ParseConfigLio hba[%1]:%2", key, tcm[key]:$[] ); + } + } + if( search(ls[i]:"", "iBlock device:")!=nil ) + { + pos = search(ls[i]:"", "UDEV PATH:"); + if( pos!=nil ) + { + string p = SplitStringNE( substring(ls[i]:"",pos), " " )[2]:""; + string key = hba + "/" + nm; + if( size(p)>0 ) + tcm[key] = $[ "path" : p, "type" : `iblock ]; + y2milestone( "ParseConfigLio hba[%1]:%2", key, tcm[key]:$[] ); + } + } + i=i+1; + pos = MyFind( ls[i]:"", "\\---" ); + } + } + map<string, map> endp = $[]; + out = (map)SCR::Execute(.target.bash_output, "lio_node --listendpoints" ); + ls = SplitStringNE( out["stdout"]:"", "\n" ); + i=0; + while( i<size(ls) ) + { + while( i<size(ls) && search(ls[i]:"", "\\---" )!=0 ) + i=i+1; + string tgt = splitstring( ls[i]:"", " " )[1]:""; + string ts = ""; + endp[tgt] = $[]; + i=i+1; + integer pos = MyFind( ls[i]:"", "\\---" ); + integer tpg = 0; + while( i<size(ls) && pos!=0 ) + { + if( search(ls[i]:"", "-> tpgt")!=nil ) + { + tpg = tointeger(substring( SplitStringNE( ls[i]:"", " " )[1]:"", 5 )); + if( tpg!=nil ) + { + endp[tgt,tpg] = $[]; + } + else + tpg = 0; + y2milestone( "ParseConfigLio tpg:%1", tpg ); + } + if( tpg>0 && search(ls[i]:"", "TPG Status:")!=nil ) + { + ts = SplitStringNE( ls[i]:"", " " )[2]:""; + endp[tgt,tpg,"enabled"] = ts=="ENABLED"; + y2milestone( "ParseConfigLio enabled:%1", endp[tgt,tpg,"enabled"]:false ); + } + if( tpg>0 && search(ls[i]:"", "TPG Network Portals:")!=nil ) + { + i=i+1; + while( MyFind(ls[i]:"", "-> ")>0 ) + { + list<string> tls = SplitStringNE( SplitStringNE( ls[i]:"", " " )[1]:"", ":"); + integer port = tointeger( tls[1]:"" ); + if( port!=nil ) + endp[tgt,tpg,"np"] = add( endp[tgt,tpg,"np"]:[], + $[ "ip" : tls[0]:"", "port" : port ] ); + i=i+1; + } + i=i-1; + y2milestone( "ParseConfigLio np:%1", endp[tgt,tpg,"np"]:[] ); + } + if( tpg>0 && search(ls[i]:"", "-> lun")!=nil ) + { + list<string> tls = SplitStringNE( ls[i]:"", " " ); + integer ti = tointeger(substring( SplitStringNE( tls[1]:"", "/" )[0]:"", 4 )); + if( ti!=nil ) + { + if( !haskey( endp[tgt,tpg]:$[], "lun" )) + endp[tgt,tpg,"lun"] = $[]; + map lun = $[]; + lun["nm"] = SplitStringNE( tls[1]:"", "/" )[1]:""; + lun["tcm_key"] = substring( tls[3]:"", 12 ); + endp[tgt,tpg,"lun",ti] = lun; + y2milestone( "ParseConfigLio lun[%1]:%2", ti, lun ); + if( !haskey( tcm, lun["tcm_key"]:"" )) + y2warning( "tcm key %1 should exist", lun["tcm_key"]:"" ); + } + } + i=i+1; + pos = MyFind( ls[i]:"", "\\---" ); + } + } + map<string,any> ret = $[ "tcm" : tcm ]; + map tgmap = $[]; + list<string> mutual = [ "", "" ]; + list<string> chap = [ "", "" ]; + ParseAuthData( "", 0, "", chap, mutual ); + if( size(mutual[0]:"")>0 && size(mutual[1]:"")>0 ) + tgmap["outgoing"] = mutual; + if( size(chap[0]:"")>0 && size(chap[1]:"")>0 ) + tgmap["incoming"] = [ chap ]; + foreach( string tgt, map m, endp, + { + tgmap[tgt] = $[]; + foreach( integer tpg, map tp, (map<integer,map>)m, + { + tgmap[tgt,tpg] = $[ "ep" : endp[tgt,tpg]:$[], + "clnt" : $[] ]; + y2milestone( "ParseConfigLio tgt:%1 tpg:%2", tgt, tpg ); + string cmd = "lio_node --listlunacls " + tgt + " " + tostring(tpg); + out = (map)SCR::Execute(.target.bash_output, cmd ); + ls = SplitStringNE( out["stdout"]:"", "\n" ); + i=0; + string nm = ""; + while( i<size(ls) ) + { + if( search(ls[i]:"", "InitiatorName ACL:" )!=nil ) + { + nm = SplitStringNE( ls[i]:"", " " )[3]:""; + if( size(nm)>0 ) + tgmap[tgt,tpg,"clnt",nm] = $[]; + y2milestone( "ParseConfigLio nm:%1", nm ); + } + if( size(nm)>0 && search(ls[i]:"", "-> lun")!=nil ) + { + list<string> tls = SplitStringNE( ls[i]:"", " " ); + integer ti = tointeger(substring( SplitStringNE( tls[1]:"", "/" )[0]:"", 4 )); + integer lun = tointeger( substring(SplitStringNE( tls[3]:"", "/" )[5]:"", 4)); + if( ti!=nil && lun!=nil ) + { + if( !haskey( tgmap[tgt,tpg,"clnt",nm]:$[], "lun" )) + tgmap[tgt,tpg,"clnt",nm,"lun"] = $[]; + tgmap[tgt,tpg,"clnt",nm,"lun",ti] = lun; + y2milestone( "ParseConfigLio lun[%1]:%2", ti, lun ); + if( !haskey( tgmap[tgt,tpg,"ep","lun"]:$[], lun )) + y2warning( "lun %1 should exist in endpoints", lun ); + } + } + i=i+1; + } + foreach( string clnt, map m, tgmap[tgt,tpg,"clnt"]:$[], + { + mutual = [ "", "" ]; + chap = [ "", "" ]; + ParseAuthData( tgt, tpg, clnt, chap, mutual ); + if( size(mutual[0]:"")>0 && size(mutual[1]:"")>0 ) + tgmap[tgt,tpg,"clnt",clnt,"outgoing"] = mutual; + if( size(chap[0]:"")>0 && size(chap[1]:"")>0 ) + tgmap[tgt,tpg,"clnt",clnt,"incoming"] = [ chap ]; + }); + }); + }); + ret["tgt"] = tgmap; + return( ret ); + } + +global list CheckPath( string p ) + { + list<boolean> ret = [ false, false ]; + map stat = (map) SCR::Read(.target.stat, p ); + ret[0] = stat["isblock"]:false || stat["isreg"]:false; + ret[1] = ret[0]:false && stat["isblock"]:false; + ret[2] = ret[0]:false && stat["size"]:false; + y2milestone( "CheckPath p:%1 ret:%2", p, ret ); + return( ret ); + } + +string CreateTcmDev( string p ) + { + string ret = ""; + string cmd = "tcm_node "; + list bl = CheckPath( p ); + boolean file = !bl[1]:false; + if( bl[0]:false ) + { + ret = bl[1]:false?"iblock_0/":"fileio_0/"; + cmd = cmd + ((bl[1]:false)?"--block ":"--fileio "); + } + if( size(ret)>0 ) + { + ret = CreateTcmKey( data["tcm"]:$[], ret, p ); + cmd = cmd + ret + " " + p; + if( file ) + cmd = cmd + " " + tostring(bl[2]:1); + } + if( size(ret)>0 && !LogExecCmd( cmd ) ) + ret = ""; + else + data["tcm",ret] = $[ "path" : p, "type" : file?`fileio:`iblock ]; + y2milestone( "CreateTcmDev path:%1 ret:%2", p, ret ); + if( size(ret)>0 ) + y2milestone( "CreateTcmDev new tcm:%1", data["tcm",ret]:$[] ); + return( ret ); + } + +boolean ActivateLun( string tgt, integer tpg, integer lun, map lm ) + { + y2milestone( "ActivateLun tgt:%1 tpg:%2 lun:%3", tgt, tpg, lun ); + string kt = tgt + " " + tostring(tpg) + " " + tostring(lun); + boolean ok = true; + boolean done = false; + if( haskey( data["tgt",tgt,tpg,"ep","lun"]:$[], lun ) ) + { + if( data["tgt",tgt,tpg,"ep","lun",lun,"tcm_key"]:"" != lm["tcm_key"]:"" || + data["tgt",tgt,tpg,"ep","lun",lun,"nm"]:"" != lm["nm"]:"" ) + ok = LogExecCmd( "lio_node --dellun " + kt ); + else + done = true; + } + if( !done && ok && size( lm["tcm_key"]:"" )==0 ) + { + string key = CreateTcmDev( lm["path"]:"" ); + if( size(key)==0 ) + ok = false; + else + lm["tcm_key"] = key; + } + if( !done && ok ) + ok = LogExecCmd( "lio_node --addlun " + kt + " " + + lm["nm"]:"" + " " + lm["tcm_key"]:"" ); + y2milestone( "ActivateLun ok:%1 done:%2 lm:%3", ok, done, lm ); + return( ok ); + } + +global boolean ActivateConfigIetd( map dat ) + { + string cmd = ""; + boolean ok = true; + y2milestone( "ActivateConfigIetd start" ); + foreach( string key, map<integer,map> m, dat["tgt"]:$[], + { + foreach( integer tpg, map d, m, + { + string kt = key + " " + tostring(tpg); + foreach( integer l, map lun, d["ep","lun"]:$[], + { + ok = ActivateLun( key, tpg, l, lun ) && ok; + }); + if( !IsTpgActive( key, tpg )) + ok = LogExecCmd( "lio_node --enabletpg " + kt ) && ok; + }); + }); + y2milestone( "ActivateConfigIetd ok:%1", ok ); + data = ParseConfigLio(); + return( ok ); + } + +global boolean NeedUpdateLun( string tgt, integer tpg, map& lm ) + { + integer lun = lm["lun"]:-1; + boolean ret = !haskey( data["tgt",tgt,tpg,"ep","lun"]:$[], lun ); + string tk = FindTcmKey( lm["path"]:"" ); + if( size(tk)>0 ) + lm["tcm_key"] = tk; + if( !ret ) + { + ret = data["tgt",tgt,tpg,"ep","lun",lun,"tcm_key"]:"" != lm["tcm_key"]:"" || + data["tgt",tgt,tpg,"ep","lun",lun,"nm"]:"" != lm["nm"]:""; + } + y2milestone( "NeedUpdateLun ret:%1 lm:%2", ret, lm ); + return( ret ); + } + +global boolean DoUpdateLun( string tgt, integer tpg, map lm ) + { + y2milestone( "DoUpdateLun tgt:%1 tpg:%2 lm:%3", tgt, tpg, lm ); + integer lun = lm["lun"]:-1; + boolean ret = ActivateLun( tgt, tpg, lun, lm ); + y2milestone( "DoUpdateLun ret:%1", ret ); + return( ret ); + } + +global void UpdateConfig() + { + data = ParseConfigLio(); + y2milestone( "UpdateConfig done" ); + } + +/* EOF */ +} -- 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] r67729 - /trunk/yast2/library/modules/FileUtils.ycp
by gs＠svn2.opensuse.org 28 Mar '12

28 Mar '12

Author: gs Date: Wed Mar 28 11:57:48 2012 New Revision: 67729 URL: http://svn.opensuse.org/viewcvs/yast?rev=67729&view=rev Log: revert the change in Exists(); it's not needed to check for nil here because Read(.target.stat, target) never returns nil - BUT testsuites (e.g. backup module) fail due to the change Modified: trunk/yast2/library/modules/FileUtils.ycp Modified: trunk/yast2/library/modules/FileUtils.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/modules/FileUtils.… ============================================================================== --- trunk/yast2/library/modules/FileUtils.ycp (original) +++ trunk/yast2/library/modules/FileUtils.ycp Wed Mar 28 11:57:48 2012 @@ -34,7 +34,7 @@ global define boolean Exists (string target) { map info = (map) SCR::Read(.target.stat, target); - if (info != $[] && info != nil) { + if (info != $[]) { return true; } return false; -- 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] r67728 - in /branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server: ./ package/ src/
by fehr＠svn2.opensuse.org 28 Mar '12

28 Mar '12

Author: fehr Date: Wed Mar 28 11:54:25 2012 New Revision: 67728 URL: http://svn.opensuse.org/viewcvs/yast?rev=67728&view=rev Log: first checkin (mostly for backup purposes, code not yet complete) Added: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/package/yast2-iscsi-lio-server.changes - copied, changed from r67726, branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/package/yast2-iscsi-server.changes branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioServer.ycp - copied, changed from r67726, branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiServer.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-lio-server.desktop - copied unchanged from r67726, branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-server.desktop branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-lio-server.ycp - copied, changed from r67726, branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-server.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-lio-server_auto.ycp - copied, changed from r67726, branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-server_auto.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-lio-server_proposal.ycp - copied, changed from r67726, branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-server_proposal.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/yast2-iscsi-lio-server.spec.in Removed: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/package/yast2-iscsi-server.changes branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiServer.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-server.desktop branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-server.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-server_auto.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-server_proposal.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/yast2-iscsi-server.spec.in Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/RPMNAME branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/VERSION branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/Makefile.am branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/complex.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/dialogs.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/helps.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/wizards.ycp Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/RPMNAME URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/RPMNAME (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/RPMNAME Wed Mar 28 11:54:25 2012 @@ -1 +1 @@ -yast2-iscsi-server +yast2-iscsi-lio-server Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/VERSION Wed Mar 28 11:54:25 2012 @@ -1 +1 @@ -2.17.10 +2.17.1 Copied: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/package/yast2-iscsi-lio-server.changes (from r67726, branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/package/yast2-iscsi-server.changes) URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/package/yast2-iscsi-server.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/package/yast2-iscsi-lio-server.changes Wed Mar 28 11:54:25 2012 @@ -1,284 +1,7 @@ ------------------------------------------------------------------- -Thu Aug 4 14:02:26 CEST 2011 - fehr(a)suse.de +Tue Mar 27 19:57:31 CEST 2012 - fehr(a)suse.de -- do not remove tgt package, just stop and disable tgtd service, - this way possible tgt config files do not get lost (bnc#706580) -- 2.17.10 +- 2.17.1 +- initial version of iscsi-lio-server ------------------------------------------------------------------- -Thu Jun 30 16:16:50 CEST 2011 - fehr(a)suse.de - -- fix typos in translatable texts (bnc#703125) - -------------------------------------------------------------------- -Mon May 16 11:29:53 CEST 2011 - fehr(a)suse.de - -- allow only integer values in lun input field (bnc#693683) -- 2.17.9 - -------------------------------------------------------------------- -Tue Nov 3 12:52:14 CET 2009 - mzugec(a)suse.cz - -- export credentials for target (fate#301932) -- 2.17.8 - -------------------------------------------------------------------- -Thu May 21 09:19:02 CEST 2009 - mzugec(a)suse.cz - -- handle correctly when tgt is already installed (bnc#501375) -- 2.17.7 - -------------------------------------------------------------------- -Mon Mar 23 17:51:33 CET 2009 - mzugec(a)suse.de - -- correctly work with firewall (bnc#462006) -- 2.17.6 - -------------------------------------------------------------------- -Mon Mar 23 17:49:21 CET 2009 - mzugec(a)suse.de - -- handle exceptions - thanks to ajohansson(a)novell.com (bnc#481379) -- 2.17.5 - -------------------------------------------------------------------- -Fri Dec 5 10:51:24 CET 2008 - mzugec(a)suse.cz - -- align button (bnc#447558) -- 2.17.4 - -------------------------------------------------------------------- -Mon Nov 10 16:09:30 CET 2008 - mzugec(a)suse.cz - -- fixed iSNS option problem (bnc#442670) -- 2.17.3 - -------------------------------------------------------------------- -Mon Sep 29 09:18:47 CEST 2008 - mzugec(a)suse.de - -- fixed menu category for gnome (bnc#429431) -- 2.17.2 - -------------------------------------------------------------------- -Mon Sep 8 13:05:01 CEST 2008 - mzugec(a)suse.cz - -- proofread -- 2.17.1 - -------------------------------------------------------------------- -Fri Sep 5 15:20:34 CEST 2008 - mzugec(a)suse.cz - -- changed rpm description - -------------------------------------------------------------------- -Fri May 16 16:40:22 CEST 2008 - jsrain(a)suse.cz - -- added categories Settings and System into desktop file - (bnc #382778) - -------------------------------------------------------------------- -Mon Mar 17 12:43:32 CET 2008 - jsrain(a)suse.cz - -- added 'StartupNotify=true' to the desktop file (bnc #304964) -- 2.16.1 - -------------------------------------------------------------------- -Mon Feb 24 15:55:37 CET 2008 - mzugec(a)suse.de - -- check if network is running -- 2.16.0 - -------------------------------------------------------------------- -Thu Jan 10 19:19:10 CET 2008 - mzugec(a)suse.cz - -- added iSNS support (FaTE #302083) -- 2.14.4 - -------------------------------------------------------------------- -Fri Nov 9 10:29:58 CET 2007 - mzugec(a)suse.cz - -- fixed description in file dialogs - -------------------------------------------------------------------- -Tue Mar 6 12:51:49 CET 2007 - mzugec(a)suse.cz - -- iscsi-server writes to stdout (#250628) - -------------------------------------------------------------------- -Wed Feb 7 16:27:01 CET 2007 - mzugec(a)suse.de - -- disable edit and delete buttons in empty table (#241804) -- 2.14.3 - -------------------------------------------------------------------- -Tue Feb 6 10:39:19 CET 2007 - mzugec(a)suse.de - -- remove spaces as separators between parameters in /etc/ietd.conf (#239555) -- 2.14.2 - -------------------------------------------------------------------- -Mon Jan 15 16:37:54 CET 2007 - mzugec(a)suse.cz - -- fate #300631 - Support Several LUNs for Target - -------------------------------------------------------------------- -Thu Jun 1 10:55:13 CEST 2006 - mzugec(a)suse.cz - -- fixed #180205 - because of gettext problem, - one string wasn't mark for translation -- 2.14.0 - -------------------------------------------------------------------- -Fri May 19 16:43:52 CEST 2006 - mzugec(a)suse.cz - -- fixed #177060 incorrect storing data between dialogs - -------------------------------------------------------------------- -Thu May 18 15:31:47 CEST 2006 - mzugec(a)suse.cz - -- fixed #176724 - duplicates configuration entry - -------------------------------------------------------------------- -Thu May 18 13:10:49 CEST 2006 - mzugec(a)suse.cz - -- fixed #148968 - do not restart unchanged targets - -------------------------------------------------------------------- -Wed May 17 17:48:38 CEST 2006 - mzugec(a)suse.cz - -- fixed #176186 - service status after YaST2 exit - -------------------------------------------------------------------- -Tue May 9 11:18:05 CEST 2006 - mzugec(a)suse.cz - -- fixed #173818 - support for autoyast - -------------------------------------------------------------------- -Mon Apr 24 11:13:41 CEST 2006 - mzugec(a)suse.cz - -- fixed #168732 - deleted values from auth are stored - -------------------------------------------------------------------- -Mon Apr 24 08:37:10 CEST 2006 - mzugec(a)suse.cz - -- comments, logs, testsuite - -------------------------------------------------------------------- -Tue Apr 11 12:58:08 CEST 2006 - mzugec(a)suse.cz - -- fixed #157643 - reload server - -------------------------------------------------------------------- -Fri Apr 7 08:26:27 CEST 2006 - mzugec(a)suse.cz - -- fixed #163999 - iscsi target - identifier contains '\n' - -------------------------------------------------------------------- -Wed Apr 5 17:50:29 CEST 2006 - mzugec(a)suse.cz - -- fixed #157648 - when modify target, can edit LUN - -------------------------------------------------------------------- -Wed Apr 5 17:16:42 CEST 2006 - mzugec(a)suse.cz - -- fixed #163299 - Iscsi->iSCSI - -------------------------------------------------------------------- -Wed Apr 5 17:06:10 CEST 2006 - mzugec(a)suse.cz - -- fixed #158546 cannot set the same user/pass fot incoming and outgoing auth - -------------------------------------------------------------------- -Thu Mar 23 16:11:20 CET 2006 - mzugec(a)suse.cz - -- fixed #160315 - check if user is root - -------------------------------------------------------------------- -Tue Mar 21 09:23:22 CET 2006 - mzugec(a)suse.cz - -- changed group to Net_advanced - -------------------------------------------------------------------- -Fri Mar 17 18:54:54 CET 2006 - mzugec(a)suse.cz - -- fixed #158540 - hide passwords - -------------------------------------------------------------------- -Thu Mar 16 17:20:11 CET 2006 - mzugec(a)suse.cz - -- fixed #158538 - write before restart server - -------------------------------------------------------------------- -Tue Mar 14 14:49:37 CET 2006 - mzugec(a)suse.cz - -- fixed #157645 LUN counting starts from zero - -------------------------------------------------------------------- -Tue Mar 14 14:40:49 CET 2006 - mzugec(a)suse.cz - -- fixed #157653 - use UUID with iqn - -------------------------------------------------------------------- -Mon Mar 6 10:26:07 CET 2006 - mzugec(a)suse.cz - -- #155273 - IscsiServer -> Iscsi Target - -------------------------------------------------------------------- -Fri Feb 24 14:54:03 CET 2006 - mzugec(a)suse.cz - -- fixed #152916 - immediately write configuration in Write() - -------------------------------------------------------------------- -Tue Feb 21 11:19:50 CET 2006 - mzugec(a)suse.cz - -- workarround for #148968 - warning before restart server, proofread - -------------------------------------------------------------------- -Fri Feb 17 14:42:23 CET 2006 - mzugec(a)suse.cz - -- fixed #149050 - enable/disable firewall - -------------------------------------------------------------------- -Wed Feb 15 13:20:10 CET 2006 - mzugec(a)suse.cz - -- improved #148971 - remove \n - -------------------------------------------------------------------- -Tue Feb 14 10:23:03 CET 2006 - mzugec(a)suse.cz - -- fixed #148971 - offer iqn - -------------------------------------------------------------------- -Thu Feb 9 14:01:04 CET 2006 - mzugec(a)suse.cz - -- fixed #149034 - service start - -------------------------------------------------------------------- -Mon Feb 6 14:05:54 CET 2006 - mvidner(a)suse.cz - -- Authentication fix (mzugec) -- 2.13.4 - -------------------------------------------------------------------- -Tue Jan 31 12:45:38 CET 2006 - mzugec(a)suse.cz - -- new dialogs - -------------------------------------------------------------------- -Mon Jan 23 11:06:20 CET 2006 - mzugec(a)suse.cz - -- fixed general params - -------------------------------------------------------------------- -Mon Jan 16 18:58:45 CET 2006 - mzugec(a)suse.cz - -- changed specfile - -------------------------------------------------------------------- -Mon Jan 16 18:44:30 CET 2006 - mzugec(a)suse.cz - -- without write, without modify - -------------------------------------------------------------------- -Wed Jan 11 15:39:03 2006 - mzugec(a)suse.cz - -- initial version Copied: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioServer.ycp (from r67726, branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiServer.ycp) URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiServer.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioServer.ycp Wed Mar 28 11:54:25 2012 @@ -1,19 +1,19 @@ /** - * File: modules/IscsiServer.ycp - * Package: Configuration of iscsi-server - * Summary: IscsiServer settings, input and output functions - * Authors: Michal Zugec <mzugec(a)suse.cz> + * File: modules/IscsiLioServer.ycp + * Package: Configuration of iscsi-lio-server + * Summary: IscsiLioServer settings, input and output functions + * Authors: Thomas Fehr <fehr(a)suse.de> * * $Id$ * - * Representation of the configuration of iscsi-server. + * Representation of the configuration of iscsi-lio-server. * Input and output routines. */ { -module "IscsiServer"; -textdomain "iscsi-server"; +module "IscsiLioServer"; +textdomain "iscsi-lio-server"; import "Progress"; import "Report"; @@ -24,7 +24,7 @@ import "Popup"; import "SuSEFirewall"; import "Confirm"; -import "IscsiServerFunctions"; +import "IscsiLioData"; import "Mode"; import "NetworkService"; import "PackageSystem"; @@ -83,7 +83,7 @@ -// Settings: Define all variables needed for configuration of iscsi-server +// Settings: Define all variables needed for configuration of iscsi-lio-server // TODO FIXME: Define all the variables necessary to hold // TODO FIXME: the configuration here (with the appropriate // TODO FIXME: description) @@ -98,39 +98,32 @@ // read configuration file /etc/ietd.conf global boolean readConfig(){ - map<string, any> read_values = (map<string, any>)SCR::Read(.etc.ietd.all); - IscsiServerFunctions::parseConfig( read_values ); + IscsiLioData::SetData( IscsiLioData::ParseConfigLio() ); return true; } +// read configuration file /etc/ietd.conf +global map readIetdConfig(){ + map<string, any> read_values = (map<string, any>)SCR::Read(.etc.ietd.all); + return IscsiLioData::ParseConfigIetd( read_values ); +} + +global boolean activateIetdConfig( map ietd ){ + return IscsiLioData::ActivateConfigIetd( ietd ); +} -// write configuration file /etc/ietd.conf -boolean writeConfig(){ - // prepare map, because perl->ycp lost information about data types (integers in this case) - map <string, any> config_file = IscsiServerFunctions::writeConfig(); - config_file["type"]=tointeger(config_file["type"]:"1"); - config_file["file"]=tointeger(config_file["file"]:"1"); - list <map<string, any> > value = []; - foreach(map<string, any> row, config_file["value"]:[], { - row["type"]=tointeger(row["type"]:"1"); - row["file"]=tointeger(row["file"]:"1"); - value = add(value, row); - }); - config_file["value"] = value; - y2milestone("config_file to write %1", config_file); - // write it - SCR::Write(.etc.ietd.all, config_file); - SCR::Write(.etc.ietd, nil); +// dummy function since LIO has no config file +boolean writeConfig(){ return true; } -// test if required package ("iscsitarget") is installed +// test if required package ("lio-utils") is installed boolean installed_packages(){ - if (!PackageSystem::PackageInstalled("iscsitarget")){ + if (!PackageSystem::PackageInstalled("lio-utils")){ y2milestone("Not installed, will install"); boolean confirm = Popup::AnyQuestionRichText( - "", _("Can't continue without installing iscsitarget package"), 40, 10, + "", _("Can't continue without installing lio-utils package"), 40, 10, Label::InstallButton(), Label::CancelButton (), `focus_yes ); @@ -138,24 +131,27 @@ string service = "tgtd"; if (Service::Status(service)==0) Service::Stop(service); Service::Disable(service); - PackageSystem::DoInstall(["iscsitarget"]); - if (PackageSystem::PackageInstalled("iscsitarget")) return true; + service = "iscsitarget"; + if (Service::Status(service)==0) Service::Stop(service); + Service::Disable(service); + PackageSystem::DoInstall(["lio-utils"]); + if (PackageSystem::PackageInstalled("lio-utils")) return true; else return false; } return false; } else return true; } -// check status of iscsitarget service +// check status of target service // if not enabled, start it manually boolean getServiceStatus(){ boolean ret = true; - if (Service::Status("iscsitarget") == 0) { + if (Service::Status("target") == 0) { statusOnStart=true; serviceStatus=true; } y2milestone("Service status = %1", statusOnStart); - if (!statusOnStart) Service::Start("iscsitarget"); + if (!statusOnStart) Service::Start("target"); return ret; } @@ -165,12 +161,12 @@ if (!serviceStatus) start = statusOnStart; if (!start) { - y2milestone("Stop iscsitarget service"); - Service::Stop("iscsitarget"); + y2milestone("Stop target service"); + Service::Stop("target"); } else { - y2milestone("Start iscsitarget service"); + y2milestone("Start target service"); serviceStatus=true; - Service::Start("iscsitarget"); + Service::Start("target"); } return true; } @@ -182,12 +178,12 @@ if (Popup::YesNo(_( "If changes have been made, the iSCSI target is not able to reload current configuration. It can only restart. When restarting, all sessions are aborted. -Restart the iscsitarget service? -"))) Service::Restart("iscsitarget"); +Restart the target service? +"))) Service::Restart("target"); else { // get changes from perl module - map<string, any> changes = IscsiServerFunctions::getChanges(); - list<string> connected = IscsiServerFunctions::getConnected(); + map<string, any> changes = IscsiLioData::GetChanges(); + list<string> connected = IscsiLioData::GetConnected(); // plus add there all targets except with active sessions (it means delete and create as new each target) /* foreach(string key,any value, IscsiServerFunctions::getTargets(), { @@ -225,7 +221,7 @@ list<string> lun = []; list <string> secret = []; // add authentication to target - foreach( map<string, any> conf_row, (list<map<string, any> >) IscsiServerFunctions::getConfig()[row]:[], { + foreach( map<string, any> conf_row, (list<map<string, any> >) IscsiLioData::GetConfig()[row]:[], { switch (conf_row["KEY"]:""){ case("Lun") : lun = splitstring(conf_row["VALUE"]:"", " "); break; @@ -252,13 +248,13 @@ /** - * Read all iscsi-server settings + * Read all iscsi-lio-server settings * @return true on success */ global boolean Read() { - /* IscsiServer read dialog caption */ - string caption = _("Initializing iSCSI Target Configuration"); + /* IscsiLioServer read dialog caption */ + string caption = _("Initializing LIO iSCSI Target Configuration"); // TODO FIXME Set the right number of stages integer steps = 4; @@ -292,22 +288,36 @@ if(!Confirm::MustBeRoot()) return false; if(!NetworkService::RunningNetworkPopup()) return false; Progress::NextStage(); - // check if required packages ("iscsitarget") are installed + // check if required packages ("lio-utils") are installed if(!installed_packages()) return false; sleep(sl); if(Abort()) return false; Progress::NextStep(); - // get status of iscsitarget init script + // get status of target init script if(!getServiceStatus()) return false; sleep(sl); if(Abort()) return false; Progress::NextStage(); // read configuration (/etc/ietd.conf) - if(!readConfig()) { - Report::Error(Message::CannotReadCurrentSettings()); - return false; + readConfig(); + if(size(IscsiLioData::GetTargets())==0) + { + map ietd = readIetdConfig(); + string msg = _( +"You have currently no active LIO targets but there seems +to be a valid config in /etc/ietd.conf. Should the module +try to import setting from /etc/ietd.conf into LIO?" ); + if( size(ietd["tgt"]:$[])>0 && Report::yesno_message_settings["show"]:true && + Popup::YesNo( msg )) + { + if( !activateIetdConfig( ietd )) + { + string err = _( "Errors during import. Check LIO state!" ); + Report::Error( err ); + } + } } sleep(sl); @@ -333,13 +343,13 @@ } /** - * Write all iscsi-server settings + * Write all iscsi-lio-server settings * @return true on success */ global boolean Write() { - /* IscsiServer write dialog caption */ - string caption = _("Saving iSCSI Target Configuration"); + /* IscsiLioServer write dialog caption */ + string caption = _("Saving iSCSI LIO Target Configuration"); // TODO FIXME And set the right number of stages integer steps = 2; @@ -371,8 +381,6 @@ Progress::set(true); Progress::NextStage(); - // write configuration (/etc/ietd.conf) - if(!writeConfig()) Report::Error (_("Cannot write settings.")); sleep(sl); @@ -387,13 +395,13 @@ Progress::NextStage(); sleep(sl); - // set iscsitarget initscript status + // set target initscript status if(!setServiceStatus()) return false; return true; } /** - * Get all iscsi-server settings from the first parameter + * Get all iscsi-lio-server settings from the first parameter * (For use by autoinstallation.) * @param settings The YCP structure to be imported. * @return boolean True on success @@ -411,11 +419,11 @@ if (row["KEY"]:""=="IncomingUser") incom = add(incom, row["VALUE"]:""); else outgoin = row["VALUE"]:""; }); - IscsiServerFunctions::setAuth(incom, outgoin); - break; + IscsiLioData::SetAuth("",0,incom, outgoin); + break; case("targets") : string name = ""; - list<map<string, any> > lun = []; + list<string> lun = []; list<string> inc = []; string out = ""; foreach(list< map<string, any> > val, (list<list<map<string, any> > >)value, { @@ -423,13 +431,19 @@ lun=[]; inc=[]; out=""; + integer tpg = 1; foreach(map<string, any> row, val, { switch(row["KEY"]:""){ case("Target"): name = row["VALUE"]:""; break; + case("Tpg"): + tpg = tointeger(row["VALUE"]:"1"); + if( tpg==nil ) + tpg = 1; + break; case("Lun"): - lun = add(lun, row); + lun = add(lun, row["VALUE"]:""); break; case("IncomingUser"): inc = add(inc, row["VALUE"]:""); @@ -439,8 +453,8 @@ break; } }); - IscsiServerFunctions::addNewTarget(name, lun); - IscsiServerFunctions::setTargetAuth(name, inc, out); + IscsiLioData::AddNewTarget(name, tpg, lun); + IscsiLioData::SetAuth(name, tpg, inc, out); }); break; } @@ -451,95 +465,85 @@ } /** - * Dump the iscsi-server settings to a single map + * Dump the iscsi-lio-server settings to a single map * (For use by autoinstallation.) * @return map Dumped settings (later acceptable by Import ()) */ global map Export () { list targets = []; - foreach(string k, any v, IscsiServerFunctions::getTargets(), { + foreach(string k, any v, IscsiLioData::GetExportTargets(), { targets = add(targets, v); }); map result = $[ "version" : "1.0", "service" : serviceStatus, - "auth" : IscsiServerFunctions::getConfig()["auth"]:[], + "auth" : IscsiLioData::GetExportAuth("",0), "targets" : targets ]; configured = true; return result; } -boolean noAuth(list<map<string,any> > config){ - boolean ret = true; - foreach(map<string, any> row, config, { - if (row["KEY"]:""=="IncomingUser" || row["KEY"]:""=="OutgoingUser") ret=false; - }); - return ret; -} - -boolean authIn(list<map<string,any> > config){ - boolean ret = false; - foreach(map<string, any> row, config, { - if (row["KEY"]:""=="IncomingUser") ret=true; - }); - return ret; -} - -boolean authOut(list<map<string,any> > config){ - boolean ret = false; - foreach(map<string, any> row, config, { - if (row["KEY"]:""=="OutgoingUser") ret=true; - }); - return ret; -} - -string getLun(list<map<string,any> > config){ - string ret = ""; - foreach(map<string, any> row, config, { - if (row["KEY"]:""=="Lun") ret=row["VALUE"]:""; - }); - return ret; -} +string getLunDesc(map<integer,map> lun) + { + string ret = ""; + foreach(integer l, map m, lun, + { + if( size(ret)>0 ) + ret = ret + ", "; + ret = ret + IscsiLioData::GetExportLun( l, m ); + }); + return ret; + } /** * Create a textual summary and a list of unconfigured cards * @return summary of the current configuration */ -global list Summary() { - string summary = _("Configuration summary..."); - if (configured){ +global list Summary() + { + string summary = _("Configuration summary..."); + if (configured) + { summary = Summary::AddHeader("", _("Global")); - if (serviceStatus) summary = Summary::AddLine(summary, _("When Booting")); - else summary = Summary::AddLine(summary, _("Manually")); - if (noAuth(IscsiServerFunctions::getConfig()["auth"]:[])) summary = Summary::AddLine(summary, _("No Authentication")); - else { - if(authIn(IscsiServerFunctions::getConfig()["auth"]:[])) summary = Summary::AddLine(summary, _("Incoming Authentication")); - if(authOut(IscsiServerFunctions::getConfig()["auth"]:[])) summary = Summary::AddLine(summary, _("Outgoing Authentication")); - } + if (serviceStatus) + summary = Summary::AddLine(summary, _("When Booting")); + else + summary = Summary::AddLine(summary, _("Manually")); + if( !IscsiLioData::HasAuth( "",0 )) + summary = Summary::AddLine(summary, _("No Authentication")); + else + { + if(IscsiLioData::HasIncomingAuth("",0)) summary = Summary::AddLine(summary, _("Incoming Authentication")); + if(IscsiLioData::HasOutgoingAuth("",0)) summary = Summary::AddLine(summary, _("Outgoing Authentication")); + } summary = Summary::AddHeader(summary, _("Targets")); summary = Summary::OpenList(summary); - foreach(string key, any value, IscsiServerFunctions::getTargets(), { - summary = Summary::AddListItem(summary, key); - summary = Summary::AddLine(summary, getLun((list<map<string, any> >)value)); - if (noAuth((list<map<string, any> >)value)) summary = Summary::AddLine(summary, _("No Authentication")); - else { - if(authIn((list<map<string, any> >)value)) summary = Summary::AddLine(summary, _("Incoming Authentication")); - if(authOut((list<map<string, any> >)value)) summary = Summary::AddLine(summary, _("Outgoing Authentication")); - } - - }); + foreach(list keys, IscsiLioData::GetTargets(), + { + summary = Summary::AddListItem(summary, keys[0]:""); + summary = Summary::AddLine(summary, getLunDesc(IscsiLioData::GetLun(keys[0]:"",keys[1]:1))); + if (!IscsiLioData::HasAuth(keys[0]:"",keys[1]:1)) + summary = Summary::AddLine(summary, _("No Authentication")); + else + { + if(IscsiLioData::HasIncomingAuth(keys[0]:"",keys[1]:1)) + summary = Summary::AddLine(summary, _("Incoming Authentication")); + if(IscsiLioData::HasOutgoingAuth(keys[0]:"",keys[1]:1)) + summary = Summary::AddLine(summary, _("Outgoing Authentication")); + } + }); summary = Summary::CloseList(summary); - - - } else { + } + else + { summary = Summary::NotConfigured(); } // TODO FIXME: your code here... /* Configuration summary text for autoyast */ return [ summary, [] ]; -} + } /** * Create an overview table with all configured cards @@ -564,16 +568,16 @@ // get/set service accessors for CWMService component global boolean GetStartService() { - boolean status = Service::Enabled("iscsitarget"); - y2milestone("iscsitarget service status %1", status); + boolean status = Service::Enabled("target"); + y2milestone("target service status %1", status); return status; } global void SetStartService(boolean status) { y2milestone("Set service status %1", status); serviceStatus = status; - if (status == true) Service::Enable("iscsitarget"); - else Service::Disable("iscsitarget"); + if (status == true) Service::Enable("target"); + else Service::Disable("target"); } Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/Makefile.am (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/Makefile.am Wed Mar 28 11:54:25 2012 @@ -1,11 +1,11 @@ # Makefile.am for iscsi-server/src -yncludedir = @yncludedir@/iscsi-server +yncludedir = @yncludedir@/iscsi-lio-server client_DATA = \ - iscsi-server.ycp \ - iscsi-server_auto.ycp \ - iscsi-server_proposal.ycp + iscsi-lio-server.ycp \ + iscsi-lio-server_auto.ycp \ + iscsi-lio-server_proposal.ycp ynclude_DATA = \ helps.ycp \ @@ -15,10 +15,11 @@ widgets.ycp desktop_DATA = \ - iscsi-server.desktop + iscsi-lio-server.desktop module_DATA = \ - IscsiServer.ycp \ + IscsiLioServer.ycp \ + IscsiLioData.ycp \ IscsiServerFunctions.pm EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/complex.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/complex.ycp Wed Mar 28 11:54:25 2012 @@ -1,34 +1,34 @@ /** - * File: include/iscsi-server/complex.ycp - * Package: Configuration of iscsi-server + * File: include/iscsi-lio-server/complex.ycp + * Package: Configuration of iscsi-lio-server * Summary: Dialogs definitions - * Authors: Michal Zugec <mzugec(a)suse.cz> + * Authors: Thomas Fehr <fehr(a)suse.de> * * $Id$ */ { -textdomain "iscsi-server"; +textdomain "iscsi-lio-server"; import "Label"; import "Popup"; import "Wizard"; import "Wizard_hw"; -import "IscsiServer"; +import "IscsiLioServer"; -include "iscsi-server/helps.ycp"; +include "iscsi-lio-server/helps.ycp"; /** * Return a modification status * @return true if data was modified */ boolean Modified() { - return IscsiServer::Modified(); + return IscsiLioServer::Modified(); } boolean ReallyAbort() { - return !IscsiServer::Modified() || Popup::ReallyAbort(true); + return !IscsiLioServer::Modified() || Popup::ReallyAbort(true); } boolean PollAbort() { @@ -41,8 +41,8 @@ */ symbol ReadDialog() { Wizard::RestoreHelp(HELPS["read"]:""); - // IscsiServer::AbortFunction = PollAbort; - boolean ret = IscsiServer::Read(); + // IscsiLioServer::AbortFunction = PollAbort; + boolean ret = IscsiLioServer::Read(); return ret ? `next : `abort; } @@ -52,8 +52,8 @@ */ symbol WriteDialog() { Wizard::RestoreHelp(HELPS["write"]:""); - // IscsiServer::AbortFunction = PollAbort; - boolean ret = IscsiServer::Write(); + // IscsiLioServer::AbortFunction = PollAbort; + boolean ret = IscsiLioServer::Write(); return ret ? `next : `abort; } Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/dialogs.ycp Wed Mar 28 11:54:25 2012 @@ -1,34 +1,29 @@ /** - if (size((list)UI::QueryWidget(`server, `Items))==0){ - UI::ChangeWidget(`edit, `Enabled, false); - UI::ChangeWidget(`delete, `Enabled, false); - } else { - UI::ChangeWidget(`edit, `Enabled, true); - UI::ChangeWidget(`delete, `Enabled, true); - } - * File: include/iscsi-server/dialogs.ycp - * Package: Configuration of iscsi-server + * File: include/iscsi-lio-server/dialogs.ycp + * Package: Configuration of iscsi-lio-server * Summary: Dialogs definitions - * Authors: Michal Zugec <mzugec(a)suse.cz> + * Authors: Thomas Fehr <fehr(a)suse.de> * * $Id$ */ { -textdomain "iscsi-server"; +textdomain "iscsi-lio-server"; import "Label"; +import "String"; import "Wizard"; -import "IscsiServer"; +import "IscsiLioServer"; +import "IscsiLioData"; import "CWMTab"; import "CWM"; import "CWMServiceStart"; import "CWMFirewallInterfaces"; import "TablePopup"; -include "iscsi-server/helps.ycp"; -include "iscsi-server/widgets.ycp"; +include "iscsi-lio-server/helps.ycp"; +include "iscsi-lio-server/widgets.ycp"; // store current here string current_tab = "service"; @@ -46,8 +41,6 @@ `VBox( "auto_start_up", `VSpacing (2), - "isns", - `VSpacing (2), "firewall", `VSpacing (2), "save", @@ -58,7 +51,7 @@ ), `VStretch() ), - "widget_names" : [ "auto_start_up", "isns", "firewall", "save" ] + "widget_names" : [ "auto_start_up", "firewall", "save" ] ], // second tab - global authentication "global":$[ @@ -102,26 +95,31 @@ ], "target-details":$[ "contents" : - `VBox( + `HBox( + `HWeight( 2, `Empty() ), + `HWeight( 4, + `VBox( `HBox( - `InputField(`id(`target), `opt(`hstretch), _("Target"), "iqn.2001-04.com.example"), - `InputField(`id(`identifier), `opt(`hstretch), _("Identifier"), "test") - ), - `VBox( - `Table(`id(`lun_table), - `header(_("LUN"), _("Value")), - [] - ), - `Left( - `HBox( - `PushButton(`id(`add), _("Add")), - `PushButton(`id(`edit), _("Edit")), - `PushButton(`id(`delete), _("Delete")) - ) - ) - ), - `Left( `PushButton(`id(`expert),`opt(`disabled), _("Expert Settings")) ) - ), + `HWeight(3,`InputField(`id(`target), `opt(`hstretch), _("Target"), "iqn.2001-04.com.example")), + `HWeight(3,`InputField(`id(`identifier), `opt(`hstretch), _("Identifier"), "test")), + `HWeight(1,`InputField(`id(`tpg), _("Portal group"), "1")) + ), + `HBox( + `HWeight(3,`ComboBox(`id(`ipaddr), `opt(`hstretch), _("Ip address"), + IscsiLioData::GetIpAddr())), + `HWeight(1,`InputField(`id(`port), _("Port number"), "3260")) + ), + `Table(`id(`lun_table), + `header(_("LUN"), _("Name"), _("Path")), []), + `Left( + `HBox( + `PushButton(`id(`add), _("Add")), + `PushButton(`id(`edit), _("Edit")), + `PushButton(`id(`delete), _("Delete")) + )), + `Left( `PushButton(`id(`expert),`opt(`disabled), _("Expert Settings")) ) + )), + `HWeight( 2, `Empty() )) ], "auth": $[ @@ -157,16 +155,16 @@ map<string, map <string, any> > widgets = $[ "auto_start_up" : CWMServiceStart::CreateAutoStartWidget ($[ - "get_service_auto_start" : IscsiServer::GetStartService, - "set_service_auto_start" : IscsiServer::SetStartService, + "get_service_auto_start" : IscsiLioServer::GetStartService, + "set_service_auto_start" : IscsiLioServer::SetStartService, // radio button (starting iscsitarget service - option 1) "start_auto_button" : _("When &Booting"), - // radio button (starting iscsitarget service - option 2) + // radio button (starting LIO target service - option 2) "start_manual_button" : _("&Manually"), "help" : sformat (CWMServiceStart::AutoStartHelpTemplate (), - // part of help text, used to describe radiobuttons (matching starting iscsitarget service but without "&") + // part of help text, used to describe radiobuttons (matching starting LIO target service but without "&") _("When Booting"), - // part of help text, used to describe radiobuttons (matching starting iscsitarget service but without "&") + // part of help text, used to describe radiobuttons (matching starting LIO target service but without "&") _("Manually") ), ]), @@ -216,7 +214,7 @@ "custom_widget" : `VBox( `Table(`id(`server), - `header(_("Targets")), + `header(_("Targets"), `Right(_("Portal group"))), []), `Left( `HBox( @@ -268,17 +266,6 @@ "help" : HELPS["expert"]:"" ], - // dialog for LUN details -/* - "lun-details" : $[ - "widget" : `custom, - "custom_widget" : tabs_descr["lun-details", "contents"]:nil, -// "init" : initLUN, - "handle" : handleLUN, - "store" : storeLUN, - "help" : HELPS["lun-details"]:"" - ], -*/ // dialog for add/edit authentication for target "target-auth" : $[ "widget" : `custom, @@ -311,7 +298,7 @@ */ // Main dialog - tabbed any SummaryDialog() { - string caption = _("iSCSI Target Overview"); + string caption = _("LIO iSCSI Target Overview"); curr_target = ""; map widget_descr = $[ "tab": CWMTab::CreateWidget($[ Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/helps.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/helps.ycp Wed Mar 28 11:54:25 2012 @@ -1,15 +1,15 @@ /** - * File: include/iscsi-server/helps.ycp - * Package: Configuration of iscsi-server + * File: include/iscsi-lio-server/helps.ycp + * Package: Configuration of iscsi-lio-server * Summary: Help texts of all the dialogs - * Authors: Michal Zugec <mzugec(a)suse.cz> + * Authors: Thomas Fehr <fehr(a)suse.de> * * $Id$ */ { -textdomain "iscsi-server"; +textdomain "iscsi-lio-server"; /** * All helps are here @@ -17,7 +17,7 @@ map HELPS = $[ /* Read dialog help 1/2 */ - "read" : _("<p><b><big>Initializing iSCSI Target Configuration</big></b><br> + "read" : _("<p><b><big>Initializing iSCSI LIO Target Configuration</big></b><br> Please wait...<br></p> ") + Copied: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-lio-server.ycp (from r67726, branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-server.ycp) URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-server.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-lio-server.ycp Wed Mar 28 11:54:25 2012 @@ -1,40 +1,40 @@ /** - * File: clients/iscsi-server.ycp - * Package: Configuration of iscsi-server + * File: clients/iscsi-lio-server.ycp + * Package: Configuration of iscsi-lio-server * Summary: Main file - * Authors: Michal Zugec <mzugec(a)suse.cz> + * Authors: Thomas Fehr <fehr(a)suse.de> * * $Id$ * - * Main file for iscsi-server configuration. Uses all other files. + * Main file for iscsi-lio-server configuration. Uses all other files. */ { /*** - * <h3>Configuration of iscsi-server</h3> + * <h3>Configuration of iscsi-lio-server</h3> */ -textdomain "iscsi-server"; +textdomain "iscsi-lio-server"; /* The main () */ y2milestone ("----------------------------------------"); -y2milestone ("IscsiServer module started"); +y2milestone ("IscsiLioServer module started"); import "Progress"; import "Report"; import "Summary"; import "CommandLine"; -include "iscsi-server/wizards.ycp"; +include "iscsi-lio-server/wizards.ycp"; map cmdline_description = $[ - "id" : "iscsi-server", - /* Command line help text for the Xiscsi-server module */ - "help" : _("Configuration of an iSCSI target"), - "guihandler" : IscsiServerSequence, - "initialize" : IscsiServer::Read, - "finish" : IscsiServer::Write, + "id" : "iscsi-lio-server", + /* Command line help text for the iscsi-lio-server module */ + "help" : _("Configuration of an iSCSI target via LIO"), + "guihandler" : IscsiLioServerSequence, + "initialize" : IscsiLioServer::Read, + "finish" : IscsiLioServer::Write, "actions" : $[ // FIXME TODO: fill the functionality description here ], @@ -59,12 +59,12 @@ /* main ui function */ any ret = nil; -if(propose) ret = IscsiServerAutoSequence(); +if(propose) ret = IscsiLioServerAutoSequence(); else ret = CommandLine::Run(cmdline_description); y2debug("ret=%1", ret); /* Finish */ -y2milestone("IscsiServer module finished"); +y2milestone("IscsiLioServer module finished"); y2milestone("----------------------------------------"); return ret; Copied: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-lio-server_auto.ycp (from r67726, branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-server_auto.ycp) URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-server_auto.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-lio-server_auto.ycp Wed Mar 28 11:54:25 2012 @@ -1,8 +1,8 @@ /** - * File: clients/iscsi-server_auto.ycp - * Package: Configuration of iscsi-server + * File: clients/iscsi-lio-server_auto.ycp + * Package: Configuration of iscsi-lio-server * Summary: Client for autoinstallation - * Authors: Michal Zugec <mzugec(a)suse.cz> + * Authors: Thomas Fehr <fehr(a)suse.de> * * $Id$ * @@ -13,21 +13,21 @@ /** * @param function to execute - * @param map/list of iscsi-server settings + * @param map/list of iscsi-lio-server settings * @return map edited settings, Summary or boolean on success depending on called function * @example map mm = $[ "FAIL_DELAY" : "77" ]; - * @example map ret = WFM::CallFunction ("iscsi-server_auto", [ "Summary", mm ]); + * @example map ret = WFM::CallFunction ("iscsi-lio-server_auto", [ "Summary", mm ]); */ { -textdomain "iscsi-server"; +textdomain "iscsi-lio-server"; y2milestone("----------------------------------------"); -y2milestone("IscsiServer auto started"); +y2milestone("IscsiLioServer auto started"); -import "IscsiServer"; -include "iscsi-server/wizards.ycp"; +import "IscsiLioServer"; +include "iscsi-lio-server/wizards.ycp"; any ret = nil; string func = ""; @@ -44,50 +44,50 @@ /* Create a summary*/ if(func == "Summary") { - ret = select(IscsiServer::Summary(), 0, ""); + ret = IscsiLioServer::Summary()[0]:""; } /* Reset configuration */ else if (func == "Reset") { - IscsiServer::Import($[]); + IscsiLioServer::Import($[]); ret = $[]; } /* Change configuration (run AutoSequence) */ else if (func == "Change") { - ret = IscsiServerAutoSequence(); + ret = IscsiLioServerAutoSequence(); } /* Import configuration */ else if (func == "Import") { - ret = IscsiServer::Import(param); + ret = IscsiLioServer::Import(param); } /* Return actual state */ else if (func == "Export") { - ret = IscsiServer::Export(); + ret = IscsiLioServer::Export(); } /* Return needed packages */ else if (func == "Packages") { - ret = IscsiServer::AutoPackages(); + ret = IscsiLioServer::AutoPackages(); } /* Read current state */ else if (func == "Read") { import "Progress"; boolean progress_orig = Progress::set (false); - ret = IscsiServer::Read(); + ret = IscsiLioServer::Read(); Progress::set (progress_orig); } /* Write given settings */ else if (func == "Write") { import "Progress"; boolean progress_orig = Progress::set (false); - IscsiServer::write_only = true; - ret = IscsiServer::Write(); + IscsiLioServer::write_only = true; + ret = IscsiLioServer::Write(); Progress::set (progress_orig); } else if (func == "GetModified"){ - ret = IscsiServer::modified; + ret = IscsiLioServer::modified; } else if (func == "SetModified"){ - IscsiServer::modified = true; + IscsiLioServer::modified = true; ret = true; } /* Unknown function */ @@ -97,7 +97,7 @@ } y2debug("ret=%1", ret); -y2milestone("IscsiServer auto finished"); +y2milestone("IscsiLioServer auto finished"); y2milestone("----------------------------------------"); return ret; Copied: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-lio-server_proposal.ycp (from r67726, branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-server_proposal.ycp) URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-server_proposal.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-lio-server_proposal.ycp Wed Mar 28 11:54:25 2012 @@ -1,25 +1,25 @@ /** - * File: clients/iscsi-server_proposal.ycp - * Package: Configuration of iscsi-server + * File: clients/iscsi-lio-server_proposal.ycp + * Package: Configuration of iscsi-lio-server * Summary: Proposal function dispatcher. - * Authors: Michal Zugec <mzugec(a)suse.cz> + * Authors: Thomas Fehr <fehr(a)suse.de> * * $Id$ * - * Proposal function dispatcher for iscsi-server configuration. + * Proposal function dispatcher for iscsi-lio-server configuration. * See source/installation/proposal/proposal-API.txt */ { -textdomain "iscsi-server"; +textdomain "iscsi-lio-server"; -import "IscsiServer"; +import "IscsiLioServer"; import "Progress"; /* The main () */ y2milestone("----------------------------------------"); -y2milestone("IscsiServer proposal started"); +y2milestone("IscsiLioServer proposal started"); string func = (string) WFM::Args(0); map param = (map) WFM::Args(1); @@ -32,13 +32,13 @@ symbol warning_level = nil; boolean force_reset = param["force_reset"]:false; - if(force_reset || !IscsiServer::proposal_valid) { - IscsiServer::proposal_valid = true; + if(force_reset || !IscsiLioServer::proposal_valid) { + IscsiLioServer::proposal_valid = true; boolean progress_orig = Progress::set (false); - IscsiServer::Read(); + IscsiLioServer::Read(); Progress::set (progress_orig); } - list sum = IscsiServer::Summary(); + list sum = IscsiLioServer::Summary(); proposal = sum[0]:""; ret = $[ @@ -49,9 +49,9 @@ } /* run the module */ else if(func == "AskUser") { - map stored = IscsiServer::Export(); - symbol seq = (symbol) WFM::CallFunction("iscsi-server", [.propose]); - if(seq != `next) IscsiServer::Import(stored); + map stored = IscsiLioServer::Export(); + symbol seq = (symbol) WFM::CallFunction("iscsi-lio-server", [.propose]); + if(seq != `next) IscsiLioServer::Import(stored); y2debug("stored=%1",stored); y2debug("seq=%1",seq); ret = $[ @@ -61,16 +61,16 @@ /* create titles */ else if(func == "Description") { ret = $[ - /* Rich text title for IscsiServer in proposals */ - "rich_text_title" : _("iSCSI Target"), - /* Menu title for IscsiServer in proposals */ - "menu_title" : _("&iSCSI Target"), - "id" : "iscsi-server", + /* Rich text title for IscsiLioServer in proposals */ + "rich_text_title" : _("iSCSI LIO Target"), + /* Menu title for IscsiLioServer in proposals */ + "menu_title" : _("&iSCSI LIO Target"), + "id" : "iscsi-lio-server", ]; } /* write the proposal */ else if(func == "Write") { - IscsiServer::Write(); + IscsiLioServer::Write(); } /* unknown function */ else { @@ -79,7 +79,7 @@ /* Finish */ y2debug("ret=%1",ret); -y2milestone("IscsiServer proposal finished"); +y2milestone("IscsiLioServer proposal finished"); y2milestone("----------------------------------------"); return ret; Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp Wed Mar 28 11:54:25 2012 @@ -1,108 +1,120 @@ { -textdomain "iscsi-server"; +textdomain "iscsi-lio-server"; import "IscsiServerFunctions"; +import "IscsiLioData"; import "Label"; import "IP"; // **************** global funcions and variables ***** string curr_target = ""; +integer curr_tpg = 1; string modify_record = ""; map inc_auth = $[]; -map<string, any> parseRow(string value){ - map<string, any> ret=$[]; - // if nothing only LUN - if (find(value, " ")==-1){ - return $["lun":value]; - } - // extract Lun - integer pos=find(value, " "); - ret["lun"]=substring(value, 0, pos); - value=substring(value, pos, size(value)); - // extract Type - pos=find(value, "Type="); - integer pos2=findfirstof( substring(value, pos, size(value)), " ,"); - string type = substring(value, pos+size("Type="), (pos2!=nil)? pos2-size("Type=") : size(value)); - if (pos!=-1) - if (type=="fileio"){ ret["fileio"]=true; ret["nullio"]=false;} - else { ret["fileio"]=false; ret["nullio"]=true;} - // extract Path - pos=find(value, "Path="); - pos2=findfirstof( substring(value, pos, size(value)), " ,"); - if (pos!=-1) ret["path"] = substring(value, pos+size("Path="), (pos2!=nil)? pos2-size("Path=") : size(value)); - // extract ScsiId - pos=find(value, "ScsiId="); - pos2=findfirstof( substring(value, pos, size(value)), " ,"); - if (pos!=-1) ret["scsi_id"] = substring(value, pos+size("ScsiId="), (pos2!=nil)? pos2-size("ScsiId=") : size(value)); - // extract ScsiId - pos=find(value, "Sectors="); - pos2=findfirstof( substring(value, pos, size(value)), " ,"); - if (pos!=-1) ret["sectors"] = substring(value, pos+size("Sectors="), (pos2!=nil)? pos2-size("Sectors=") : size(value)); - return ret; -} +boolean CheckLun( integer l, list<term> other, boolean silent ) + { + string s = tostring(l); + boolean ret = size(filter( term i, other, ``(i[1]:""==s)))==0; + y2milestone( "CheckLun other:%1", other ); + y2milestone( "CheckLun l:%1 ret:%2", l, ret ); + if( !ret && !silent ) + Popup::Error( _("Selected Lun is already in use!") ); + return( ret ); + } +boolean CheckName( string n, list<term> other ) + { + boolean ret = size(filter( term i, other, ``(i[2]:""==n)))==0; + if( !ret ) + Popup::Error( _("Selected Name is already in use!") ); + return( ret ); + } -map <string, any> LUNDetailDialog(map<string, any> values_before){ - map<string, any> previous=parseRow(values_before["VALUE"]:""); - map <string, any> ret_map = $[]; - term lun_dialog = - `VBox( - `Left( `HWeight(3, `InputField( `id( `lun ), `opt(`hstretch), "LUN", previous["lun"]:"0" )) ), - `VSpacing(2), - `RadioButtonGroup(`id(`rb), `VBox( - `Left( `RadioButton(`id(`fileio), `opt(`notify), "Type=fileio", previous["fileio"]:true) ), - `HBox( - `InputField( `id( `file_path ), `opt(`hstretch), _("Path:"), previous["path"]:""), - `VBox( - `Label(""), - `PushButton(`id(`browse), _("Browse")) - ) - ), - `InputField( `id( `scsi_id ), `opt(`hstretch), "ScsiId:", previous["scsi_id"]:"" ), - `VSpacing(2), - - `Left( `RadioButton(`id(`nullio), `opt(`notify), "Type=nullio", previous["nullio"]:false) ), - `InputField( `id( `sectors ), `opt(`hstretch), _("Sectors:"), previous["sectors"]:"" ) - ) - ), - `Left( `HBox( `PushButton(`id(`ok), Label::OKButton() ), `PushButton(`id(`cancel), Label::CancelButton() ))) - ); - UI::OpenDialog(lun_dialog); - UI::ChangeWidget(`id(`lun), `ValidChars, "0123456789" ); - symbol ret = `nil; - while(ret != `ok && ret !=`cancel){ - boolean enable=false; - if ((boolean)UI::QueryWidget(`fileio, `Value)==true) enable=true; - - UI::ChangeWidget(`file_path, `Enabled, enable); - UI::ChangeWidget(`browse, `Enabled, enable); - UI::ChangeWidget(`scsi_id, `Enabled, enable); - UI::ChangeWidget(`sectors, `Enabled, !enable); - - if (ret == `browse){ - string file = UI::AskForExistingFile("/", "", _("Select file or device")); - if (file!=nil) UI::ChangeWidget(`file_path, `Value, file); - } - ret = (symbol)UI::UserInput(); - } - if (ret == `cancel) ret_map = $[]; - else { - string lun=(string)UI::QueryWidget(`lun, `Value); - string value=lun; - if ((boolean)UI::QueryWidget(`fileio, `Value)==true){ - value=sformat("%1 Path=%2,Type=fileio", value, (string)UI::QueryWidget(`file_path, `Value)); - string scsi_id=(string)UI::QueryWidget(`scsi_id, `Value); - if (size(scsi_id)>0) value=sformat("%1,ScsiId=%2", value, scsi_id); - } else { - value=sformat("%1 Type=nullio", value); - string sectors=(string)UI::QueryWidget(`sectors, `Value); - if (size(sectors)>0) value=sformat("%1,Sectors=%2", value, sectors); - } - ret_map = $["KEY":"Lun", "VALUE":value]; - } - UI::CloseDialog(); - return ret_map; -} +boolean CheckPath( string p, list<term> other ) + { + boolean ret = IscsiLioData::CheckPath( p )[0]:false; + if( !ret ) + Popup::Error( _("Selected Path must be either block device or normal file!") ); + if( ret && size(filter( term i, other, ``(i[3]:""==p)))>0 ) + { + Popup::Error( _("Selected Path is already in use!") ); + ret = false; + } + return( ret ); + } + +term LUNDetailDialog( integer pos, list<term> items ) + { + y2milestone( "LUNDetailDialog pos:%1 items:%2", pos, items ); + list<term> other = (pos>=0)?remove(items,pos):items; + y2milestone( "LUNDetailDialog other:%1", other ); + term previous= items[pos]:`Empty(); + term ret = `Empty(); + string lun_def = "99"; + if( pos<0 ) + { + integer count=0; + while( !CheckLun(count,other,true) ) + { + count = count+1; + } + lun_def = tostring(count); + } + term lun_dialog = + `VBox( + `Left( `InputField( `id( `lun ), `opt(`hstretch), "LUN", previous[1]:lun_def ) ), + `VSpacing(1), + `HBox( + `InputField( `id( `path ), `opt(`hstretch), _("Path:"), previous[3]:""), + `VBox( `Label(""), `PushButton(`id(`browse), _("Browse")))), + `InputField( `id( `name ), `opt(`hstretch), "Name (autogenerated when empty):", previous[2]:"" ), + `VSpacing(1), + `Left( `HBox( + `PushButton(`id(`ok), `opt(`default), Label::OKButton() ), + `PushButton(`id(`cancel), Label::CancelButton() ))) + ); + UI::OpenDialog(lun_dialog); + UI::ChangeWidget(`id(`lun), `ValidChars, "0123456789" ); + symbol sym = `nil; + while(sym != `ok && sym !=`cancel) + { + sym = (symbol)UI::UserInput(); + if(sym==`browse) + { + string file = UI::AskForExistingFile("/", "", _("Select file or device")); + if (file!=nil && CheckPath( file, other ) ) + UI::ChangeWidget(`path, `Value, file); + } + else if( sym==`path ) + { + CheckPath( (string)UI::QueryWidget(`path,`Value), other ); + } + if(sym == `ok) + { + integer lun=tointeger(UI::QueryWidget(`lun, `Value)); + string name = (string)UI::QueryWidget(`name,`Value); + string pth = (string)UI::QueryWidget(`path,`Value); + y2milestone( "LUNDetailDialog lun:%1 name:%2 path:%3", lun, name, pth ); + if( !CheckPath( pth, other ) || !CheckLun( lun, other, false ) || + !CheckName( name, other )) + sym = `again; + if( sym==`ok ) + { + if( size(name)==0 ) + { + list<string> used = maplist( term i, other, ``(i[2]:"")); + y2milestone( "LUNDetailDialog used:%1", used ); + name = IscsiLioData::CreateLunName( used, pth ); + } + ret = `item( `id(pos>=0?pos:size(other)), lun, name, pth ); + y2milestone( "LUNDetailDialog ret:%1", ret ); + } + } + } + UI::CloseDialog(); + y2milestone( "LUNDetailDialog ret:%1", ret ); + return ret; + } // set incoming authentication enabled/disabled status void setAuthIn(boolean status){ @@ -208,55 +220,61 @@ void initTable (string key) ``{ integer count = 0; list <term> inc_items = []; - // create items from targets - if (size(IscsiServerFunctions::getTargets())>0){ - foreach(string key, any value, IscsiServerFunctions::getTargets(), { - inc_items = add(inc_items, `item(`id(count), key)); - count = count + 1; - }); - } - // put it into table - UI::ChangeWidget(`id(`server), `Items, inc_items); -} + // create items from targets + list<list> tgt = IscsiLioData::GetTargets(); + foreach(list l, tgt, + { + inc_items = add(inc_items, `item(`id(count), l[0]:"", tostring(l[1]:0))); + count = count + 1; + }); + // put it into table + UI::ChangeWidget(`id(`server), `Items, inc_items); + } -symbol handleTable (string table, map event){ - symbol ret = nil; - if(event["EventReason"]:"" == "Activated"){ - switch((symbol)event["ID"]:nil){ - case(`add) : - // goto AddDialog() (initAddTarget) +symbol handleTable (string table, map event) + { + symbol ret = nil; + if(event["EventReason"]:"" == "Activated") + { + switch((symbol)event["ID"]:nil) + { + case(`add): + // goto AddDialog() (initAddTarget) ret = `add; break; - case(`delete) : - // add a new item - if (Popup::ContinueCancel(_("Really delete this item?"))){ - integer del=tointeger( UI::QueryWidget(`id(`server), `CurrentItem) ); - string target = ((term)UI::QueryWidget(`id(`server), `Item(del)))[1]:""; - IscsiServerFunctions::setDelChanges( target ); - IscsiServerFunctions::removeTarget( ((term)UI::QueryWidget(`id(`server), `Item(del)))[1]:"" ); - initTable(""); - } + case(`delete): + // add a new item + if (Popup::ContinueCancel(_("Really delete this item?"))) + { + integer del=tointeger( UI::QueryWidget(`id(`server), `CurrentItem) ); + string target = ((term)UI::QueryWidget(`id(`server), `Item(del)))[1]:""; + IscsiServerFunctions::setDelChanges( target ); + IscsiServerFunctions::removeTarget( ((term)UI::QueryWidget(`id(`server), `Item(del)))[1]:"" ); + initTable(""); + } break; - case(`edit) : - // edit new item - integer edit=tointeger( UI::QueryWidget(`id(`server), `CurrentItem) ); - curr_target = ((term)UI::QueryWidget(`id(`server), `Item(edit)))[1]:""; - if (IscsiServerFunctions::setModifChanges( curr_target ) == 0) y2milestone("modified %1", curr_target); - else y2error("%1 already modified", curr_target); - // goto EditDialog() (initModify) - ret = `edit; - break; - } - } - if (size((list)UI::QueryWidget(`server, `Items))==0){ - UI::ChangeWidget(`edit, `Enabled, false); - UI::ChangeWidget(`delete, `Enabled, false); - } else { - UI::ChangeWidget(`edit, `Enabled, true); - UI::ChangeWidget(`delete, `Enabled, true); - } - return ret; -} + case(`edit): + // edit new item + integer edit=tointeger( UI::QueryWidget(`id(`server), `CurrentItem) ); + term t = (term)UI::QueryWidget(`id(`server), `Item(edit)); + y2milestone("handleTable num:%1 t:%2", edit, t); + curr_target = t[1]:""; + curr_tpg = tointeger(t[2]:""); + y2milestone("handleTable tgt:%1 tpg:%2", curr_target, curr_tpg ); + if (IscsiServerFunctions::setModifChanges( curr_target ) == 0) + y2milestone("modified %1", curr_target); + else + y2error("%1 already modified", curr_target); + // goto EditDialog() (initModify) + ret = `edit; + break; + } + } + boolean empt = size((list)UI::QueryWidget(`server, `Items))==0; + UI::ChangeWidget(`edit, `Enabled, !empt); + UI::ChangeWidget(`delete, `Enabled, !empt); + return ret; + } // create items for incoming table list <term> getAuthItems(){ @@ -328,10 +346,13 @@ } // initialize discovery authentication or authentication for given target -void initGlobal (string key){ - if (size(curr_target)>0) initGlobalValues(IscsiServerFunctions::getConfig()[curr_target]:[]); - else /*if (size(IscsiServerFunctions::getConfig()["auth"]:[])>0)*/ initGlobalValues(IscsiServerFunctions::getConfig()["auth"]:[]); -} +void initGlobal (string key) + { + if (size(curr_target)>0) + initGlobalValues(IscsiServerFunctions::getConfig()[curr_target]:[]); + else + initGlobalValues(IscsiServerFunctions::getConfig()["auth"]:[]); + } // save discovery authentication or authentication for given target void storeGlobal(string option_id, map option_map){ @@ -370,7 +391,14 @@ y2milestone("init values for add_target %1", target); UI::ChangeWidget(`id(`target), `Value, target); UI::ChangeWidget(`id(`identifier), `Value, uuid); -// UI::ChangeWidget(`id(`lun), `Value, tostring(IscsiServerFunctions::getNextLun()) ); + UI::ChangeWidget(`id(`tpg), `ValidChars, String::CDigit()); + UI::ChangeWidget(`id(`tpg), `Value, "1"); + list<term> ip = (list<term>)UI::QueryWidget(`id(`ipaddr), `Items); + string s =ip[0,1]:""; + y2milestone("initAddTarget ip:%1", s ); + UI::ChangeWidget(`id(`ipaddr), `Value, s); + UI::ChangeWidget(`id(`port), `ValidChars, String::CDigit()); + UI::ChangeWidget(`id(`port), `Value, "3260"); } /* @@ -492,12 +520,14 @@ { integer count = 0; map<integer, any> temp_map = $[]; - while(count<size(inc_auth)){ - if (count<del) temp_map[count]=inc_auth[count]:nil; - else if (count==del) {} - else temp_map[count-1]=inc_auth[count]:nil; - count = count+1; - } + while(count<size(inc_auth)) + { + if (count<del) + temp_map[count]=inc_auth[count]:nil; + else if (count>del) + temp_map[count-1]=inc_auth[count]:nil; + count = count+1; + } inc_auth = temp_map; UI::ChangeWidget(`id(`incoming_table), `Items, getAuthItems()); } else y2milestone("Delete canceled"); @@ -519,102 +549,115 @@ // **************** Edit Dialog ***************************** // init values for modifying target (read it from stored map) -void initModify (string key) ``{ +void initModify (string key) + { list <term> inc_items = []; - foreach( map<string, any> row, (list<map<string, any> >) IscsiServerFunctions::editTarget( curr_target ), { - switch(row["KEY"]:""){ - case("Target") : - UI::ChangeWidget( `id(`target),`Value, (splitstring(row["VALUE"]:"", ":"))[0]:""); - UI::ChangeWidget( `id(`target),`Enabled, false); - UI::ChangeWidget( `id(`identifier), `Value, (splitstring(row["VALUE"]:"", ":"))[1]:""); - UI::ChangeWidget( `id(`identifier), `Enabled, false); + y2milestone( "initModify %1 %2", curr_target, curr_tpg ); + UI::ChangeWidget( `id(`target), `Value, (splitstring(curr_target, ":"))[0]:""); + UI::ChangeWidget( `id(`target),`Enabled, false); + UI::ChangeWidget( `id(`identifier), `Value, (splitstring(curr_target, ":"))[1]:""); + UI::ChangeWidget( `id(`identifier), `Enabled, false); + UI::ChangeWidget( `id(`tpg), `Value, tostring(curr_tpg) ); + UI::ChangeWidget( `id(`tpg), `Enabled, false); + string ipp = IscsiLioData::GetNetworkPortal( curr_target, curr_tpg )[0]:""; + y2milestone( "initModify ipp:%1", ipp ); + UI::ChangeWidget( `id(`ipaddr), `Value, (splitstring(ipp, ":"))[0]:""); + UI::ChangeWidget( `id(`ipaddr), `Enabled, true); + UI::ChangeWidget( `id(`port), `Value, (splitstring(ipp, ":"))[1]:"3260"); + UI::ChangeWidget( `id(`port), `Enabled, true); + list lun = IscsiLioData::GetLunList( curr_target, curr_tpg ); + y2milestone( "initModify lun:%1", lun ); + foreach( list l, IscsiLioData::GetLunList( curr_target, curr_tpg ), + { + inc_items = add( inc_items, `item(`id(size(inc_items)), l[0]:99, l[1]:"", l[2]:"")); + }); + UI::ChangeWidget(`id(`lun_table), `Items, inc_items); + } +symbol handleModify(string key, map event) + { + if( event["EventReason"]:"" == "Activated" ) + { + switch((symbol)event["WidgetID"]:nil) + { + case `delete: + any del = UI::QueryWidget(`id (`lun_table),`CurrentItem); + if (del != nil) + { + if(Popup::ContinueCancel(_("Really delete the selected item?"))) + { + y2milestone("Delete LUN %1 from table", del); + list items=[]; + integer count=0; + foreach(term row, (list<term>)UI::QueryWidget(`lun_table, `Items), + { + if (count!=del) + { + items=add(items, `item(`id(size(items)),row[1]:"", row[2]:"")); + } + count = count + 1; + }); + UI::ChangeWidget(`id(`lun_table), `Items, items); + } + else + y2milestone("Delete canceled"); + } break; - case("Lun") : - inc_items = add(inc_items, `item(`id(size(inc_items)), row["KEY"]:"", row["VALUE"]:"")); - // put it into table - UI::ChangeWidget(`id(`lun_table), `Items, inc_items); - + case `edit: + list<term> items = (list<term>)UI::QueryWidget(`lun_table, `Items); + integer edit_pos=tointeger(UI::QueryWidget(`lun_table, `CurrentItem)); + y2milestone( "handleModify pos:%1 items:%2", edit_pos, items ); + term ret = LUNDetailDialog( edit_pos, items ); + y2milestone( "handleModify ret:%1 em:%2 eq:%3", ret, `Empty(), ret!=`Empty() ); + if( ret!=`Empty() ) + { + items[edit_pos]=ret; + UI::ChangeWidget(`lun_table, `Items, items); + UI::ChangeWidget(`lun_table, `CurrentItem, edit_pos); + } break; - } - }); -} + case `add: + items = (list<term>)UI::QueryWidget(`lun_table, `Items); + ret = LUNDetailDialog( -1, items ); + if( ret!=`Empty() ) + { + items = (list<term>)add( items, ret ); + UI::ChangeWidget(`lun_table, `Items, items); + UI::ChangeWidget(`lun_table, `CurrentItem, size(items)-1); + } + break; + } + } + boolean enab = size((list)UI::QueryWidget(`lun_table, `Items))>0; + UI::ChangeWidget(`edit, `Enabled, enab); + UI::ChangeWidget(`delete, `Enabled, enab); + } -symbol handleModify(string key, map event){ - if ( event["EventReason"]:"" == "Activated" ){ - switch((symbol)event["WidgetID"]:nil){ - case `delete: - any del = UI::QueryWidget(`id (`lun_table),`CurrentItem); - if (del != nil){ - if (Popup::ContinueCancel(_("Really delete the selected item?"))) - { - y2milestone("Delete LUN %1 from table", del); - list items=[]; - integer count=0; - foreach(term row, (list<term>)UI::QueryWidget(`lun_table, `Items), { - if (count!=del){ - items=add(items, `item(`id(size(items)),row[1]:"", row[2]:"")); - } - count = count + 1; - }); - UI::ChangeWidget(`id(`lun_table), `Items, items); - } else y2milestone("Delete canceled"); +void storeModify(string option_id, map option_map) + { + boolean chg = false; + foreach(term row, (list<term>)UI::QueryWidget(`lun_table, `Items), + { + map lun = $[ "lun" : tointeger(row[1]:"-1"), + "nm" : row[2]:"", + "path" : row[3]:"" ]; + if(IscsiLioData::NeedUpdateLun( curr_target, curr_tpg, lun )) + { + y2milestone( "storeModify lun:%1", lun ); + chg = true; + if( !IscsiLioData::DoUpdateLun( curr_target, curr_tpg, lun )) + { + string txt = sformat( _("Problem seting lun %1 (name:%2) to path %3"), + lun["lun"]:-1, lun["nm"]:"", lun["path"]:"" ); + Popup::Error( txt ); } - break; - case `edit: - list<term> items = (list<term>)UI::QueryWidget(`lun_table, `Items); - integer edit_pos=tointeger(UI::QueryWidget(`lun_table, `CurrentItem)); - map<string, any> ret_map = LUNDetailDialog($["KEY":"Lun", "VALUE":items[edit_pos, 2]:""]); - if (ret_map!=$[]){ - items[edit_pos]=`item(`id(edit_pos), ret_map["KEY"]:"", ret_map["VALUE"]:""); - UI::ChangeWidget(`lun_table, `Items, items); - } - break; - case `add: - map<string, any> add_map = LUNDetailDialog($["KEY":"Lun", "VALUE":tostring(size((list<term>)UI::QueryWidget(`lun_table, `Items)))]); - if (add_map!=$[]){ - list items = (list)UI::QueryWidget(`lun_table, `Items); - items=add(items, `item(`id(size(items)), add_map["KEY"]:"", add_map["VALUE"]:"")); - UI::ChangeWidget(`lun_table, `Items, items); - } - break; - } - } - if (size((list)UI::QueryWidget(`lun_table, `Items))==0){ - UI::ChangeWidget(`edit, `Enabled, false); - UI::ChangeWidget(`delete, `Enabled, false); - } else { - UI::ChangeWidget(`edit, `Enabled, true); - UI::ChangeWidget(`delete, `Enabled, true); - } -} - -void storeModify(string option_id, map option_map){ - list<map<string, any> > items = []; - foreach(term row, (list<term>)UI::QueryWidget(`lun_table, `Items), { - items = add(items, $["KEY":row[1]:"", "VALUE":row[2]:""]); - }); - IscsiServerFunctions::setLUN(curr_target, items); -} - -// ************** LUN Detail Dialog **************************** -symbol handleLUN(string key, map event){ - boolean enable=false; - if ((boolean)UI::QueryWidget(`fileio, `Value)==true) enable=true; - - UI::ChangeWidget(`file_path, `Enabled, enable); - UI::ChangeWidget(`browse, `Enabled, enable); - UI::ChangeWidget(`scsi_id, `Enabled, enable); - UI::ChangeWidget(`sectors, `Enabled, !enable); - - if (event["EventReason"]:"" == "Activated" && event["WidgetID"]:nil == `browse){ - string file = UI::AskForExistingFile("/", "", _("Select file or device")); - if (file!=nil) UI::ChangeWidget(`file_path, `Value, file); - } -} - -void storeLUN(string option_id, map option_map){ - string lun=(string)UI::QueryWidget(`lun, `Value); -} + } + }); + if( chg ) + { + IscsiLioData::UpdateConfig(); + initModify(""); + } + } } Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/wizards.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/wizards.ycp Wed Mar 28 11:54:25 2012 @@ -1,25 +1,25 @@ /** - * File: include/iscsi-server/wizards.ycp - * Package: Configuration of iscsi-server + * File: include/iscsi-lio-server/wizards.ycp + * Package: Configuration of iscsi-lio-server * Summary: Wizards definitions - * Authors: Michal Zugec <mzugec(a)suse.cz> + * Authors: Thomas Fehr <fehr(a)suse.de> * * $Id$ */ { -textdomain "iscsi-server"; +textdomain "iscsi-lio-server"; import "Sequencer"; import "Wizard"; -include "iscsi-server/complex.ycp"; -include "iscsi-server/dialogs.ycp"; +include "iscsi-lio-server/complex.ycp"; +include "iscsi-lio-server/dialogs.ycp"; /** - * Main workflow of the iscsi-server configuration + * Main workflow of the iscsi-lio-server configuration * @return sequence result */ any MainSequence() { @@ -71,10 +71,10 @@ } /** - * Whole configuration of iscsi-server + * Whole configuration of iscsi-lio-server * @return sequence result */ -any IscsiServerSequence() { +any IscsiLioServerSequence() { map aliases = $[ "read" : [ ``( ReadDialog() ), true ], @@ -107,14 +107,14 @@ } /** - * Whole configuration of iscsi-server but without reading and writing. + * Whole configuration of iscsi-lio-server but without reading and writing. * For use with autoinstallation. * @return sequence result */ -any IscsiServerAutoSequence() { +any IscsiLioServerAutoSequence() { /* Initialization dialog caption */ - string caption = _("iSCSI Target Configuration"); + string caption = _("iSCSI LIO Target Configuration"); /* Initialization dialog contents */ term contents = `Label(_("Initializing...")); Added: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/yast2-iscsi-lio-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/yast2-iscsi-lio-server.spec.in (added) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/yast2-iscsi-lio-server.spec.in Wed Mar 28 11:54:25 2012 @@ -0,0 +1,32 @@ +@HEADER-COMMENT@ + + +@HEADER@ +BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite +Requires: yast2 + +BuildArchitectures: noarch + +Summary: Configuration of iSCSI LIO target + +%description +- + +@PREP@ + +@BUILD@ + +@INSTALL@ + +@CLEAN@ + +%files +%defattr(-,root,root) +%dir @yncludedir@/iscsi-lio-server +@yncludedir@/iscsi-lio-server/* +@clientdir@/iscsi-lio-server.ycp +@clientdir@/iscsi-lio-server_*.ycp +@moduledir@/IscsiLioServer* +@desktopdir@/iscsi-lio-server.desktop +@scrconfdir@/ietd.scr +%doc @docdir@ -- 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] r67727 - /trunk/yast2/library/modules/FileUtils.ycp
by aschnell＠svn2.opensuse.org 28 Mar '12

28 Mar '12

Author: aschnell Date: Wed Mar 28 11:39:18 2012 New Revision: 67727 URL: http://svn.opensuse.org/viewcvs/yast?rev=67727&view=rev Log: - better example for Fileutils::Exists Modified: trunk/yast2/library/modules/FileUtils.ycp Modified: trunk/yast2/library/modules/FileUtils.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/modules/FileUtils.… ============================================================================== --- trunk/yast2/library/modules/FileUtils.ycp (original) +++ trunk/yast2/library/modules/FileUtils.ycp Wed Mar 28 11:39:18 2012 @@ -28,7 +28,8 @@ * * @example * FileUtils::Exists ("/tmp") -> true - * FileUtils::Exists ("/tmp/somefile") -> false + * FileUtils::Exists ("/var/log/messages") -> true + * FileUtils::Exists ("/does-not-exist") -> false */ global define boolean Exists (string target) { map info = (map) SCR::Read(.target.stat, target); -- 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] r67726 - /branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/
by fehr＠svn2.opensuse.org 27 Mar '12

27 Mar '12

Author: fehr Date: Tue Mar 27 19:52:55 2012 New Revision: 67726 URL: http://svn.opensuse.org/viewcvs/yast?rev=67726&view=rev Log: create branch for LIO config Added: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/ (props changed) - copied from r67725, branches/SuSE-Code-11-SP2-Branch/iscsi-server/ -- 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] r67725 - /tags/stable-2_22_1/packager/
by lslezak＠svn2.opensuse.org 27 Mar '12

27 Mar '12

Author: lslezak Date: Tue Mar 27 19:43:57 2012 New Revision: 67725 URL: http://svn.opensuse.org/viewcvs/yast?rev=67725&view=rev Log: Created tag stable-2_22_1 for packager Added: tags/stable-2_22_1/packager/ (props changed) - copied from r67724, trunk/packager/ -- 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] r67724 - in /trunk/packager: VERSION package/yast2-packager.changes
by lslezak＠svn2.opensuse.org 27 Mar '12

27 Mar '12

Author: lslezak Date: Tue Mar 27 19:43:24 2012 New Revision: 67724 URL: http://svn.opensuse.org/viewcvs/yast?rev=67724&view=rev Log: - updated *.changes - 2.22.1 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=67724&r1=67… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Tue Mar 27 19:43:24 2012 @@ -1 +1 @@ -2.22.0 +2.22.1 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Tue Mar 27 19:43:24 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Mar 27 17:37:45 UTC 2012 - lslezak(a)suse.cz + +- removed libxcrypt-devel from buildrequires +- 2.22.1 + +------------------------------------------------------------------- Wed Nov 16 11:35:38 CET 2011 - jsuchome(a)suse.cz - merged texts from proofreading -- 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] r67723 - /trunk/pkg-bindings/yast2-pkg-bindings.spec.in
by lslezak＠svn2.opensuse.org 27 Mar '12

27 Mar '12

Author: lslezak Date: Tue Mar 27 19:10:35 2012 New Revision: 67723 URL: http://svn.opensuse.org/viewcvs/yast?rev=67723&view=rev Log: updated *.spec file Modified: trunk/pkg-bindings/yast2-pkg-bindings.spec.in Modified: trunk/pkg-bindings/yast2-pkg-bindings.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/yast2-pkg-bindings.… ============================================================================== --- trunk/pkg-bindings/yast2-pkg-bindings.spec.in (original) +++ trunk/pkg-bindings/yast2-pkg-bindings.spec.in Tue Mar 27 19:10:35 2012 @@ -12,14 +12,6 @@ Summary: YaST2 - Package Manager Access -%if 0%{?suse_version} == 1130 -Patch0: openSUSE-11.3.diff -%endif - -%if 0%{?suse_version} == 1140 -Patch0: openSUSE-11.4.diff -%endif - %description This package contains a name space for accessing the package manager library in YaST2. @@ -28,10 +20,6 @@ # build only the library, ignore documentation (it is in devel-doc package) echo "src" > SUBDIRS -%if 0%{?suse_version} == 1130 || 0%{?suse_version} == 1140 -%patch0 -p0 -%endif - @BUILD@ @INSTALL@ -- 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] r67722 - /tags/stable-2_22_1/pkg-bindings/
by lslezak＠svn2.opensuse.org 27 Mar '12

27 Mar '12

Author: lslezak Date: Tue Mar 27 19:08:28 2012 New Revision: 67722 URL: http://svn.opensuse.org/viewcvs/yast?rev=67722&view=rev Log: Created tag stable-2_22_1 for pkg-bindings Added: tags/stable-2_22_1/pkg-bindings/ (props changed) - copied from r67721, trunk/pkg-bindings/ -- 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] r67721 - in /trunk/pkg-bindings: VERSION package/openSUSE-11.3.diff package/openSUSE-11.4.diff package/yast2-pkg-bindings.changes
by lslezak＠svn2.opensuse.org 27 Mar '12

27 Mar '12

Author: lslezak Date: Tue Mar 27 19:05:35 2012 New Revision: 67721 URL: http://svn.opensuse.org/viewcvs/yast?rev=67721&view=rev Log: - dropped build support for openSUSE-11.x - 2.22.1 Removed: trunk/pkg-bindings/package/openSUSE-11.3.diff trunk/pkg-bindings/package/openSUSE-11.4.diff Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=67721&r… ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Tue Mar 27 19:05:35 2012 @@ -1 +1 @@ -2.22.0 +2.22.1 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Tue Mar 27 19:05:35 2012 @@ -2,6 +2,8 @@ Tue Mar 27 16:56:58 UTC 2012 - lslezak(a)suse.cz - removed libxcrypt-devel from buildrequires (aschnell) +- dropped build support for openSUSE-11.x +- 2.22.1 ------------------------------------------------------------------- Thu Mar 8 08:16:23 UTC 2012 - lslezak(a)suse.cz -- 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] r67720 - /trunk/pkg-bindings/package/yast2-pkg-bindings.changes
by lslezak＠svn2.opensuse.org 27 Mar '12

27 Mar '12

Author: lslezak Date: Tue Mar 27 19:00:12 2012 New Revision: 67720 URL: http://svn.opensuse.org/viewcvs/yast?rev=67720&view=rev Log: updated *.changes Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Tue Mar 27 19:00:12 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Mar 27 16:56:58 UTC 2012 - lslezak(a)suse.cz + +- removed libxcrypt-devel from buildrequires (aschnell) + +------------------------------------------------------------------- Thu Mar 8 08:16:23 UTC 2012 - lslezak(a)suse.cz - added Pkg::ResolvableUpdate() to avoid downgrading resolvables -- 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] r67719 - in /branches/SuSE-SLE-10-SP4-Branch/hardware-detection: package/yast2-hardware-detection.changes src/HwProbe.cc
by mvidner＠svn2.opensuse.org 27 Mar '12

27 Mar '12

Author: mvidner Date: Tue Mar 27 14:31:14 2012 New Revision: 67719 URL: http://svn.opensuse.org/viewcvs/yast?rev=67719&view=rev Log: Added .probe.fingerprint (F302658) This change was shipped in SLE10 SP4 (yast2-hardware-detection-2.13.8) but omitted by mistake from SVN. Thanks to Arvin for noticing. See also the trunk commit which also enables tests: http://svn.opensuse.org/viewvc/yast?view=revision&revision=39435 Modified: branches/SuSE-SLE-10-SP4-Branch/hardware-detection/package/yast2-hardware-detection.changes branches/SuSE-SLE-10-SP4-Branch/hardware-detection/src/HwProbe.cc Modified: branches/SuSE-SLE-10-SP4-Branch/hardware-detection/package/yast2-hardware-detection.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/hardwa… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/hardware-detection/package/yast2-hardware-detection.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/hardware-detection/package/yast2-hardware-detection.changes Tue Mar 27 14:31:14 2012 @@ -5,6 +5,12 @@ - 2.13.9 ------------------------------------------------------------------- +Tue Oct 9 10:48:20 CEST 2007 - mvidner(a)suse.cz + +- Added .probe.fingerprint (F302658). +- 2.13.8 + +------------------------------------------------------------------- Thu Mar 1 16:57:43 CET 2007 - mvidner(a)suse.cz - Fixed a bug in the last change that converted nearly Modified: branches/SuSE-SLE-10-SP4-Branch/hardware-detection/src/HwProbe.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/hardwa… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/hardware-detection/src/HwProbe.cc (original) +++ branches/SuSE-SLE-10-SP4-Branch/hardware-detection/src/HwProbe.cc Tue Mar 27 14:31:14 2012 @@ -307,6 +307,7 @@ { "tape", ITEM(hw_tape), pr_null, 0}, { "bluetooth", ITEM(hw_bluetooth), pr_null, 0}, { "dsl", ITEM(hw_dsl), pr_null, 0}, + { "fingerprint", ITEM(hw_fingerprint), pr_null, 0}, //not-yet-in-hwinfo { "vbe", ITEM(hw_vbe), pr_null, 0}, { 0, 0, pr_null, 0 } }; -- 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] r67718 - /tags/stable-2_22_4/ncurses-pkg/
by gs＠svn2.opensuse.org 27 Mar '12

27 Mar '12

Author: gs Date: Tue Mar 27 14:12:54 2012 New Revision: 67718 URL: http://svn.opensuse.org/viewcvs/yast?rev=67718&view=rev Log: Created tag stable-2_22_4 for ncurses-pkg Added: tags/stable-2_22_4/ncurses-pkg/ - copied from r67717, trunk/ncurses-pkg/ -- 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] r67717 - in /trunk/ncurses-pkg: VERSION package/yast2-ncurses-pkg.changes
by gs＠svn2.opensuse.org 27 Mar '12

27 Mar '12

Author: gs Date: Tue Mar 27 14:11:58 2012 New Revision: 67717 URL: http://svn.opensuse.org/viewcvs/yast?rev=67717&view=rev Log: bug-fix for bnc#704123, remove libxcrypt-devel from BuildRequires 2.22.4 Modified: trunk/ncurses-pkg/VERSION trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes Modified: trunk/ncurses-pkg/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/VERSION?rev=67717&r1… ============================================================================== --- trunk/ncurses-pkg/VERSION (original) +++ trunk/ncurses-pkg/VERSION Tue Mar 27 14:11:58 2012 @@ -1 +1 @@ -2.22.3 +2.22.4 Modified: trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/package/yast2-ncurse… ============================================================================== --- trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes (original) +++ trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes Tue Mar 27 14:11:58 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Mar 27 13:59:56 CEST 2012 - gs(a)suse.de + +- Select correct package version and vendor for update (bnc#704123) +- remove libxcrypt-devel from BuildRequires +- 2.22.4 + +------------------------------------------------------------------- Wed Mar 14 13:42:38 CET 2012 - gs(a)suse.de - Online Update: possibility to search in patch summary, improve -- 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] r67716 - /trunk/ncurses-pkg/src/NCPkgStatusStrategy.cc
by gs＠svn2.opensuse.org 27 Mar '12

27 Mar '12

Author: gs Date: Tue Mar 27 13:41:15 2012 New Revision: 67716 URL: http://svn.opensuse.org/viewcvs/yast?rev=67716&view=rev Log: first set candidate, second package status Modified: trunk/ncurses-pkg/src/NCPkgStatusStrategy.cc Modified: trunk/ncurses-pkg/src/NCPkgStatusStrategy.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgStatusStrat… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgStatusStrategy.cc (original) +++ trunk/ncurses-pkg/src/NCPkgStatusStrategy.cc Tue Mar 27 13:41:15 2012 @@ -617,14 +617,14 @@ } } - // Set status - ok = slbPtr->setStatus( status ); - yuiMilestone() << "Set status of: " << slbPtr->name() << " to: " - << status << " returns: " << (ok?"true":"false") << endl; - // Set candidate ok = slbPtr->setCandidate( newCandidate ); yuiMilestone() << "Set user candidate returns: " << (ok?"true":"false") << endl; + + // Set status + ok = slbPtr->setStatus( status ); + yuiMilestone() << "Set status of: " << slbPtr->name() << " to: " + << status << " returns: " << (ok?"true":"false") << endl; } -- 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] r67715 - /trunk/ncurses-pkg/src/NCPkgMenuAction.cc
by gs＠svn2.opensuse.org 27 Mar '12

27 Mar '12

Author: gs Date: Tue Mar 27 13:26:48 2012 New Revision: 67715 URL: http://svn.opensuse.org/viewcvs/yast?rev=67715&view=rev Log: update package versions list Modified: trunk/ncurses-pkg/src/NCPkgMenuAction.cc Modified: trunk/ncurses-pkg/src/NCPkgMenuAction.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuAction.… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuAction.cc (original) +++ trunk/ncurses-pkg/src/NCPkgMenuAction.cc Tue Mar 27 13:26:48 2012 @@ -168,6 +168,9 @@ else yuiError() << "zatim nic" << endl; + if ( pkg->VersionsList() ) + pkg->VersionsList()->updateTable(); + return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0