Author: fehr Date: Tue Apr 10 18:11:29 2012 New Revision: 67910 URL: http://svn.opensuse.org/viewcvs/yast?rev=67910&view=rev Log: checkin for backup purpose 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/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/iscsi-lio-server.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-lio-server_auto.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-lio-server_proposal.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/src/IscsiLioData.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp?rev=67910&r1=67909&r2=67910&view=diff ============================================================================== --- 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 Tue Apr 10 18:11:29 2012 @@ -1,3 +1,26 @@ +/* +|*************************************************************************** +| +| Copyright (c) [2012] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|*************************************************************************** +*/ /** * File: modules/IscsiLioData.ycp * Package: Configuration Data of iscsi-lio-server 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-lio-server/src/IscsiLioServer.ycp?rev=67910&r1=67909&r2=67910&view=diff ============================================================================== --- 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 Tue Apr 10 18:11:29 2012 @@ -1,3 +1,26 @@ +/* +|*************************************************************************** +| +| Copyright (c) [2012] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|*************************************************************************** +*/ /** * File: modules/IscsiLioServer.ycp * Package: Configuration of iscsi-lio-server 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-lio-server/src/complex.ycp?rev=67910&r1=67909&r2=67910&view=diff ============================================================================== --- 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 Tue Apr 10 18:11:29 2012 @@ -1,3 +1,26 @@ +/* +|*************************************************************************** +| +| Copyright (c) [2012] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|*************************************************************************** +*/ /** * File: include/iscsi-lio-server/complex.ycp * Package: Configuration of iscsi-lio-server 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-lio-server/src/dialogs.ycp?rev=67910&r1=67909&r2=67910&view=diff ============================================================================== --- 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 Tue Apr 10 18:11:29 2012 @@ -1,3 +1,26 @@ +/* +|*************************************************************************** +| +| Copyright (c) [2012] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|*************************************************************************** +*/ /** * File: include/iscsi-lio-server/dialogs.ycp * Package: Configuration of iscsi-lio-server @@ -223,20 +246,7 @@ // discovery authentication dialog "global_config" : $[ "widget" : `custom, - "custom_widget" : - `VBox( - `Left( `CheckBox(`id(`auth_none),`opt(`notify), _("No Authentication"), true) ), - `VSpacing(2), - `Left( `CheckBox(`id(`auth_in),`opt(`notify), _("Incoming Authentication"), false) ), - `HBox( - `InputField(`id(`user_in), `opt(`hstretch), _("Username")), - `Password(`id(`pass_in), _("Password"))), - `VSpacing(2), - `Left( `CheckBox(`id(`auth_out),`opt(`notify), _("Outgoing Authentication"), false) ), - `HBox( - `InputField(`id(`user_out), `opt(`hstretch), _("Username")), - `Password(`id(`pass_out), _("Password"))) - ), + "custom_widget" : AuthTerm(), "init" : initGlobal, "handle" : handleAuth, "store" : storeGlobal, 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-lio-server/src/helps.ycp?rev=67910&r1=67909&r2=67910&view=diff ============================================================================== --- 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 Tue Apr 10 18:11:29 2012 @@ -1,3 +1,26 @@ +/* +|*************************************************************************** +| +| Copyright (c) [2012] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|*************************************************************************** +*/ /** * File: include/iscsi-lio-server/helps.ycp * Package: Configuration of iscsi-lio-server Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-lio-server.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-lio-server.ycp?rev=67910&r1=67909&r2=67910&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-lio-server.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-lio-server.ycp Tue Apr 10 18:11:29 2012 @@ -1,3 +1,26 @@ +/* +|*************************************************************************** +| +| Copyright (c) [2012] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|*************************************************************************** +*/ /** * File: clients/iscsi-lio-server.ycp * Package: Configuration of iscsi-lio-server Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-lio-server_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-lio-server_auto.ycp?rev=67910&r1=67909&r2=67910&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-lio-server_auto.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-lio-server_auto.ycp Tue Apr 10 18:11:29 2012 @@ -1,3 +1,26 @@ +/* +|*************************************************************************** +| +| Copyright (c) [2012] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|*************************************************************************** +*/ /** * File: clients/iscsi-lio-server_auto.ycp * Package: Configuration of iscsi-lio-server Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-lio-server_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-lio-server_proposal.ycp?rev=67910&r1=67909&r2=67910&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-lio-server_proposal.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/iscsi-lio-server_proposal.ycp Tue Apr 10 18:11:29 2012 @@ -1,3 +1,26 @@ +/* +|*************************************************************************** +| +| Copyright (c) [2012] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|*************************************************************************** +*/ /** * File: clients/iscsi-lio-server_proposal.ycp * Package: Configuration of iscsi-lio-server 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-lio-server/src/widgets.ycp?rev=67910&r1=67909&r2=67910&view=diff ============================================================================== --- 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 Tue Apr 10 18:11:29 2012 @@ -1,3 +1,26 @@ +/* +|*************************************************************************** +| +| Copyright (c) [2012] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|*************************************************************************** +*/ { textdomain "iscsi-lio-server"; @@ -10,8 +33,28 @@ // **************** global funcions and variables ***** string curr_target = ""; integer curr_tpg = 1; -string modify_record = ""; -map inc_auth = $[]; +map > changed_lun = $[]; +map changed_auth = $[]; +list<string> del_clnt = []; + +term AuthTerm() + { + term t = + `VBox( + `Left( `CheckBox(`id(`auth_none),`opt(`notify), _("No Authentication"), true) ), + `VSpacing(1.5), + `Left( `CheckBox(`id(`auth_in),`opt(`notify), _("Incoming Authentication"), false) ), + `HBox( + `InputField(`id(`user_in), `opt(`hstretch), _("Username")), + `Password(`id(`pass_in), _("Password"))), + `VSpacing(1.5), + `Left( `CheckBox(`id(`auth_out),`opt(`notify), _("Outgoing Authentication"), false) ), + `HBox( + `InputField(`id(`user_out), `opt(`hstretch), _("Username")), + `Password(`id(`pass_out), _("Password"))) + ); + return( t ); + } boolean CheckLun( integer l, list<term> other, boolean silent ) { @@ -120,7 +163,7 @@ integer TpgIdFromTpgItem( string s ) { - integer val = tointeger(s); + integer val = (s!="-")?tointeger(s):-1; if( val==nil ) val = -1; return( val ); @@ -134,23 +177,30 @@ void ChangeTpgItems( integer id, integer value, list<term>& items ) { y2milestone( "ChangeTpgItems id:%1 value:%2", id, value ); - term it = items[id]:`Empty(); - it[2] = TpgItemFromTpgId( value ); - items[id] = it; + if( value!=nil ) + { + term it = items[id]:`Empty(); + it[2] = TpgItemFromTpgId( value ); + items[id] = it; + UI::ChangeWidget(`id(`lun), `Items, items ); + UI::ChangeWidget(`id(`lun), `CurrentItem, id ); + } } map LUNMapDialog( string clnt ) { y2milestone( "LUNMapDialog clnt:%1", clnt ); - map lmap = IscsiLioData::GetClntLun( curr_target, curr_tpg, clnt ); + map lmap = $[]; + if( haskey(changed_lun,clnt) ) + lmap = changed_lun[clnt]:$[]; + else + lmap = IscsiLioData::GetClntLun(curr_target,curr_tpg,clnt); y2milestone( "LUNMapDialog map:%1", lmap ); list<integer> ll = maplist( integer l, integer d, lmap, ``(l)); list<term> lt = maplist( integer l, map d, IscsiLioData::GetLun(curr_target,curr_tpg), ``(`item(`id(l),tostring(l)))); lt = add( lt, `item(`id(-1),"-")); - integer mx = 0; - if( ll[size(ll)-1]:0 > mx ) - mx = ll[size(ll)-1]:0; + integer mx = ll[size(ll)-1]:-1; integer i = 0; list<term> items = []; while( i<=mx ) @@ -161,7 +211,7 @@ y2milestone( "LUNMapDialog items:%1", items ); term lun_dialog = `VBox( - `MinHeight( 10, `Table(`id(`lun), `opt(`immediate,`notify,`notifyContextMenu), + `MinHeight( 10, `Table(`id(`lun), `opt(`keepSorting,`immediate,`notify,`notifyContextMenu), `header(_("Client Lun"), _("Target LUN")), items )), `Left( `HBox( @@ -173,6 +223,11 @@ `PushButton(`id(`cancel), Label::CancelButton() )) ); UI::OpenDialog(lun_dialog); + if( size(items)==0 ) + { + UI::ChangeWidget(`id(`change), `Enabled, false ); + UI::ChangeWidget(`id(`delete), `Enabled, false ); + } UI::ChangeWidget(`id(`change), `Value, TpgIdFromTpgItem(items[0,2]:"-") ); symbol sym = `nil; while(sym != `ok && sym !=`cancel) @@ -194,8 +249,6 @@ UI::OpenContextMenu(`menu(lt)); integer value = (integer)UI::UserInput(); ChangeTpgItems( id, value, items ); - UI::ChangeWidget(`id(`lun), `Items, items ); - UI::ChangeWidget(`id(`lun), `CurrentItem, id ); UI::ChangeWidget(`id(`change), `Value, value ); } else @@ -205,9 +258,24 @@ } else if( sym==`add ) { + integer n = size(items); + items = add( items, `item( `id(n), tostring(n), "-" )); + UI::ChangeWidget(`id(`lun), `Items, items ); + UI::ChangeWidget(`id(`lun), `CurrentItem, n ); + UI::ChangeWidget(`id(`change), `Value, -1 ); + if( size(items)==1 ) + { + UI::ChangeWidget(`id(`change), `Enabled, true ); + UI::ChangeWidget(`id(`delete), `Enabled, true ); + } } else if( sym==`delete ) { + integer id = (integer)UI::QueryWidget(`lun,`CurrentItem); + if( id!=nil && id lmap = IscsiLioData::GetClntLun( curr_target, curr_tpg, s ); @@ -832,14 +1043,19 @@ switch((symbol)event["WidgetID"]:nil) { case `delete: - any del = UI::QueryWidget(`id (`clnt_table),`CurrentItem); + any del = (integer)UI::QueryWidget(`id (`clnt_table),`CurrentItem); if (del != nil) { if(Popup::ContinueCancel(_("Really delete the selected item?"))) { y2milestone("handleClient Delete Client %1 from table", del); - list it=(list)UI::QueryWidget(`clnt_table, `Items); - it = remove( it, (integer)del ); + list<term> it=(list<term>)UI::QueryWidget(`clnt_table, `Items); + string clnt = GetById(it,del)[1]:""; + del_clnt = add( del_clnt, clnt ); + if( haskey(changed_lun,clnt)) + changed_lun = remove(changed_lun,clnt); + y2milestone( "handleClient del_clnt:%1", del_clnt ); + it = RemoveById( it, del ); UI::ChangeWidget(`id(`clnt_table), `Items, it); } else @@ -847,6 +1063,7 @@ } break; case `edit_lun: + { integer edit_pos=tointeger(UI::QueryWidget(`clnt_table, `CurrentItem)); list<term> items = (list<term>)UI::QueryWidget(`clnt_table, `Items); term it = items[edit_pos]:`Empty(); @@ -861,6 +1078,25 @@ UI::ChangeWidget(`clnt_table, `Items, items); UI::ChangeWidget(`clnt_table, `CurrentItem, edit_pos); } + } + break; + case `edit_auth: + { + integer edit_pos=tointeger(UI::QueryWidget(`clnt_table, `CurrentItem)); + list<term> items = (list<term>)UI::QueryWidget(`clnt_table, `Items); + term it = items[edit_pos]:`Empty(); + string s = it[1]:""; + y2milestone( "handleClient pos:%1 clnt:%2", edit_pos, s ); + map auth = ClntAuthDialog( s ); + y2milestone( "handleClient auth:%1", auth ); + if( auth!=nil ) + { + it[3] = GetAuthString(auth); + items[edit_pos] = it; + UI::ChangeWidget(`clnt_table, `Items, items); + UI::ChangeWidget(`clnt_table, `CurrentItem, edit_pos); + } + } break; case `add: /* 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-lio-server/src/wizards.ycp?rev=67910&r1=67909&r2=67910&view=diff ============================================================================== --- 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 Tue Apr 10 18:11:29 2012 @@ -1,3 +1,26 @@ +/* +|*************************************************************************** +| +| Copyright (c) [2012] Novell, Inc. +| All Rights Reserved. +| +| This program is free software; you can redistribute it and/or +| modify it under the terms of version 2 of the GNU General Public License as +| published by the Free Software Foundation. +| +| This program is distributed in the hope that it will be useful, +| but WITHOUT ANY WARRANTY; without even the implied warranty of +| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +| GNU General Public License for more details. +| +| You should have received a copy of the GNU General Public License +| along with this program; if not, contact Novell, Inc. +| +| To contact Novell about this file by physical or electronic mail, +| you may find current contact information at www.novell.com +| +|*************************************************************************** +*/ /** * File: include/iscsi-lio-server/wizards.ycp * Package: Configuration of iscsi-lio-server -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org