Author: fehr
Date: Thu Apr 19 16:47:56 2012
New Revision: 67971
URL: http://svn.opensuse.org/viewcvs/yast?rev=67971&view=rev
Log:
checkin for backup purposes
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
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=67971&r1=67970&r2=67971&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 Thu Apr 19 16:47:56 2012
@@ -474,11 +474,11 @@
state = mapmap( string s, boolean b, state,
{
ls = splitstring( s, "/" );
- return( $[ ls[6]:"" + " " + ls[7]:"" + " " + ls[9]:"" : b ] );
+ return( $[ ls[6]:"" + " " + substring(ls[7]:"",5) + " " + ls[9]:"" : b ] );
});
y2milestone( "GetConnected state:%1", state );
ls = maplist( string s, boolean b, filter( string s, boolean b, state, ``(b)),
- ``(splitstring( s, " " )[2]:""));
+ ``(s));
y2milestone( "GetConnected ret:%1", ls );
return( ls );
}
@@ -700,6 +700,18 @@
}
});
});
+ list<string> cl = GetConnected();
+ foreach( string s, cl,
+ {
+ list ls = SplitStringNE( s, " " );
+ ls[1] = tointeger( ls[1]:"-1" );
+ y2milestone( "ParseConfigLio conn:%1", ls );
+ if( haskey( tgmap[ls[0]:""]:$[], ls[1]:-1 ))
+ tgmap[ls[0]:"",ls[1]:-1,"conn"] =
+ tgmap[ls[0]:"",ls[1]:"","conn"]:0 + 1;
+ if( haskey(tgmap[ls[0]:"",ls[1]:-1,"clnt"]:$[], ls[2]:"" ))
+ tgmap[ls[0]:"",ls[1]:-1,"clnt",ls[2]:"","connected"] = true;
+ });
ret["tgt"] = tgmap;
return( ret );
}
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=67971&r1=67970&r2=67971&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 Thu Apr 19 16:47:56 2012
@@ -194,83 +194,6 @@
return true;
}
-// #157643 - reload server
-boolean reloadServer()
- {
- return true;
- // ask user whether reload or restart server
- // #180205 - gettext problem - string wasn't marked to translate
- 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 target service?
-")))
- Service::Restart("target");
- else
- {
- // get changes from perl module
- map