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