Author: gs Date: Tue May 31 12:19:11 2011 New Revision: 64163 URL: http://svn.opensuse.org/viewcvs/yast?rev=64163&view=rev Log: changes for installation workflow Modified: trunk/fcoe-client/package/yast2-fcoe-client.changes trunk/fcoe-client/src/FcoeClient.ycp trunk/fcoe-client/src/Makefile.am trunk/fcoe-client/src/inst_fcoe-client.ycp trunk/fcoe-client/src/wizards.ycp Modified: trunk/fcoe-client/package/yast2-fcoe-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/package/yast2-fcoe-client.changes?rev=64163&r1=64162&r2=64163&view=diff ============================================================================== --- trunk/fcoe-client/package/yast2-fcoe-client.changes (original) +++ trunk/fcoe-client/package/yast2-fcoe-client.changes Tue May 31 12:19:11 2011 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Thu May 26 14:24:19 CEST 2011 - gs@suse.de + +- Create VLAN interface and start FCoE during installation, only + start FCoE in installed system (if VLAN interface exists) +- 'DCB capable' is last column in table of interfaces +- inst_fcoe-client.ycp and fcoe-client_finish.ycp added (needed + for installation workflow) +- V 2.21.2 + +------------------------------------------------------------------- Wed May 18 14:07:58 CEST 2011 - gs@suse.de - Main parts of the FCoE configuration are available Modified: trunk/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/FcoeClient.ycp?rev=64163&r1=64162&r2=64163&view=diff ============================================================================== --- trunk/fcoe-client/src/FcoeClient.ycp (original) +++ trunk/fcoe-client/src/FcoeClient.ycp Tue May 31 12:19:11 2011 @@ -492,7 +492,7 @@ // // Detect network interface cards (hardware probe) and get status // -boolean DetectNetworkCards() +global boolean DetectNetworkCards() { string vlan_interface = ""; string fcoe_vlan_interface = ""; @@ -575,7 +575,7 @@ // // Read /etc/fcoe/config // -boolean ReadFcoeConfig() +global boolean ReadFcoeConfig() { list <string> options = (list<string>) SCR::Dir(.fcoe); y2milestone( "List of options: %1", options ); @@ -625,7 +625,7 @@ return redo_list; } -boolean WriteFcoeConfig() +global boolean WriteFcoeConfig() { boolean ret = true; @@ -643,7 +643,7 @@ return ret; } -boolean WriteCfgFiles() +global boolean WriteCfgFiles() { list <map> netcards = GetNetworkCards(); boolean success = true; @@ -688,7 +688,7 @@ return success; } -boolean RestartServiceFcoe() +global boolean RestartServiceFcoe() { boolean ret = true; if ( FcoeClient::Modified() ) @@ -776,11 +776,10 @@ if( !success ) Report::Warning(_("Cannot detect devices.")); sleep(sl); - // read general FCoE settings if(PollAbort()) return false; Progress::NextStage(); - // check daemon fcoemon and lldpad + // read general FCoE settings success = ReadFcoeConfig(); /* Error message */ Modified: trunk/fcoe-client/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/Makefile.am?rev=64163&r1=64162&r2=64163&view=diff ============================================================================== --- trunk/fcoe-client/src/Makefile.am (original) +++ trunk/fcoe-client/src/Makefile.am Tue May 31 12:19:11 2011 @@ -5,7 +5,9 @@ client_DATA = \ fcoe-client.ycp \ fcoe-client_auto.ycp \ - fcoe-client_proposal.ycp + fcoe-client_proposal.ycp \ + fcoe-client_finish.ycp \ + inst_fcoe-client.ycp ynclude_DATA = \ helps.ycp \ Modified: trunk/fcoe-client/src/inst_fcoe-client.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/inst_fcoe-client.ycp?rev=64163&r1=64162&r2=64163&view=diff ============================================================================== --- trunk/fcoe-client/src/inst_fcoe-client.ycp (original) +++ trunk/fcoe-client/src/inst_fcoe-client.ycp Tue May 31 12:19:11 2011 @@ -27,30 +27,74 @@ import "Packages"; import "Installation"; import "String"; +import "FcoeClient"; +import "NetworkService"; + include "fcoe-client/wizards.ycp"; /* main ui function */ any ret = nil; +boolean success = false; y2milestone("fcoe-client module started during installation"); -// TODO: check what is needed here -// - create directories (included in open-fcoe?) -// - load any modules ? -// - start fcoemon (started in FcoeClient::ServiceStatus()) +// create /etc/fcoe +SCR::Execute(.target.bash, "mkdir -p /etc/fcoe" ); + -//SCR::Execute(.target.bash, "mkdir -p /etc/iscsi; touch /etc/iscsi/initiatorname.iscsi; ln -s /etc/iscsi/initiatorname.iscsi /etc/initiatorname.iscsi"); -// ModuleLoading::Load("iscsi_tcp", "", "", "", false, true); -// start iscsid daemon -// IscsiClientLib::startIScsid(); -// IscsiClientLib::autoLogOn(); +// TODO: check what is additional needed +// - load any modules ? +// +// FcoeClient::CheckInstalledPackages() not needed in inst-sys +// FcoeClient::DetectStartStatus() doesn't make sense in inst-sys + +// TODO: check for running network - makes sense here ??? +if( !NetworkService::RunningNetworkPopup() ) +{ + y2error( "Network NOT set up" ); + return nil; +} + +// start services fcoe and lldpad +success = FcoeClient::ServiceStatus(); +if ( !success ) +{ + y2error( "Starting of services FAILED" ); + return nil; +} + +// detect netcards +success = FcoeClient::DetectNetworkCards(); +if ( !success ) +{ + y2error( "Detecting netcards FAILED" ); + return nil; +} + +// read general FCoE settings +success = FcoeClient::ReadFcoeConfig(); +if ( !success ) +{ + y2error( "Reading /etc/fcoe/config FAILED" ); + return nil; +} // run dialog ret = MainSequence(); -y2debug("MainSequence ret=%1", ret); -// add package open-iscsi to installed system +y2milestone("MainSequence ret=%1", ret); + +// add package open-fcoe to installed system Packages::addAdditionalPackage("open-fcoe"); +// workflow not aborted +if ( ret == `next ) +{ + // write changes to config files + FcoeClient::WriteFcoeConfig(); + FcoeClient::WriteCfgFiles(); + FcoeClient::RestartServiceFcoe(); +} + /* Finish */ y2milestone("fcoe-client module finished"); y2milestone("----------------------------------------"); Modified: trunk/fcoe-client/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/wizards.ycp?rev=64163&r1=64162&r2=64163&view=diff ============================================================================== --- trunk/fcoe-client/src/wizards.ycp (original) +++ trunk/fcoe-client/src/wizards.ycp Tue May 31 12:19:11 2011 @@ -194,7 +194,7 @@ Wizard::CreateDialog(); any ret = Sequencer::Run(aliases, sequence); - + y2milestone( "**** RETURN of MainSequence ****: %1", ret ); UI::CloseDialog(); return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org