Mailinglist Archive: yast-commit (126 mails)

< Previous Next >
[yast-commit] r67636 - in /trunk/fcoe-client/src: FcoeClient.ycp complex.ycp dialogs.ycp
Author: gs
Date: Thu Mar 15 15:24:16 2012
New Revision: 67636

URL: http://svn.opensuse.org/viewcvs/yast?rev=67636&view=rev
Log:
reduce number of retries for 'fipvlan',
add button "Retry Detection"

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?rev=67636&r1=67635&r2=67636&view=diff
==============================================================================
--- trunk/fcoe-client/src/FcoeClient.ycp (original)
+++ trunk/fcoe-client/src/FcoeClient.ycp Thu Mar 15 15:24:16 2012
@@ -53,15 +53,28 @@
global boolean Modified();

/**
- * Data was modified?
+ * Data
+ */
+
+/**
+ * data modified?
*/
boolean modified = false;

/**
+ * proposal valid?
*/
boolean proposal_valid = false;

/**
+ * Number of retries for fipvlan (default is 20).
+ * The number is reduced to 10 to make detection faster. 10 seconds (10
retries *
+ * 1000 ms) should be enough time for most interfaces. If not there is the
+ * possibility to retry interface dedection using 'Retry'.
+ */
+string number_of_retries = "10";
+
+/**
* Write only, used during autoinstallation.
* Don't run services and SuSEconfig, it's all done at one place.
*/
@@ -292,7 +305,10 @@
// to be able to detect DCB state afterwards (see bnc #737683)
string vlan_cmd = "LANG=POSIX fipvlan -u";
map vlan_info = $[];
-
+
+ if ( !Mode::autoinst() )
+ vlan_cmd = vlan_cmd + " -l " + FcoeClient::number_of_retries; //
reduce number of retries
+
foreach ( string dev, (list<string>)net_devices, {
vlan_cmd = vlan_cmd + " " + dev;
} );

Modified: trunk/fcoe-client/src/complex.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/complex.ycp?rev=67636&r1=67635&r2=67636&view=diff
==============================================================================
--- trunk/fcoe-client/src/complex.ycp (original)
+++ trunk/fcoe-client/src/complex.ycp Thu Mar 15 15:24:16 2012
@@ -178,9 +178,8 @@
}
}

-
-void InitInterfacesDialog (string id) {
- y2milestone( "Init interfaces dialog" );
+void ShowInterfaces()
+{
string vlan_interface = "";
integer row = 0;

@@ -200,9 +199,17 @@
UI::ChangeWidget( `id(`interfaces), `Items, table_items );
// set current item
UI::ChangeWidget( `id(`interfaces), `CurrentItem, `id(0) );
+
FcoeClient::current_card = 0;

+}
+
+void InitInterfacesDialog (string id) {
+ y2milestone( "Init interfaces dialog" );
+
+ ShowInterfaces();
AdjustButtons();
+
}

//
@@ -276,6 +283,12 @@
FcoeClient::current_card = (integer)UI::QueryWidget( `id(`interfaces),
`CurrentItem );
AdjustButtons();
}
+ else if ( action == `retry )
+ {
+ FcoeClient::ResetNetworkCards();
+ FcoeClient::DetectNetworkCards();
+ ShowInterfaces();
+ }
else if ( action == `create )
{
// haendel:~/:[0]# fipvlan -c -s eth3

Modified: trunk/fcoe-client/src/dialogs.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/dialogs.ycp?rev=67636&r1=67635&r2=67636&view=diff
==============================================================================
--- trunk/fcoe-client/src/dialogs.ycp (original)
+++ trunk/fcoe-client/src/dialogs.ycp Thu Mar 15 15:24:16 2012
@@ -140,8 +140,9 @@
[]
),
// button labels
- `Left(`HBox( `PushButton(`id(`edit), _("Change
&Settings")),
- `PushButton(`id(`create), _("Create
FCoE &VLAN Interface")),
+ `Left(`HBox( `PushButton(`id(`retry), _("Retry
&Detection")),
+ `PushButton(`id(`edit), _("Change
&Settings")),
+ `PushButton(`id(`create), _("Create
&FCoE Interface")),
`PushButton(`id(`remove), _("&Remove
Interface")) )
)
)

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages