May 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r63911 - in /trunk/control-center: VERSION.cmake package/yast2-control-center.changes src/kcategorizedview.cpp
by tgoettlicher＠svn2.opensuse.org 05 May '11

05 May '11

Author: tgoettlicher Date: Thu May 5 15:59:15 2011 New Revision: 63911 URL: http://svn.opensuse.org/viewcvs/yast?rev=63911&view=rev Log: - Fixed module highlighting when window is scrolled (bnc #685446) - 2.21.2 Modified: trunk/control-center/VERSION.cmake trunk/control-center/package/yast2-control-center.changes trunk/control-center/src/kcategorizedview.cpp Modified: trunk/control-center/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/VERSION.cmake?rev… ============================================================================== --- trunk/control-center/VERSION.cmake (original) +++ trunk/control-center/VERSION.cmake Thu May 5 15:59:15 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "2") Modified: trunk/control-center/package/yast2-control-center.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/package/yast2-con… ============================================================================== --- trunk/control-center/package/yast2-control-center.changes (original) +++ trunk/control-center/package/yast2-control-center.changes Thu May 5 15:59:15 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu May 5 15:57:43 CEST 2011 - tgoettlicher(a)suse.de + +- Fixed module highlighting when window is scrolled (bnc #685446) +- 2.21.2 + +------------------------------------------------------------------- Wed Apr 27 17:22:24 CEST 2011 - tgoettlicher(a)suse.de - Removed useless warning message (bnc #620617) Modified: trunk/control-center/src/kcategorizedview.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/kcategorizedv… ============================================================================== --- trunk/control-center/src/kcategorizedview.cpp (original) +++ trunk/control-center/src/kcategorizedview.cpp Thu May 5 15:59:15 2011 @@ -697,6 +697,8 @@ } } + + void KCategorizedView::selectCategory( const QString cat ) { QRect previous = d->categoryVisualRect( d->selectedCategory ); @@ -917,147 +919,6 @@ d->updateScrollbars(); } -/*void KCategorizedView::setSelection(const QRect &rect, - QItemSelectionModel::SelectionFlags flags) -{ - if (!d->proxyModel || !d->categoryDrawer || !d->proxyModel->isCategorizedModel()) - { - QListView::setSelection(rect, flags); - return; - } - - if (!flags) - return; - - if (flags & QItemSelectionModel::Clear) - { - selectionModel()->clear(); - d->lastSelection.clear(); - } - - QModelIndexList dirtyIndexes = d->intersectionSet(rect); - - // no items affected, just leave - if (!dirtyIndexes.count()) - { - selectionModel()->select(d->lastSelection, QItemSelectionModel::SelectCurrent); - - return; - } - - QModelIndex topLeft; - QModelIndex bottomRight; - - if (d->mouseButtonPressed || d->rightMouseButtonPressed) // selection with click + drag - { - QItemSelection selection; - - QModelIndex prev = dirtyIndexes[0]; - QModelIndex first = prev; - foreach (const QModelIndex &index, dirtyIndexes) - { - // we have a different interval. non-contiguous items - if ((index.row() - prev.row()) > 1) { - selection << QItemSelectionRange(first, prev); - - first = index; - } - - prev = index; - } - - selection << QItemSelectionRange(first, prev); - - if (flags & QItemSelectionModel::Current) - { - if (rect.topLeft() == rect.bottomRight()) - { - selectionModel()->setCurrentIndex(indexAt(rect.topLeft()), QItemSelectionModel::NoUpdate); - } - - selection.merge(d->lastSelection, flags); - } - else - { - selection.merge(selectionModel()->selection(), flags); - - selectionModel()->select(selection, QItemSelectionModel::SelectCurrent); - - return; - } - - selectionModel()->select(selection, flags); - } - else // selection with click + keyboard keys - { - QModelIndex topLeftIndex = indexAt(QPoint(rect.topLeft().x(), - rect.topLeft().y())); - QModelIndex bottomRightIndex = indexAt(QPoint(rect.bottomRight().x(), - rect.bottomRight().y())); - - // keyboard selection comes "upside down". Let's normalize it - if (topLeftIndex.row() > bottomRightIndex.row()) - { - QModelIndex auxIndex = topLeftIndex; - topLeftIndex = bottomRightIndex; - bottomRightIndex = auxIndex; - } - - int viewportWidth = viewport()->width() - spacing(); - int itemWidth; - - if (gridSize().isEmpty()) - { - itemWidth = d->biggestItemSize.width(); - } - else - { - itemWidth = gridSize().width(); - } - - int itemWidthPlusSeparation = spacing() + itemWidth; - if (!itemWidthPlusSeparation) - itemWidthPlusSeparation++; - int elementsPerRow = viewportWidth / itemWidthPlusSeparation; - if (!elementsPerRow) - elementsPerRow++; - - QModelIndexList theoricDirty(dirtyIndexes); - dirtyIndexes.clear(); - int first = model()->rowCount(); - int last = 0; - - foreach (const QModelIndex &index, theoricDirty) - { - if ((index.row() < first) && - ((((topLeftIndex.row() / elementsPerRow) == (index.row() / elementsPerRow)) && - ((topLeftIndex.row() % elementsPerRow) <= (index.row() % elementsPerRow))) || - (topLeftIndex.row() / elementsPerRow) != (index.row() / elementsPerRow))) - { - first = index.row(); - topLeft = index; - } - - if ((index.row() > last) && - ((((bottomRightIndex.row() / elementsPerRow) == (index.row() / elementsPerRow)) && - ((bottomRightIndex.row() % elementsPerRow) >= (index.row() % elementsPerRow))) || - (bottomRightIndex.row() / elementsPerRow) != (index.row() / elementsPerRow))) - { - last = index.row(); - bottomRight = index; - } - } - - for (int i = first; i <= last; i++) - { - dirtyIndexes << model()->index(i, theoricDirty[0].column(), theoricDirty[0].parent()); - } - - QItemSelection selection(topLeft, bottomRight); - - selectionModel()->select(selection, flags); - } -}*/ void KCategorizedView::mouseMoveEvent(QMouseEvent *event) { @@ -1126,6 +987,7 @@ viewport()->update(rect); } + viewport()->update(); } void KCategorizedView::mousePressEvent(QMouseEvent *event) @@ -1178,28 +1040,6 @@ if (/*(selectionMode() != SingleSelection) && (selectionMode() != NoSelection) &&*/ (initialPressPosition == d->initialPressPosition)) { - /*foreach(const QString &category, d->categories) - { - if (d->categoryVisualRect(category).contains(event->pos()) && - selectionModel()) - { - QItemSelection selection; = selectionModel()->selection(); - QModelIndexList indexList = d->categoriesIndexes[category]; - - foreach (const QModelIndex &index, indexList) - { - QModelIndex selectIndex = index.model()->index(index.row(), 0); - if( d->visualRectInViewport( selectIndex ).contains(initialPressPosition)) - { - selection << QItemSelectionRange(selectIndex); - //selectionModel()->select(selection, QItemSelectionModel::SelectCurrent); - //selectionModel()->setCurrentIndex(selectIndex, QItemSelectionModel::SelectCurrent); - selectionModel()->select(selectIndex, QItemSelectionModel::SelectCurrent); - } - } - - //} - }*/ selectionModel()->select( d->hovered, QItemSelectionModel::SelectCurrent); } -- 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] r63910 - in /trunk/ldap-server: ./ src/LdapServer.pm
by rhafer＠svn2.opensuse.org 05 May '11

05 May '11

Author: rhafer Date: Thu May 5 15:59:01 2011 New Revision: 63910 URL: http://svn.opensuse.org/viewcvs/yast?rev=63910&view=rev Log: silence perl error message when creating db without rootpw (merged r63909 from SuSE-Code-11-SP2-Branch) Modified: trunk/ldap-server/ (props changed) trunk/ldap-server/src/LdapServer.pm Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Thu May 5 15:59:01 2011 @@ -1690,8 +1690,10 @@ $self->WriteServiceEnabled( $dbDefaults{'serviceEnabled'} ); $self->WriteSLPEnabled( $dbDefaults{'slpRegister'} ); - - my $pwHash = $self->HashPassword($dbDefaults{'pwenctype'}, $dbDefaults{'rootpw_clear'} ); + my $pwHash = ""; + if ( $dbDefaults{'pwenctype'} && $dbDefaults{'rootpw_clear'} ) { + $pwHash = $self->HashPassword($dbDefaults{'pwenctype'}, $dbDefaults{'rootpw_clear'} ); + } my $database = { 'type' => $dbDefaults{'type'}, 'suffix' => $dbDefaults{'suffix'}, 'rootdn' => $dbDefaults{'rootdn'}, -- 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] r63909 - /branches/SuSE-Code-11-SP2-Branch/ldap-server/src/LdapServer.pm
by rhafer＠svn2.opensuse.org 05 May '11

05 May '11

Author: rhafer Date: Thu May 5 15:55:07 2011 New Revision: 63909 URL: http://svn.opensuse.org/viewcvs/yast?rev=63909&view=rev Log: silence perl error message when creating db without rootpw Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/LdapServer.pm Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/src/LdapServer.pm (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/src/LdapServer.pm Thu May 5 15:55:07 2011 @@ -1690,8 +1690,10 @@ $self->WriteServiceEnabled( $dbDefaults{'serviceEnabled'} ); $self->WriteSLPEnabled( $dbDefaults{'slpRegister'} ); - - my $pwHash = $self->HashPassword($dbDefaults{'pwenctype'}, $dbDefaults{'rootpw_clear'} ); + my $pwHash = ""; + if ( $dbDefaults{'pwenctype'} && $dbDefaults{'rootpw_clear'} ) { + $pwHash = $self->HashPassword($dbDefaults{'pwenctype'}, $dbDefaults{'rootpw_clear'} ); + } my $database = { 'type' => $dbDefaults{'type'}, 'suffix' => $dbDefaults{'suffix'}, 'rootdn' => $dbDefaults{'rootdn'}, -- 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] r63908 - /trunk/fcoe-client/src/FcoeClient.ycp
by gs＠svn2.opensuse.org 05 May '11

05 May '11

Author: gs Date: Thu May 5 14:33:30 2011 New Revision: 63908 URL: http://svn.opensuse.org/viewcvs/yast?rev=63908&view=rev Log: check return value of SCR::Write 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 Thu May 5 14:33:30 2011 @@ -250,18 +250,37 @@ { string file_name = sformat( "/etc/fcoe/cfg-%1", vlan_device_name ); y2milestone( "VLAN channel %1 found, reading %2", vlan_device_name, file_name ); - content = (string)SCR::Read(.target.string, file_name); + if ( content == "" || content == nil ) { - y2warning( "Cannot read %1", file_name ); - file_name = substring( file_name, 0, size(file_name)-5 ); // remove '-fcoe'; - content = (string)SCR::Read(.target.string, file_name); + // remove '-fcoe' and try again + y2milestone( "Reading %1", substring( file_name, 0, size(file_name)-5 ) ); + content = (string)SCR::Read(.target.string, substring( file_name, 0, size(file_name)-5 ) ); } - if ( content == "" || content == nil ) { - y2warning( "Cannot read %1", file_name ); + y2milestone( "Cannot read cfg-file creating %1 with default values from /etc/fcoe/cfg-ethx", + file_name ); + string def_values = (string)SCR::Read( .target.string, "/etc/fcoe/cfg-ethx" ); + + if ( def_values != "" ) + { + boolean ret = SCR::Write( .target.string, file_name, def_values ); + if ( ret == true ) + { + status_map = add( status_map, "FCOE_ENABLE", "yes"); + status_map = add( status_map, "DCB_REQUIRED", "yes"); + } + else + { + y2error( "Cannot create %1", file_name ); + } + } + else + { + y2error( "Cannot read /etc/fcoe/cfg-ethx" ); + } return status_map; } else @@ -362,6 +381,7 @@ if ( vlan_interface == "" ) { + // FCoE isn't enabled on the switch - we can't do anything here fcoe_vlan_interface = NOT_AVAILABLE; } else @@ -369,9 +389,14 @@ fcoe_vlan_interface = GetFcoeVlanInterface( card["dev_name"]:"", vlan_interface ); if ( fcoe_vlan_interface != "" ) + { status_map = GetFCoEStatus( fcoe_vlan_interface ); + } else + { + // FCoE VLAN interface not yet configured fcoe_vlan_interface = NOT_CONFIGURED; + } } dcb_capable = DCBCapable( card["dev_name"]:"" ); -- 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] r63907 - /trunk/fcoe-client/src/dialogs.ycp
by gs＠svn2.opensuse.org 05 May '11

05 May '11

Author: gs Date: Thu May 5 14:32:43 2011 New Revision: 63907 URL: http://svn.opensuse.org/viewcvs/yast?rev=63907&view=rev Log: labels changed Modified: trunk/fcoe-client/src/dialogs.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 Thu May 5 14:32:43 2011 @@ -58,7 +58,7 @@ `HStretch(), `HSpacing (1), `VBox( - `ComboBox( `id(`fcoe), _("FCoE Enabled"), + `ComboBox( `id(`fcoe), _("FCoE Enable"), [`item(`id("yes"), "yes" ), `item(`id("no"), "no", true ) ] ), @@ -103,12 +103,12 @@ return `MarginBox( mbox_x, mbox_y, `VBox( `Table(`id(`interfaces), `opt(`notify, `immediate ), - `header(_("Device Name"), _("Model"), _("VLAN Interface"), _("DCB capable"), - _("FCoE Enabled"), _("DCB Required")), + `header(_("Device Name"), _("Model"), _("FCoE VLAN Interface"), _("DCB capable"), + _("FCoE Enable"), _("DCB Required")), [] ), `Left(`HBox( `PushButton(`id(`edit), _("Change &Settings") ), - `PushButton(`id(`create), _("Create &VLAN Interface")) ) + `PushButton(`id(`create), _("Create FCoE &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

[yast-commit] r63906 - /trunk/fcoe-client/src/complex.ycp
by gs＠svn2.opensuse.org 05 May '11

05 May '11

Author: gs Date: Thu May 5 13:35:51 2011 New Revision: 63906 URL: http://svn.opensuse.org/viewcvs/yast?rev=63906&view=rev Log: get correct map entry Modified: trunk/fcoe-client/src/complex.ycp 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 Thu May 5 13:35:51 2011 @@ -254,11 +254,15 @@ y2milestone( "FCoE VLAN interface: %1", fcoe_vlan_interface ); // set new value in global map network_interfaces card[2] = fcoe_vlan_interface; + card[4] = status_map["FCOE_ENABLE"]:""; + card[5] = status_map["DCB_REQUIRED"]:""; FcoeClient::SetNetworkCardsValue( FcoeClient::current_card, card ); y2milestone( "Current network interfaces: %1", FcoeClient::GetNetworkCards() ); - y2milestone( "Replace value 2 in row %1 by %2", FcoeClient::current_card, fcoe_vlan_interface ); + // replace value in table UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 2), fcoe_vlan_interface ); + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 4), status_map["FCOE_ENABLE"]:"" ); + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 5), status_map["DCB_REQUIRED"]:"" ); AdjustButtons(); } -- 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] r63905 - in /trunk/fcoe-client/src: FcoeClient.ycp complex.ycp
by gs＠svn2.opensuse.org 05 May '11

05 May '11

Author: gs Date: Thu May 5 13:24:15 2011 New Revision: 63905 URL: http://svn.opensuse.org/viewcvs/yast?rev=63905&view=rev Log: bugfixes get FCoE VLAN interface Modified: trunk/fcoe-client/src/FcoeClient.ycp trunk/fcoe-client/src/complex.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 Thu May 5 13:24:15 2011 @@ -180,7 +180,7 @@ //------------------------------------------ //eth3 | 200 | 00:0d:ec:a2:ef:00 // -string GetVlanInterface( string interface ) +global string GetVlanInterface( string interface ) { string vlan_interface = ""; @@ -221,7 +221,7 @@ //Name-Type: VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD //eth3.200 | 200 | eth3 -string GetFcoeVlanInterface ( string interface, string vlan_interface ) +global string GetFcoeVlanInterface ( string interface, string vlan_interface ) { string vlan_device_name = ""; @@ -230,25 +230,35 @@ y2milestone( "Executing command: %1", command ); map output = (map)SCR::Execute( .target.bash_output, command ); - // read stdout (remove \n at the end) - vlan_interface = substring( output["stdout"]:"", 0, size(output["stdout"]:"") -1 ); - + y2milestone( "Output: %1", output ); + // read stdout (remove \n and white spaces) + vlan_device_name = deletechars( output["stdout"]:"", " \n\t" ); + + y2milestone( "Returning: %1", vlan_device_name ); return vlan_device_name; } // // Get status of FCoE and DCB from /etc/fcoe/cfg-eth<vlan_device_name> // -map <string, string> GetFCoEStatus( string vlan_device_name ) +global map <string, string> GetFCoEStatus( string vlan_device_name ) { map <string, string> status_map = $[]; + string content = ""; if ( vlan_device_name != "") { string file_name = sformat( "/etc/fcoe/cfg-%1", vlan_device_name ); y2milestone( "VLAN channel %1 found, reading %2", vlan_device_name, file_name ); - string content = (string)SCR::Read(.target.string, file_name); + content = (string)SCR::Read(.target.string, file_name); + if ( content == "" || content == nil ) + { + y2warning( "Cannot read %1", file_name ); + file_name = substring( file_name, 0, size(file_name)-5 ); // remove '-fcoe'; + content = (string)SCR::Read(.target.string, file_name); + } + if ( content == "" || content == nil ) { y2warning( "Cannot read %1", file_name ); @@ -258,6 +268,7 @@ { y2milestone( "Content: %1", content ); } + list <string> lines = splitstring( content, "\n" ); foreach( string line, (list<string>)lines, { @@ -387,6 +398,11 @@ return network_interfaces; } +global void SetNetworkCardsValue( integer row, list card ) +{ + network_interfaces[row] = card; +} + // // Read /etc/fcoe/config // 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 Thu May 5 13:24:15 2011 @@ -218,13 +218,54 @@ { 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 ) ); + boolean ret = Popup::YesNoHeadline( _("Creating and starting FCoE on detected VLAN device"), + sformat( _("Do you really want to create a network +interface on %1 for discovered FCoE VLAN interface +and start the FCoE initiator?"), dev_name ) ); if ( ret == true ) { + string vlan_interface = ""; + string fcoe_vlan_interface = ""; + map status_map = $[]; + // create and start FCoE with 'fipvlan -c -s eth3' + // revert this (in case of 'Abort') with 'vconfig rem eth3.200' string command = sformat( "fipvlan -c -s %1", dev_name ); y2milestone( "Executing command: %1", command ); + map output = (map)SCR::Execute( .target.bash_output, command ); + y2milestone( "Output: %1", output ); + + if ( output["exit"]:255 == 0 ) + { + // Get new status and exchange list (table) entry + vlan_interface = FcoeClient::GetVlanInterface( card[0]:"" ); + if ( vlan_interface == "" ) + { + fcoe_vlan_interface = FcoeClient::NOT_AVAILABLE; + } + else + { + fcoe_vlan_interface = FcoeClient::GetFcoeVlanInterface( card[0]:"", vlan_interface ); + + if ( fcoe_vlan_interface != "" ) + status_map = FcoeClient::GetFCoEStatus( fcoe_vlan_interface ); + else + fcoe_vlan_interface = FcoeClient::NOT_CONFIGURED; + } + y2milestone( "FCoE VLAN interface: %1", fcoe_vlan_interface ); + // set new value in global map network_interfaces + card[2] = fcoe_vlan_interface; + FcoeClient::SetNetworkCardsValue( FcoeClient::current_card, card ); + y2milestone( "Current network interfaces: %1", FcoeClient::GetNetworkCards() ); + y2milestone( "Replace value 2 in row %1 by %2", FcoeClient::current_card, fcoe_vlan_interface ); + // replace value in table + UI::ChangeWidget( `id( `interfaces), `Cell( FcoeClient::current_card, 2), fcoe_vlan_interface ); + AdjustButtons(); + + } + else + { + Popup::Error( sformat( _("Cannot create and start FCoE on %1"), dev_name ) ); + } } else { -- 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] r63904 - in /trunk/fcoe-client/src: FcoeClient.ycp complex.ycp
by gs＠svn2.opensuse.org 05 May '11

05 May '11

Author: gs Date: Thu May 5 12:03:46 2011 New Revision: 63904 URL: http://svn.opensuse.org/viewcvs/yast?rev=63904&view=rev Log: adjust steps, set column VLAN interface not configured or not available Modified: trunk/fcoe-client/src/FcoeClient.ycp trunk/fcoe-client/src/complex.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 Thu May 5 12:03:46 2011 @@ -132,6 +132,7 @@ global integer current_card = 0; // currently selected card, means row in list of cards global string NOT_CONFIGURED = "not configured"; +global string NOT_AVAILABLE = "not available"; // map containing information about networks cards and VLAN, FCoE aand DCB status map <integer, list> network_interfaces = $[]; @@ -165,42 +166,98 @@ return ret; } - // -// Check whether a VLAN interface is configured for a given network interface +// Check whether a VLAN interface is configured for FCoE on the switch (for given interface) +// +// Params: +// string interface network interface card, e.g. eth3 +// Return: +// string Vlan interface number, e.g. 200 +// Example: +// # fipvlan eth3 +//Fibre Channel Forwarders Discovered +//interface | VLAN | FCF MAC +//------------------------------------------ +//eth3 | 200 | 00:0d:ec:a2:ef:00 // -string GetVlanInterface ( string interface ) +string GetVlanInterface( string interface ) { string vlan_interface = ""; - string command = sformat( "sed -n 's/\$[^ ]*\$ *.*%1/\\1/p' /proc/net/vlan/config", - interface ); + + // check whether there is a VLAN interface which is configured for FCoE + string cmd_fcoe = sformat( "LANG=POSIX fipvlan %1", interface ); + y2milestone( "Executing command: %1", cmd_fcoe ); + map output = (map)SCR::Execute( .target.bash_output, cmd_fcoe ); + y2milestone( "Output: %1", output ); + + list <string> lines = splitstring( output["stdout"]:"", "\n" ); + foreach( string line, (list<string>)lines, { + // check whether there is a line for the given interface, e.g. + // eth3 | 200 | 00:0d:ec:a2:ef:00\n + // and extract name/number of VLAN channel. + if ( regexpmatch( line, sformat( "^%1", interface) ) ) + { + line = deletechars( line, " " ); + vlan_interface = substring( line, findfirstof( line, "|" )+1, + findlastof( line, "|" )-findfirstof( line, "|")-1 ); + y2milestone( "VLAN: %1", vlan_interface ); + } + } ); + + return vlan_interface; +} + +// +// Check whether the VLAN device is created (check entries in /proc/net/vlan/config) +// +// Params: +// string interface network interface card, e.g. eth3 +// string vlan_interface Vlan Interface configured for FCoE (on switch) +// Return: +// string Vlan device name, e.g. eth3.200 +// Example: +// # cat /proc/net/vlan/config +//VLAN Dev name | VLAN ID +//Name-Type: VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD +//eth3.200 | 200 | eth3 + +string GetFcoeVlanInterface ( string interface, string vlan_interface ) +{ + string vlan_device_name = ""; + + string command = sformat( "sed -n 's/\$[^ ]*\$ |.*%1*.*%2/\\1/p' /proc/net/vlan/config", + vlan_interface, interface ); y2milestone( "Executing command: %1", command ); map output = (map)SCR::Execute( .target.bash_output, command ); // read stdout (remove \n at the end) vlan_interface = substring( output["stdout"]:"", 0, size(output["stdout"]:"") -1 ); - return vlan_interface; + return vlan_device_name; } // -// Get status of FCoE and DCB from /etc/fcoe/cfg-eth<vlan_interface +// Get status of FCoE and DCB from /etc/fcoe/cfg-eth<vlan_device_name> // -map <string, string> GetFCoEStatus( string vlan_interface ) +map <string, string> GetFCoEStatus( string vlan_device_name ) { map <string, string> status_map = $[]; - if ( vlan_interface != "") + if ( vlan_device_name != "") { - string file_name = sformat( "/etc/fcoe/cfg-%1", vlan_interface ); - y2milestone( "VLAN channel %1 found, reading %2", vlan_interface, file_name ); + string file_name = sformat( "/etc/fcoe/cfg-%1", vlan_device_name ); + y2milestone( "VLAN channel %1 found, reading %2", vlan_device_name, file_name ); string content = (string)SCR::Read(.target.string, file_name); - if ( content == "" ) + if ( content == "" || content == nil ) + { y2warning( "Cannot read %1", file_name ); + return status_map; + } else + { y2milestone( "Content: %1", content ); - + } list <string> lines = splitstring( content, "\n" ); foreach( string line, (list<string>)lines, { @@ -279,6 +336,7 @@ void DetectNetworkCards() { string vlan_interface = ""; + string fcoe_vlan_interface = ""; string dcb_capable = ""; list <map> netcards = (list<map>)SCR::Read(.probe.netcard); @@ -288,22 +346,33 @@ foreach ( map card, netcards, { list info_list = []; map <string, string> status_map = $[]; - + vlan_interface = GetVlanInterface( card["dev_name"]:"" ); - if ( vlan_interface != "" ) - status_map = GetFCoEStatus( vlan_interface ); + + if ( vlan_interface == "" ) + { + fcoe_vlan_interface = NOT_AVAILABLE; + } else - vlan_interface = NOT_CONFIGURED; + { + fcoe_vlan_interface = GetFcoeVlanInterface( card["dev_name"]:"", vlan_interface ); + if ( fcoe_vlan_interface != "" ) + status_map = GetFCoEStatus( fcoe_vlan_interface ); + else + fcoe_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, fcoe_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"]:""); - + info_list = add( info_list, vlan_interface ); + network_interfaces = add( network_interfaces, row, info_list ); row = row + 1; } ); @@ -359,7 +428,7 @@ string caption = _("Initializing fcoe-client Configuration"); // Set the right number of stages - integer steps = 3; + integer steps = 4; integer sl = 500; sleep(sl); @@ -378,9 +447,9 @@ /* Progress step 1/3 */ _("Checking for installed packages..."), /* Progress step 2/3 */ - _("Detecting network cards..."), - /* Progress step 3/3 */ _("Checking for services..."), + /* Progress step 3/3 */ + _("Detecting network cards..."), /* Progress step 4/4 */ _("Reading /etc/fcoe/config" ), /* Progress finished */ 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 Thu May 5 12:03:46 2011 @@ -116,6 +116,11 @@ UI::ChangeWidget( `id(`edit), `Enabled, false ); UI::ChangeWidget( `id(`create), `Enabled, true ); } + else if ( card[2]:"" == FcoeClient::NOT_AVAILABLE ) + { + UI::ChangeWidget( `id(`edit), `Enabled, false ); + UI::ChangeWidget( `id(`create), `Enabled, false ); + } else { UI::ChangeWidget( `id(`edit), `Enabled, true ); -- 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] r63903 - /tags/stable-2_21_0/s390/
by aschnell＠svn2.opensuse.org 05 May '11

05 May '11

Author: aschnell Date: Thu May 5 11:14:56 2011 New Revision: 63903 URL: http://svn.opensuse.org/viewcvs/yast?rev=63903&view=rev Log: Created tag stable-2_21_0 for s390 Added: tags/stable-2_21_0/s390/ - copied from r63902, trunk/s390/ -- 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] r63902 - in /trunk/s390: VERSION package/yast2-s390.changes yast2-s390.spec.in
by aschnell＠svn2.opensuse.org 05 May '11

05 May '11

Author: aschnell Date: Thu May 5 11:13:26 2011 New Revision: 63902 URL: http://svn.opensuse.org/viewcvs/yast?rev=63902&view=rev Log: - set exclusive architecture to s390 and s390x (bnc #690511) Modified: trunk/s390/VERSION trunk/s390/package/yast2-s390.changes trunk/s390/yast2-s390.spec.in Modified: trunk/s390/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/VERSION?rev=63902&r1=63901&… ============================================================================== --- trunk/s390/VERSION (original) +++ trunk/s390/VERSION Thu May 5 11:13:26 2011 @@ -1 +1 @@ -2.19.5 +2.21.0 Modified: trunk/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/package/yast2-s390.changes?… ============================================================================== --- trunk/s390/package/yast2-s390.changes (original) +++ trunk/s390/package/yast2-s390.changes Thu May 5 11:13:26 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu May 05 11:10:41 CEST 2011 - aschnell(a)suse.de + +- set exclusive architecture to s390 and s390x (bnc #690511) +- 2.21.0 + +------------------------------------------------------------------- Tue Feb 15 10:48:06 CET 2011 - jsrain(a)suse.cz - added time-out when asking about formatting a disk during Modified: trunk/s390/yast2-s390.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/yast2-s390.spec.in?rev=6390… ============================================================================== --- trunk/s390/yast2-s390.spec.in (original) +++ trunk/s390/yast2-s390.spec.in Thu May 5 11:13:26 2011 @@ -4,10 +4,8 @@ Group: System/YaST License: GPL v2 or later BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite -Requires: yast2 -%ifarch s390 s390x -Requires: s390-tools -%endif +ExclusiveArch: s390 s390x +Requires: yast2 s390-tools Summary: YaST2 - S/390 Specific Features Configuration -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0