May 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r63901 - in /trunk/s390/src/clients: dasd_auto.ycp zfcp_auto.ycp
by aschnell＠svn2.opensuse.org 05 May '11

05 May '11

Author: aschnell Date: Thu May 5 11:08:55 2011 New Revision: 63901 URL: http://svn.opensuse.org/viewcvs/yast?rev=63901&view=rev Log: - fixed typo Modified: trunk/s390/src/clients/dasd_auto.ycp trunk/s390/src/clients/zfcp_auto.ycp Modified: trunk/s390/src/clients/dasd_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/dasd_auto.ycp?r… ============================================================================== --- trunk/s390/src/clients/dasd_auto.ycp (original) +++ trunk/s390/src/clients/dasd_auto.ycp Thu May 5 11:08:55 2011 @@ -83,7 +83,7 @@ ret = DASDController::Read(); Progress::on(); } -/* Write givven settings */ +/* Write given settings */ else if (func == "Write") { import "Progress"; Progress::off(); Modified: trunk/s390/src/clients/zfcp_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/zfcp_auto.ycp?r… ============================================================================== --- trunk/s390/src/clients/zfcp_auto.ycp (original) +++ trunk/s390/src/clients/zfcp_auto.ycp Thu May 5 11:08:55 2011 @@ -83,7 +83,7 @@ ret = ZFCPController::Read(); Progress::on(); } -/* Write givven settings */ +/* Write given settings */ else if (func == "Write") { import "Progress"; Progress::off(); -- 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] r63900 - in /trunk/fcoe-client/src: FcoeClient.ycp complex.ycp dialogs.ycp
by gs＠svn2.opensuse.org 04 May '11

04 May '11

Author: gs Date: Wed May 4 13:43:22 2011 New Revision: 63900 URL: http://svn.opensuse.org/viewcvs/yast?rev=63900&view=rev Log: ReadFcoeConfig added Modified: trunk/fcoe-client/src/FcoeClient.ycp trunk/fcoe-client/src/complex.ycp trunk/fcoe-client/src/dialogs.ycp Modified: trunk/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/FcoeClient.ycp?r… ============================================================================== --- trunk/fcoe-client/src/FcoeClient.ycp (original) +++ trunk/fcoe-client/src/FcoeClient.ycp Wed May 4 13:43:22 2011 @@ -147,7 +147,7 @@ { boolean ret = false; - // don't check interactively for packages (bnc#367300) + // don't check interactively for packages (bnc#367300) -> comment from iscsi-client // skip it during initial and second stage or when create AY profile if(Stage::cont() || Stage::initial() || Mode::config()) return true; y2milestone("Check if open-fcoe package installed"); @@ -266,6 +266,14 @@ } // +// +// +void CheckServices() +{ + +} + +// // Detect network interface cards (hardware probe) and get status // void DetectNetworkCards() @@ -311,6 +319,28 @@ } // +// Read /etc/fcoe/config +// +void ReadFcoeConfig() +{ + list <string> options = (list<string>) SCR::Dir(.fcoe); + y2milestone( "List of options: %1", options ); + // TODO take values from list + if ( options != [] ) + { + string debug_val = (string)SCR::Read(add(.fcoe, "DEBUG")); + fcoe_general_config = add( fcoe_general_config, "DEBUG", debug_val ); + + string syslog_val = (string)SCR::Read(add(.fcoe, "USE_SYSLOG")); + fcoe_general_config = add( fcoe_general_config, "USE_SYSLOG", syslog_val ); + } + else + { + y2error( "Cannot read /etc/fcoe/config" ); + } +} + +// // Returns the map containing general FCoE configuration // global map <string, string> GetFcoeConfig() @@ -339,9 +369,11 @@ /* Progress stage 1/3 */ _("Check installed packages"), /* Progress stage 2/3 */ - _("Detect network cards"), + _("Check services"), /* Progress stage 3/3 */ - _("Check services") + _("Detect network cards"), + /* Progress stage 4/4 */ + _("Read /etc/fcoe/config" ) ], [ /* Progress step 1/3 */ _("Checking for installed packages..."), @@ -349,16 +381,18 @@ _("Detecting network cards..."), /* Progress step 3/3 */ _("Checking for services..."), + /* Progress step 4/4 */ + _("Reading /etc/fcoe/config" ), /* Progress finished */ _("Finished") ], "" ); - // read database if(Abort()) return false; Progress::NextStage(); + // checking whether open-fcoe is installed (requires lldpad, ...) boolean installed = CheckInstalledPackages(); /* Error message */ @@ -369,19 +403,34 @@ if(Abort()) return false; Progress::NextStage(); - DetectNetworkCards(); - + // check daemon fcoemon and lldpad + CheckServices(); + /* Error message */ - if(false) Report::Error(_("Cannot get information about netcards")); + if(false) Report::Error(_("Checking for services failed")); sleep(sl); - // detect devices if(Abort()) return false; Progress::NextStage(); + + // detect netcards - TODO return value + DetectNetworkCards(); + /* Error message */ if(false) Report::Warning(_("Cannot detect devices.")); sleep(sl); + // read general FCoE settings + if(Abort()) return false; + Progress::NextStage(); + + // check daemon fcoemon and lldpad + ReadFcoeConfig(); + + /* Error message */ + if(false) Report::Error(_("Checking for services failed")); + sleep(sl); + Progress::Finish(); if(Abort()) return false; Modified: trunk/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/complex.ycp?rev=… ============================================================================== --- trunk/fcoe-client/src/complex.ycp (original) +++ trunk/fcoe-client/src/complex.ycp Wed May 4 13:43:22 2011 @@ -153,28 +153,21 @@ void InitConfigurationDialog (string id) { y2milestone( "Init configuration dialog" ); - list <string> options = (list<string>) SCR::Dir(.fcoe); - y2milestone( "List of options: %1", options ); + map <string, string> fcoe_config = FcoeClient::GetFcoeConfig(); + y2milestone( "Fcoe configuration %1", fcoe_config ); - if ( options != [] ) + if ( fcoe_config!= $[] ) { - string debug_val = (string)SCR::Read(add(.fcoe, "DEBUG")); - string syslog_val = (string)SCR::Read(add(.fcoe, "SYSLOG")); - - if ( debug_val == "yes" ) + if ( fcoe_config["DEBUG"]:"" == "yes" ) UI::ChangeWidget(`id("debug"), `Value, "yes" ); else UI::ChangeWidget(`id("debug"), `Value, "no" ); - if ( syslog_val == "yes" ) + if ( fcoe_config["USE_SYSLOG"]:"" == "yes" ) UI::ChangeWidget(`id("syslog"), `Value, "yes" ); else UI::ChangeWidget(`id("syslog"), `Value, "no" ); } - else - { - y2error( "Cannot read /etc/fcoe/config"); - } } // @@ -267,6 +260,11 @@ void StoreEditDialog (string id, map event) { y2milestone( "Store edit dialog" ); + + string fcoe_enabled = (string)UI::QueryWidget( `id(`fcoe), `Value ); + string dcb_required = (string)UI::QueryWidget( `id(`dcb), `Value ); + + } /* EOF */ Modified: trunk/fcoe-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/dialogs.ycp?rev=… ============================================================================== --- trunk/fcoe-client/src/dialogs.ycp (original) +++ trunk/fcoe-client/src/dialogs.ycp Wed May 4 13:43:22 2011 @@ -49,12 +49,6 @@ `VSpacing (0.4) ); -/*symbol EditDialog() { - - y2milestone( "Edit dialog ***" ); - return `next; -} -*/ term EditDialogContents() { -- 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] r63899 - in /trunk/squid: package/yast2-squid.changes src/helps.ycp
by jsrain＠svn2.opensuse.org 04 May '11

04 May '11

Author: jsrain Date: Wed May 4 13:41:31 2011 New Revision: 63899 URL: http://svn.opensuse.org/viewcvs/yast?rev=63899&view=rev Log: fixed typos (bnc#690239) Modified: trunk/squid/package/yast2-squid.changes trunk/squid/src/helps.ycp Modified: trunk/squid/package/yast2-squid.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/package/yast2-squid.change… ============================================================================== --- trunk/squid/package/yast2-squid.changes (original) +++ trunk/squid/package/yast2-squid.changes Wed May 4 13:41:31 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed May 4 13:41:11 CEST 2011 - jsrain(a)suse.cz + +- fixed typos (bnc#690239) + +------------------------------------------------------------------- Fri Feb 26 12:28:31 CET 2010 - jsrain(a)suse.cz - fixed translations of language names (bnc#580494) Modified: trunk/squid/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/helps.ycp?rev=63899&r1… ============================================================================== --- trunk/squid/src/helps.ycp (original) +++ trunk/squid/src/helps.ycp Wed May 4 13:41:31 2011 @@ -111,7 +111,7 @@ <table> <tr> <td>lru</td> - <td>last recently used</td> + <td>least recently used</td> </tr> <tr> <td>heap GDSF</td> @@ -119,7 +119,7 @@ </tr> <tr> <td>heap LFUDA</td> - <td>Last Frequently Used with Dynamic Aging</td> + <td>Least Frequently Used with Dynamic Aging</td> <tr> <tr> <td>heap LRU</td> -- 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] r63898 - in /trunk/fcoe-client/src: FcoeClient.ycp complex.ycp wizards.ycp
by gs＠svn2.opensuse.org 04 May '11

04 May '11

Author: gs Date: Wed May 4 12:05:21 2011 New Revision: 63898 URL: http://svn.opensuse.org/viewcvs/yast?rev=63898&view=rev Log: init edit dialog Modified: trunk/fcoe-client/src/FcoeClient.ycp trunk/fcoe-client/src/complex.ycp trunk/fcoe-client/src/wizards.ycp Modified: trunk/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/FcoeClient.ycp?r… ============================================================================== --- trunk/fcoe-client/src/FcoeClient.ycp (original) +++ trunk/fcoe-client/src/FcoeClient.ycp Wed May 4 12:05:21 2011 @@ -129,6 +129,8 @@ // Define all the variables necessary to hold +global integer current_card = 0; // currently selected card, means row in list of cards + global string NOT_CONFIGURED = "not configured"; // map containing information about networks cards and VLAN, FCoE aand DCB status @@ -204,11 +206,11 @@ foreach( string line, (list<string>)lines, { if ( regexpmatch( line, "^FCOE_ENABLE" ) ) { - status_map = add( status_map, "FCOE_ENABLE", substring( line, 12 ) ); + status_map = add( status_map, "FCOE_ENABLE", deletechars( substring(line, 12), "\"") ); } if ( regexpmatch( line, "^DCB_REQUIRED" ) ) { - status_map = add( status_map, "DCB_REQUIRED", substring( line, 13 ) ); + status_map = add( status_map, "DCB_REQUIRED", deletechars( substring( line, 13 ),"\"") ); } }); } Modified: trunk/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/complex.ycp?rev=… ============================================================================== --- trunk/fcoe-client/src/complex.ycp (original) +++ trunk/fcoe-client/src/complex.ycp Wed May 4 12:05:21 2011 @@ -142,6 +142,7 @@ UI::ChangeWidget( `id(`interfaces), `Items, table_items ); UI::ChangeWidget( `id(`interfaces), `CurrentItem, `id(0) ); + FcoeClient::current_card = 0; AdjustButtons(); } @@ -175,7 +176,21 @@ y2error( "Cannot read /etc/fcoe/config"); } } - + +// +// InitEditDialog +// +void InitEditDialog( string id ) +{ + y2milestone( "Init edit dialog" ); + map <integer, list> cards = FcoeClient::GetNetworkCards(); + list card = cards[ FcoeClient::current_card ]:[]; + + // set values for 'FCoE Enabled' and 'DCB Required' + UI::ChangeWidget( `id(`fcoe), `Value, card[4]:"" ); + UI::ChangeWidget( `id(`dcb), `Value, card[5]:"" ); +} + /** * Handle **/ @@ -198,6 +213,7 @@ } else if ( action == `interfaces ) { + FcoeClient::current_card = (integer)UI::QueryWidget( `id(`interfaces), `CurrentItem ); AdjustButtons(); } else if ( action == `create ) @@ -227,6 +243,12 @@ return nil; } +symbol HandleEditDialog( string id, map event ) +{ + any action = event["ID"]:nil; + return nil; +} + /** * Store **/ @@ -243,5 +265,9 @@ y2milestone( "Store configuration dialog" ); } +void StoreEditDialog (string id, map event) { + y2milestone( "Store edit dialog" ); +} + /* EOF */ } Modified: trunk/fcoe-client/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/wizards.ycp?rev=… ============================================================================== --- trunk/fcoe-client/src/wizards.ycp (original) +++ trunk/fcoe-client/src/wizards.ycp Wed May 4 12:05:21 2011 @@ -144,7 +144,10 @@ "edit" : $[ "widget": `custom, "custom_widget": EditDialogContents(), - "help" : HELPS["change"]:"" + "help" : HELPS["change"]:"", + "init" : InitEditDialog, + "handle" : HandleEditDialog, + "store" : StoreEditDialog, ] ]; @@ -156,7 +159,7 @@ Wizard::SetContentsButtons( caption, contents, - "", // help HELP["edit"] + "", // help HELP["change"] Label::BackButton(), Label::NextButton()); -- 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] r63897 - in /trunk/fcoe-client/src: dialogs.ycp wizards.ycp
by gs＠svn2.opensuse.org 04 May '11

04 May '11

Author: gs Date: Wed May 4 11:25:54 2011 New Revision: 63897 URL: http://svn.opensuse.org/viewcvs/yast?rev=63897&view=rev Log: add EditDialog Modified: trunk/fcoe-client/src/dialogs.ycp trunk/fcoe-client/src/wizards.ycp Modified: trunk/fcoe-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/dialogs.ycp?rev=… ============================================================================== --- trunk/fcoe-client/src/dialogs.ycp (original) +++ trunk/fcoe-client/src/dialogs.ycp Wed May 4 11:25:54 2011 @@ -49,11 +49,38 @@ `VSpacing (0.4) ); -symbol EditDialog() { +/*symbol EditDialog() { y2milestone( "Edit dialog ***" ); return `next; } +*/ + +term EditDialogContents() +{ + return `VBox( + `VStretch(), + `HBox( + `HStretch(), + `HSpacing (1), + `VBox( + `ComboBox( `id(`fcoe), _("FCoE Enabled"), + [`item(`id("yes"), "yes" ), + `item(`id("no"), "no", true ) ] + ), + `VSpacing (2), + `ComboBox( `id(`dcb), _("DCB Required"), + [`item(`id("yes"), "yes" ), + `item(`id("no"), "no", true ) ] + ), + `VSpacing (2) + ), + `HSpacing (1), + `HStretch() + ), + `VStretch() + ); +} /** * Services dialog Modified: trunk/fcoe-client/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/wizards.ycp?rev=… ============================================================================== --- trunk/fcoe-client/src/wizards.ycp (original) +++ trunk/fcoe-client/src/wizards.ycp Wed May 4 11:25:54 2011 @@ -125,7 +125,7 @@ Wizard::SetContentsButtons ( caption, contents, - "", + "", //help Label::BackButton (), Label::FinishButton() ); @@ -136,6 +136,36 @@ return CWM::Run (w, $[`abort : ReallyAbort]); } +any EditDialog() { + string caption = _("Change FCoE Settings"); + + map <string, any> widgets = + $[ + "edit" : $[ + "widget": `custom, + "custom_widget": EditDialogContents(), + "help" : HELPS["change"]:"" + ] + ]; + + term contents = `VBox("edit"); + + list<map <string, any> > w = CWM::CreateWidgets (["edit"], + (map <string, map <string, any> >)widgets); + contents = CWM::PrepareDialog( contents, w ); + + Wizard::SetContentsButtons( caption, + contents, + "", // help HELP["edit"] + Label::BackButton(), + Label::NextButton()); + + any ret = CWM::Run( w, $[`abort:ReallyAbort ]); + + return ret; +} + + any MainSequence() { map aliases = $[ @@ -168,59 +198,59 @@ * Whole configuration of fcoe-client * @return sequence result */ - any FcoeClientSequence() { - - map aliases = $[ - "read" : [ ``( ReadDialog() ), true ], - "main" : ``( MainSequence() ), - "write" : [ ``( WriteDialog() ), true ] - ]; +any FcoeClientSequence() { - map sequence = $[ - "ws_start" : "read", - "read" : $[ - `abort : `abort, - `next : "main" - ], - "main" : $[ - `abort : `abort, - `next : "write", - ], - "write" : $[ - `abort : `abort, - `next : `next - ] - ]; + map aliases = $[ + "read" : [ ``( ReadDialog() ), true ], + "main" : ``( MainSequence() ), + "write" : [ ``( WriteDialog() ), true ] + ]; + + map sequence = $[ + "ws_start" : "read", + "read" : $[ + `abort : `abort, + `next : "main" + ], + "main" : $[ + `abort : `abort, + `next : "write", + ], + "write" : $[ + `abort : `abort, + `next : `next + ] + ]; - Wizard::CreateDialog(); + Wizard::CreateDialog(); - any ret = Sequencer::Run(aliases, sequence); + any ret = Sequencer::Run(aliases, sequence); - UI::CloseDialog(); - return ret; - } + UI::CloseDialog(); + return ret; +} /** * Whole configuration of fcoe-client but without reading and writing. * For use with autoinstallation. * @return sequence result */ - any FcoeClientAutoSequence() { +any FcoeClientAutoSequence() { - /* Initialization dialog caption */ - string caption = _("FcoeClient Configuration"); - /* Initialization dialog contents */ - term contents = `Label(_("Initializing...")); + /* Initialization dialog caption */ + string caption = _("FcoeClient Configuration"); + /* Initialization dialog contents */ + term contents = `Label(_("Initializing...")); - Wizard::CreateDialog(); - Wizard::SetContentsButtons(caption, contents, "", - Label::BackButton(), Label::NextButton()); + Wizard::CreateDialog(); + Wizard::SetContentsButtons(caption, contents, "", + Label::BackButton(), Label::NextButton()); - any ret = MainSequence(); + any ret = MainSequence(); - UI::CloseDialog(); - return ret; - } + UI::CloseDialog(); + return ret; +} /* 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] r63896 - /trunk/fcoe-client/src/FcoeClient.ycp
by gs＠svn2.opensuse.org 04 May '11

04 May '11

Author: gs Date: Wed May 4 10:12:28 2011 New Revision: 63896 URL: http://svn.opensuse.org/viewcvs/yast?rev=63896&view=rev Log: bugfix get DCB status Modified: trunk/fcoe-client/src/FcoeClient.ycp Modified: trunk/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/FcoeClient.ycp?r… ============================================================================== --- trunk/fcoe-client/src/FcoeClient.ycp (original) +++ trunk/fcoe-client/src/FcoeClient.ycp Wed May 4 10:12:28 2011 @@ -245,7 +245,9 @@ { // Status: Failed interface not DCB capable // Status: Successful - status = substring( line, 16 ); + line = deletechars ( line, " \t:" ); + status = substring( line, 6 ); + y2milestone( "Status: %1", status ); } } ); if ( status == "Successful" ) { @@ -254,8 +256,8 @@ } else { - y2error( "Error: %1", output["stderr"]:"" ); - Popup::Error ( output["stderr"]:"" ); + y2error( "Exit code: %1 Error: %2", output["exit"]:255, output["stderr"]:"" ); + // if ( output["stderr"]:"" != "" ) Popup::Error ( output["stderr"]:"" ); } 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] r63895 - /trunk/fcoe-client/src/FcoeClient.ycp
by gs＠svn2.opensuse.org 04 May '11

04 May '11

Author: gs Date: Wed May 4 09:44:47 2011 New Revision: 63895 URL: http://svn.opensuse.org/viewcvs/yast?rev=63895&view=rev Log: get DCB Status Modified: trunk/fcoe-client/src/FcoeClient.ycp Modified: trunk/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/FcoeClient.ycp?r… ============================================================================== --- trunk/fcoe-client/src/FcoeClient.ycp (original) +++ trunk/fcoe-client/src/FcoeClient.ycp Wed May 4 09:44:47 2011 @@ -225,27 +225,40 @@ // string DCBCapable( string netcard ) { + string ret = "no"; + string command = sformat( "LANG=POSIX dcbtool gc %1 dcb", netcard ); y2milestone( "Executing command: %1", command ); // TODO: lldpad must be started to be able to use dcbtool // -> started in CheckServices() -> Read() - // ACHTUNG: Reihenfolge !!! + // ACHTUNG: Reihenfolge !!!# map output = (map)SCR::Execute( .target.bash_output, command ); y2milestone( "Output: %1", output); - + string status = ""; + if ( output["exit"]:255 == 0 ) { - list <string> lines = splitstring( output["stdout"]:"", "\n" ); + list <string> lines = splitstring( output["stdout"]:"", "\n" ); + foreach( string line, (list<string>)lines, { + if ( regexpmatch( line, "^Status" ) ) + { + // Status: Failed interface not DCB capable + // Status: Successful + status = substring( line, 16 ); + } } ); + if ( status == "Successful" ) + { + ret = "yes"; + } } else { y2error( "Error: %1", output["stderr"]:"" ); Popup::Error ( output["stderr"]:"" ); - return "no"; } - return "no"; + return ret; } // @@ -305,7 +318,8 @@ * Read all fcoe-client settings * @return true on success */ -global boolean Read() { +global boolean Read() +{ /* FcoeClient read dialog caption */ string caption = _("Initializing fcoe-client Configuration"); @@ -318,24 +332,24 @@ // We do not set help text here, because it was set outside Progress::New( caption, " ", steps, [ - /* Progress stage 1/3 */ - _("Check installed packages"), - /* Progress stage 2/3 */ - _("Detect network cards"), - /* Progress stage 3/3 */ - _("Check services") - ], [ - /* Progress step 1/3 */ - _("Checking for installed packages..."), - /* Progress step 2/3 */ - _("Detecting network cards..."), - /* Progress step 3/3 */ - _("Checking for services..."), - /* Progress finished */ - _("Finished") - ], - "" - ); + /* Progress stage 1/3 */ + _("Check installed packages"), + /* Progress stage 2/3 */ + _("Detect network cards"), + /* Progress stage 3/3 */ + _("Check services") + ], [ + /* Progress step 1/3 */ + _("Checking for installed packages..."), + /* Progress step 2/3 */ + _("Detecting network cards..."), + /* Progress step 3/3 */ + _("Checking for services..."), + /* Progress finished */ + _("Finished") + ], + "" + ); // read database if(Abort()) return false; @@ -376,7 +390,8 @@ * Write all fcoe-client settings * @return true on success */ -global boolean Write() { +global boolean Write() +{ /* FcoeClient read dialog caption */ string caption = _("Saving fcoe-client Configuration"); @@ -389,20 +404,20 @@ // We do not set help text here, because it was set outside Progress::New(caption, " ", steps, [ - /* Progress stage 1/2 */ - _("Write the settings"), - /* Progress stage 2/2 */ - _("Run SuSEconfig") - ], [ - /* Progress step 1/2 */ - _("Writing the settings..."), - /* Progress step 2/2 */ - _("Running SuSEconfig..."), - /* Progress finished */ - _("Finished") - ], - "" - ); + /* Progress stage 1/2 */ + _("Write the settings"), + /* Progress stage 2/2 */ + _("Run SuSEconfig") + ], [ + /* Progress step 1/2 */ + _("Writing the settings..."), + /* Progress step 2/2 */ + _("Running SuSEconfig..."), + /* Progress finished */ + _("Finished") + ], + "" + ); boolean is_running = Progress::IsRunning(); y2milestone( "**** Progress still running: %1", is_running ); @@ -433,7 +448,8 @@ * @param settings The YCP structure to be imported. * @return boolean True on success */ -global boolean Import (map settings) { +global boolean Import (map settings) +{ // TODO FIXME: your code here (fill the above mentioned variables)... return true; } @@ -443,7 +459,8 @@ * (For use by autoinstallation.) * @return map Dumped settings (later acceptable by Import ()) */ -global map Export () { +global map Export () +{ // TODO FIXME: your code here (return the above mentioned variables)... return $[]; } @@ -452,7 +469,8 @@ * Create a textual summary and a list of unconfigured cards * @return summary of the current configuration */ -global list Summary() { +global list Summary() +{ // TODO FIXME: your code here... /* Configuration summary text for autoyast */ return [ _("Configuration summary..."), [] ]; @@ -473,7 +491,8 @@ * installed. * @return map with 2 lists. */ -global map AutoPackages() { +global map AutoPackages() +{ // TODO FIXME: your code here... return $[ "install":[], "remove":[] ]; } -- 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] r63894 - in /trunk/fcoe-client/src: FcoeClient.ycp complex.ycp dialogs.ycp
by gs＠svn2.opensuse.org 03 May '11

03 May '11

Author: gs Date: Tue May 3 15:34:23 2011 New Revision: 63894 URL: http://svn.opensuse.org/viewcvs/yast?rev=63894&view=rev Log: add/check DCB capable Modified: trunk/fcoe-client/src/FcoeClient.ycp trunk/fcoe-client/src/complex.ycp trunk/fcoe-client/src/dialogs.ycp Modified: trunk/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/FcoeClient.ycp?r… ============================================================================== --- trunk/fcoe-client/src/FcoeClient.ycp (original) +++ trunk/fcoe-client/src/FcoeClient.ycp Tue May 3 15:34:23 2011 @@ -221,11 +221,40 @@ } // +// Check whether the network interface (netcard, e.g. eth0 is DCB capable) +// +string DCBCapable( string netcard ) +{ + string command = sformat( "LANG=POSIX dcbtool gc %1 dcb", netcard ); + y2milestone( "Executing command: %1", command ); + + // TODO: lldpad must be started to be able to use dcbtool + // -> started in CheckServices() -> Read() + // ACHTUNG: Reihenfolge !!! + map output = (map)SCR::Execute( .target.bash_output, command ); + y2milestone( "Output: %1", output); + + if ( output["exit"]:255 == 0 ) + { + list <string> lines = splitstring( output["stdout"]:"", "\n" ); + } + else + { + y2error( "Error: %1", output["stderr"]:"" ); + Popup::Error ( output["stderr"]:"" ); + return "no"; + } + + return "no"; +} + +// // Detect network interface cards (hardware probe) and get status // void DetectNetworkCards() { string vlan_interface = ""; + string dcb_capable = ""; list <map> netcards = (list<map>)SCR::Read(.probe.netcard); y2milestone( "Detected netcards: %1", netcards ); @@ -241,9 +270,12 @@ else vlan_interface = NOT_CONFIGURED; + dcb_capable = DCBCapable( card["dev_name"]:"" ); + info_list = add( info_list, card["dev_name"]:""); info_list = add( info_list, card["device"]:""); info_list = add( info_list, vlan_interface ); + info_list = add( info_list, dcb_capable ); info_list = add( info_list, status_map["FCOE_ENABLE"]:""); info_list = add( info_list, status_map["DCB_REQUIRED"]:""); Modified: trunk/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/complex.ycp?rev=… ============================================================================== --- trunk/fcoe-client/src/complex.ycp (original) +++ trunk/fcoe-client/src/complex.ycp Tue May 3 15:34:23 2011 @@ -89,26 +89,37 @@ } // +// Get current network interface (netcard) // -// -void AdjustButtons() +list GetCurrentNetcard() { + list card = []; + map <integer, list> netcards = FcoeClient::GetNetworkCards(); integer row = (integer)UI::QueryWidget( `id(`interfaces), `CurrentItem ); - list card = netcards[row]:[]; + card = netcards[row]:[]; + y2milestone( "Current row: %1 card: %2", row, card ); - y2milestone( "row: %1 card: %2", row, card ); + return card; +} + +// +// Adjust buttons, means set 'Change Settings' and 'Create VLAN' sensitive or insensitive +// +void AdjustButtons() +{ + list card = GetCurrentNetcard(); // check VLAN status if ( card[2]:"" == FcoeClient::NOT_CONFIGURED ) { UI::ChangeWidget( `id(`edit), `Enabled, false ); - UI::ChangeWidget( `id(`config), `Enabled, true ); + UI::ChangeWidget( `id(`create), `Enabled, true ); } else { UI::ChangeWidget( `id(`edit), `Enabled, true ); - UI::ChangeWidget( `id(`config), `Enabled, false ); + UI::ChangeWidget( `id(`create), `Enabled, false ); } } @@ -125,7 +136,7 @@ foreach ( integer row, list card, netcards, { table_items = add( table_items, `item(`id(row), card[0]:"", card[1]:"", card[2]:"", - card[3]:"", card[4]:"" ) + card[3]:"", card[4]:"", card[5]:"" ) ); }); @@ -182,13 +193,30 @@ if ( action == `edit ) { - y2milestone( "Action: %1, returning `edit", action); + y2milestone( "Action: %1, returning %1", action); return `edit; } else if ( action == `interfaces ) { AdjustButtons(); } + else if ( action == `create ) + { + list card = (list)GetCurrentNetcard(); + string dev_name = card[0]:""; + boolean ret = Popup::YesNoHeadline( _("Creating VLAN Interface"), + sformat( _("Do you really want to create + a VLAN Interface on %1?"), dev_name ) ); + if ( ret == true ) + { + string command = sformat( "fipvlan -c -s %1", dev_name ); + y2milestone( "Executing command: %1", command ); + } + else + { + y2milestone( "Creating VLAN interface canceled" ); + } + } return nil; } Modified: trunk/fcoe-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/dialogs.ycp?rev=… ============================================================================== --- trunk/fcoe-client/src/dialogs.ycp (original) +++ trunk/fcoe-client/src/dialogs.ycp Tue May 3 15:34:23 2011 @@ -82,12 +82,12 @@ return `MarginBox( mbox_x, mbox_y, `VBox( `Table(`id(`interfaces), `opt(`notify, `immediate ), - `header(_("Device Name"), _("Model"), _("VLAN Interface"), + `header(_("Device Name"), _("Model"), _("VLAN Interface"), _("DCB capable"), _("FCoE Enabled"), _("DCB Required")), [] ), `Left(`HBox( `PushButton(`id(`edit), _("Change &Settings") ), - `PushButton(`id(`config), _("Create &VLAN Interface")) ) + `PushButton(`id(`create), _("Create &VLAN Interface")) ) ) ) ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0