[yast-commit] r56890 - in /branches/SuSE-SLE-10-SP3-Branch/iscsi-client: VERSION package/yast2-iscsi-client.changes src/IscsiClient.ycp src/dialogs.ycp src/widgets.ycp src/wizards.ycp

21 Apr 2009

Author: mzugec
Date: Tue Apr 21 16:00:20 2009
New Revision: 56890

URL: http://svn.opensuse.org/viewcvs/yast?rev=56890&view=rev
Log:
changed dialogs workflow to allow to edit authentication for
 connection (fate#305306)

Modified:
    branches/SuSE-SLE-10-SP3-Branch/iscsi-client/VERSION
    branches/SuSE-SLE-10-SP3-Branch/iscsi-client/package/yast2-iscsi-client.changes
    branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/IscsiClient.ycp
    branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/dialogs.ycp
    branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/widgets.ycp
    branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/wizards.ycp

Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-client/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/iscsi-client/VERSION?rev=56890&r1=56889&r2=56890&view=diff
==============================================================================

--- branches/SuSE-SLE-10-SP3-Branch/iscsi-client/VERSION (original)
+++ branches/SuSE-SLE-10-SP3-Branch/iscsi-client/VERSION Tue Apr 21 16:00:20 2009
@@ -1 +1 @@
-2.14.46
+2.14.47

Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-client/package/yast2-iscsi-client.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/iscsi-client/package/yast2-iscsi-client.changes?rev=56890&r1=56889&r2=56890&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP3-Branch/iscsi-client/package/yast2-iscsi-client.changes (original)
+++ branches/SuSE-SLE-10-SP3-Branch/iscsi-client/package/yast2-iscsi-client.changes Tue Apr 21 16:00:20 2009
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Mon Mar  9 20:46:19 CET 2009 - mzugec@suse.de
+
+- changed dialogs workflow to allow to edit authentication for
+ connection (fate#305306)
+- 2.14.47 
+
+-------------------------------------------------------------------
 Tue Mar 10 13:07:53 CET 2009 - mzugec@suse.cz
 
 - autologin discovery authentication (bnc#392428)

Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/IscsiClient.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/IscsiClient.ycp?rev=56890&r1=56889&r2=56890&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/IscsiClient.ycp (original)
+++ branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/IscsiClient.ycp Tue Apr 21 16:00:20 2009
@@ -31,6 +31,7 @@
 global list <string> sessions = [];
 global list <string> discovered = [];
 global list <string> targets = [];
+global list<string> currentRecord = [];
 global boolean configured = false;
 boolean serviceStatus = false;
 map config = $[];
@@ -109,8 +110,8 @@
 }
 
 
-global map getNode(list<string> rec){
-  map cmd = (map)SCR::Execute(.target.bash_output, "iscsiadm -S -m node -T $TARGET -p $IP", $["TARGET":rec[1]:"", "IP":rec[0]:""]);
+global map getNode(){
+  map cmd = (map)SCR::Execute(.target.bash_output, "iscsiadm -S -m node -T $TARGET -p $IP", $["TARGET":currentRecord[1]:"", "IP":currentRecord[0]:""]);
  if (cmd["exit"]:0!=0) return $[];
  map auth = $[];
  foreach(string row, splitstring(cmd["stdout"]:"", "\n"), {
@@ -344,11 +345,11 @@
 }
 
 // delete deiscovered target from database
-global boolean deleteRecord(list<string> record){
+global boolean deleteRecord(){
  boolean ret = true;
- y2milestone("Delete record %1", record);
+ y2milestone("Delete record %1", currentRecord);
 
-    map retcode = (map)SCR::Execute(.target.bash_output, sformat("iscsiadm -m node -T %1 -p %2 --logout", record[1]:"", record[0]:""));
+    map retcode = (map)SCR::Execute(.target.bash_output, sformat("iscsiadm -m node -T %1 -p %2 --logout", currentRecord[1]:"", currentRecord[0]:""));
         if (size(retcode["stderr"]:"")>0) return false;
 
  readSessions();
@@ -356,10 +357,10 @@
 }
 
 // get (manual/automatic) status of target connecting
-global string getStartupStatus(list<string> record){
+global string getStartupStatus(){
  string status = "";
- y2milestone("Getting status of record %1", record);
-     map retcode = (map)SCR::Execute(.target.bash_output, sformat("iscsiadm -m node -T %1 -p %2", record[1]:"", record[0]:""));
+ y2milestone("Getting status of record %1", currentRecord);
+     map retcode = (map)SCR::Execute(.target.bash_output, sformat("iscsiadm -m node -T %1 -p %2", currentRecord[1]:"", currentRecord[0]:""));
     if (size(retcode["stderr"]:"")>0) return "";
     foreach(string row, splitstring(retcode["stdout"]:"", "\n"), {
      if (issubstring(row, "node.conn[0].startup")){
@@ -367,14 +368,14 @@
        break;
       }
     });
- y2milestone("Startup status for %1 is %2", record, status);
+ y2milestone("Startup status for %1 is %2", currentRecord, status);
  return status;
 }
 
 // update authentication value
-global boolean setValue(list<string> record, string name, string value){
- y2milestone("set %1  for record %2", name, record);
- string command = sformat("iscsiadm -m node -T %1 -p %2 --op=update --name=%3 --value=%4", record[1]:"", record[0]:"", name, value);
+global boolean setValue(string name, string value){
+ y2milestone("set %1  for record %2", name, currentRecord);
+ string command = sformat("iscsiadm -m node -T %1 -p %2 --op=update --name=%3 --value=%4", currentRecord[1]:"", currentRecord[0]:"", name, value);
  y2milestone("execute command - %1", command );
  boolean ret = true;
         map retcode = (map) SCR::Execute(.target.bash_output, command);
@@ -387,12 +388,12 @@
 }
 
 // check if given target is connected
-global boolean connected(list<string> rec, boolean check_ip){
-y2internal("check connected status for %1 with IP check:%2", rec, check_ip);
+global boolean connected(boolean check_ip){
+y2internal("check connected status for %1 with IP check:%2", currentRecord, check_ip);
  boolean ret = false;
  foreach(string row, sessions, {
  list<string> list_row = splitstring(row, " ");
-  if (list_row[1]:"" == rec[1]:"" && (check_ip ? splitstring(list_row[0]:"", ",")[0]:"" == splitstring(rec[0]:"", ",")[0]:"" : true)){
+  if (list_row[1]:"" == currentRecord[1]:"" && (check_ip ? splitstring(list_row[0]:"", ",")[0]:"" == splitstring(currentRecord[0]:"", ",")[0]:"" : true)){
    ret = true;
    break;
   }
@@ -401,11 +402,11 @@
 }
 
 // change startup status (manual/automatic) for target
-global boolean setStartupStatus(list<string> record, string status){
- y2milestone("Set startup status for %1 to %2", record, status);
+global boolean setStartupStatus(string status){
+ y2milestone("Set startup status for %1 to %2", currentRecord, status);
  boolean ret = true;
        map retcode = (map) SCR::Execute(.target.bash_output,
-			sformat("iscsiadm -m node -T %1 -p %2 --op=update --name=node.conn[0].startup --value=%3", record[1]:"", record[0]:"", status));
+			sformat("iscsiadm -m node -T %1 -p %2 --op=update --name=node.conn[0].startup --value=%3", currentRecord[1]:"", currentRecord[0]:"", status));
     if (size(retcode["stderr"]:"")>0) return false;
  return ret;
 }
@@ -417,9 +418,8 @@
  if ( b != $[] ){
   y2milestone("checking size of %1 and %2", b["iSCSI_TARGET_NAME"]:"", b["iSCSI_TARGET_IPADDR"]:"");
   if (size(b["iSCSI_TARGET_NAME"]:"")>0 && size(b["iSCSI_TARGET_IPADDR"]:"")>0){
-   list <string> curr_rec = [sformat("%1:%2", b["iSCSI_TARGET_IPADDR"]:"", b["iSCSI_TARGET_PORT"]:"3260"), b["iSCSI_TARGET_NAME"]:""];
-  y2milestone("variable curr_rec %1", curr_rec);
-   if (connected( curr_rec , false) == false){
+   currentRecord = [sformat("%1:%2", b["iSCSI_TARGET_IPADDR"]:"", b["iSCSI_TARGET_PORT"]:"3260"), b["iSCSI_TARGET_NAME"]:""];
+   if (connected( false) == false){
     y2milestone("in case not connected do discovery");
     // do discovery
     saveConfig(b["iSCSI_TARGET_CHAP_NAME_IN"]:"", b["iSCSI_TARGET_CHAP_PASSWORD_IN"]:"", b["iSCSI_TARGET_CHAP_NAME"]:"", b["iSCSI_TARGET_CHAP_PASSWORD"]:"");
@@ -429,14 +429,14 @@
   // do authentication if needed
       if (size(b["iSCSI_TARGET_CHAP_NAME"]:"")>0 && size(b["iSCSI_TARGET_CHAP_PASSWORD"]:"")>0){
 	y2milestone("do authentication with %1 and %2", b["iSCSI_TARGET_CHAP_NAME"]:"", b["iSCSI_TARGET_CHAP_PASSWORD"]:"");
-	setValue(curr_rec, "node.session.auth.username", b["iSCSI_TARGET_CHAP_NAME"]:"");
-	setValue(curr_rec, "node.session.auth.password", b["iSCSI_TARGET_CHAP_PASSWORD"]:"");
-	setValue(curr_rec, "node.session.auth.authmethod", "CHAP");
+	setValue("node.session.auth.username", b["iSCSI_TARGET_CHAP_NAME"]:"");
+	setValue("node.session.auth.password", b["iSCSI_TARGET_CHAP_PASSWORD"]:"");
+	setValue("node.session.auth.authmethod", "CHAP");
        }
       if (size(b["iSCSI_TARGET_CHAP_NAME_IN"]:"")>0 && size(b["iSCSI_TARGET_CHAP_PASSWORD_IN"]:"")>0){
 	y2milestone("do authentication with %1 and %2", b["iSCSI_TARGET_CHAP_NAME_IN"]:"", b["iSCSI_TARGET_CHAP_PASSWORD_IN"]:"");
-	setValue(curr_rec, "node.session.auth.username_in", b["iSCSI_TARGET_CHAP_NAME_IN"]:"");
-	setValue(curr_rec, "node.session.auth.password_in", b["iSCSI_TARGET_CHAP_PASSWORD_IN"]:"");
+	setValue("node.session.auth.username_in", b["iSCSI_TARGET_CHAP_NAME_IN"]:"");
+	setValue("node.session.auth.password_in", b["iSCSI_TARGET_CHAP_PASSWORD_IN"]:"");
        }
 
   // log on into target
@@ -444,7 +444,7 @@
 
   // set startup status to automatic
   y2milestone("set startup status to automatic");
-  setStartupStatus(curr_rec, "automatic");
+  setStartupStatus("automatic");
    } else y2error("Already connected, no autoLogOn needed");
   } else y2error("iSCSI_TARGET_NAME or iSCSI_TARGET_IPADDR are not available. Couldn't do autoLogOn");
  }
@@ -452,34 +452,35 @@
 }
 
 global boolean loginIntoTarget(map target){
- list<string> curr_rec = [target["portal"]:"", target["target"]:""];
+ currentRecord = [target["portal"]:"", target["target"]:""];
  if (target["authmethod"]:"None"!="None"){
   string user_in = target["username_in"]:"";
   string pass_in = target["password_in"]:"";
   if (size(user_in)>0 && size(pass_in)>0){
-   setValue(curr_rec, "node.session.auth.username_in", user_in);
-   setValue(curr_rec, "node.session.auth.password_in", pass_in);
+   setValue("node.session.auth.username_in", user_in);
+   setValue("node.session.auth.password_in", pass_in);
   } else{
-           setValue(curr_rec, "node.session.auth.username_in", "");
-           setValue(curr_rec, "node.session.auth.password_in", "");
+           setValue("node.session.auth.username_in", "");
+           setValue("node.session.auth.password_in", "");
    }
   string user_out = target["username"]:"";
   string pass_out = target["password"]:"";
   if (size(user_out)>0 && size(pass_out)>0){
-   setValue(curr_rec, "node.session.auth.username", user_out);
-   setValue(curr_rec, "node.session.auth.password", pass_out);
-   setValue(curr_rec, "node.session.auth.authmethod", "CHAP");
+   setValue("node.session.auth.username", user_out);
+   setValue("node.session.auth.password", pass_out);
+   setValue("node.session.auth.authmethod", "CHAP");
   } else {
-           setValue(curr_rec, "node.session.auth.username", "");
-           setValue(curr_rec, "node.session.auth.password", "");
-           setValue(curr_rec, "node.session.auth.authmethod", "");
+           setValue("node.session.auth.username", "");
+           setValue("node.session.auth.password", "");
+           setValue("node.session.auth.authmethod", "");
     }
- } else setValue(curr_rec, "node.session.auth.authmethod", "None");
+ } else setValue("node.session.auth.authmethod", "None");
 
   map output = (map)SCR::Execute(.target.bash_output,
 		sformat("iscsiadm -m node -T %1 -p %2 --login", target["target"]:"", target["portal"]:""));
 y2internal("output %1", output);
- if (!Mode::autoinst()) setStartupStatus(curr_rec, "automatic");
+ currentRecord = [target["portal"]:"", target["target"]:""];
+ if (!Mode::autoinst()) setStartupStatus("automatic");
  return output["exit"]:-1==0;
 }
 
@@ -520,11 +521,12 @@
  foreach(string sess, sessions, {
  string target = splitstring(sess, " ")[1]:"";
  string portal = splitstring(sess, " ")[0]:"";
- map auth = getNode([portal, target]);
+ currentRecord = [portal, target];
+ map auth = getNode();
  map new_target =
 		$["target": target,
 		"portal"  : portal,
-		"startup" : getStartupStatus([portal, target]),
+		"startup" : getStartupStatus(),
 		];
  if (auth["authmethod"]:"None"=="None") new_target["authmethod"]="None";
 	else new_target = union(new_target, auth);
@@ -644,9 +646,10 @@
  }
 });
  foreach(map target, ay_settings["targets"]:[], {
-y2internal("login into target %1", target);
+ y2internal("login into target %1", target);
+  currentRecord = [target["portal"]:"", target["target"]:""];
   loginIntoTarget(target);
-  setStartupStatus([target["portal"]:"", target["target"]:""], target["startup"]:"manual");
+  setStartupStatus(target["startup"]:"manual");
  });
  return true;
 }

Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/dialogs.ycp?rev=56890&r1=56889&r2=56890&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/dialogs.ycp (original)
+++ branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/dialogs.ycp Tue Apr 21 16:00:20 2009
@@ -80,8 +80,9 @@
 			),
 		  `Left(`HBox(
 			`PushButton(`id(`add), _("Add")),
-			`PushButton(`id(`del), _("Log Out")),
-			`PushButton(`id(`toggle), _("Toggle Start-Up"))
+			`PushButton(`id(`edit), _("Edit")),
+			`PushButton(`id(`del), _("Log Out"))
+//			`PushButton(`id(`toggle), _("Toggle Start-Up"))
 			))
 		  ),
 		"init"	: initConnectedTable,
@@ -133,22 +134,24 @@
                "widget" : `custom,
                 "custom_widget" :
                  `VBox(
-			`Left( `CheckBox(`id(`auth_none),`opt(`notify), _("No Authentication"), true) ),
-			`VSpacing(2),
-			`Left( `CheckBox(`id(`auth_in),`opt(`notify), _("Incoming Authentication"), false) ),
-			`HBox(
-				`TextEntry(`id(`user_in), _("Username")), `Password(`id(`pass_in), _("Password"))
-			  ),
-			`VSpacing(2),
-			`Left( `CheckBox(`id(`auth_out),`opt(`notify), _("Outgoing Authentication"), false) ),
-			`HBox(
-				`TextEntry(`id(`user_out), _("Username")), `Password(`id(`pass_out), _("Password"))
-			  )
+			`CheckBoxFrame(`id(`auth_none), `opt(`invertAutoEnable), _("No Authentication"), true ,
+			    `VBox(
+				`Left(`Label(_("Incoming Authentication"))),
+				`HBox(
+					`TextEntry(`id(`user_in), _("Username")), `Password(`id(`pass_in), _("Password"))
+				  ),
+				`VSpacing(2),
+				`Left( `Label(_("Outgoing Authentication"))),
+				`HBox(
+					`TextEntry(`id(`user_out), _("Username")), `Password(`id(`pass_out), _("Password"))
+				     )
+				)
+			)
                   ),
 		"init"	: initDiscAuth,
-		"handle" : handleDiscAuth,
-		"validate_type" : `function,
-		"validate_function" : validateDiscAuth,
+//		"handle" : handleDiscAuth,
+//		"validate_type" : `function,
+//		"validate_function" : validateDiscAuth,
 		"help"	:	HELPS["conn_auth"]:""
 	],
 
@@ -157,25 +160,37 @@
                "widget" : `custom,
                 "custom_widget" :
                  `VBox(
-			`Left( `CheckBox(`id(`auth_none),`opt(`notify), _("No Authentication"), true) ),
-			`VSpacing(2),
-			`Left( `CheckBox(`id(`auth_in),`opt(`notify), _("Incoming Authentication"), false) ),
-			`HBox(
-				`TextEntry(`id(`user_in), _("Username")), `Password(`id(`pass_in), _("Password"))
-			  ),
-			`VSpacing(2),
-			`Left( `CheckBox(`id(`auth_out),`opt(`notify), _("Outgoing Authentication"), false) ),
-			`HBox(
-				`TextEntry(`id(`user_out), _("Username")), `Password(`id(`pass_out), _("Password"))
-			  )
+			`CheckBoxFrame(`id(`auth_none),`opt(`invertAutoEnable), _("No Authentication"), true,
+			    `VBox(
+				`Left( `Label(_("Incoming Authentication")) ),
+				`HBox(
+					`TextEntry(`id(`user_in), _("Username")), `Password(`id(`pass_in), _("Password"))
+				  ),
+				`VSpacing(2),
+				`Left( `Label(_("Outgoing Authentication")) ),
+				`HBox(
+					`TextEntry(`id(`user_out), _("Username")), `Password(`id(`pass_out), _("Password"))
+				  )
+				)
+			)
                   ),
 		"init"  : initConnAuth,
-		"handle" : handleDiscAuth,
+//		"handle" : handleDiscAuth,
 		"validate_type" : `function,
 		"validate_function" : validateConnAuth,
 		"help"	: HELPS["conn_auth"]:""
 	],
 
+	"startup" : $[
+		"widget" : `combobox,
+		"opt"	: [`hstretch, `notify],
+		"label"	: _("Startup"),
+		"items" : [
+			["manual", "manual"],
+			["onboot", "onboot"],
+			["automatic", "automatic"]
+			]
+	],
 	// widget for portal address
 	"server_location" : $[
 		"widget" : `custom,
@@ -361,7 +376,7 @@
 any ConnAuthDialog(string return_to){
      current_tab = return_to;
     string caption = _("iSCSI Initiator Discovery");
-    list > w = CWM::CreateWidgets (["conn_auth"], (map  >)widgets);
+    list > w = CWM::CreateWidgets (["startup", "conn_auth"], (map  >)widgets);
         term contents =
                           `VBox(
                           `VStretch(),
@@ -370,6 +385,7 @@
                            `HSpacing (1),
                             `VBox(
                                 w[0, "widget"]:`VSpacing (1),
+                                w[1, "widget"]:`VSpacing (1),
 				`VSpacing (2)
                                 ),
                            `HSpacing (1),

Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/widgets.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/widgets.ycp?rev=56890&r1=56889&r2=56890&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/widgets.ycp (original)
+++ branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/widgets.ycp Tue Apr 21 16:00:20 2009
@@ -3,7 +3,6 @@
  import "IP";
 
  boolean stat = false;
- list<string> curr_rec = [];
  boolean bg_finish = false;
 // string initiatorname="";
 // function for run command in background
@@ -96,8 +95,8 @@
      list <term> items = [];
      integer row = 0;
      foreach(string s, IscsiClient::sessions, {
-     list<string> row_in_string = splitstring(s, " ");
-	items = add(items, `item(`id(row), row_in_string[0]:"", row_in_string[1]:"", IscsiClient::getStartupStatus(row_in_string)));
+     IscsiClient::currentRecord = splitstring(s, " ");
+	items = add(items, `item(`id(row), IscsiClient::currentRecord[0]:"", IscsiClient::currentRecord[1]:"", IscsiClient::getStartupStatus()));
       row = row + 1;
      });
         UI::ChangeWidget (`id (`connected), `Items, items);
@@ -106,21 +105,20 @@
 }
 
 // get record identificator from selected row
-list<string> getRecord(){
- list<string> record = [];
+list<string> setRecord(){
+ IscsiClient::currentRecord = [];
  any sel_item = UI::QueryWidget(`id(`connected), `CurrentItem);
  if (sel_item != nil){
 	 integer current = tointeger(sel_item);
-	 record = splitstring(IscsiClient::sessions[current]:"", " " );
+	 IscsiClient::currentRecord = splitstring(IscsiClient::sessions[current]:"", " " );
 //	 record = deletechars(record, "[]");
 	}
- return record;
+ return IscsiClient::currentRecord;
 }
 
 // handle for table of connected sessions
 symbol handleConnectedTable (string key, map event){
  if (event["EventReason"]:"" == "Activated"){
- list<string> record = [];
  switch((symbol)event["ID"]:nil){
   case(`add):
 		// add a new target, discovery
@@ -129,30 +127,35 @@
 		return `add;
   case(`del):
 		// delete (logout from) connected target
-		record = getRecord();
-		if (size( record )>0){
+		setRecord();
+		if (size( IscsiClient::currentRecord )>0){
 		  if (Popup::ContinueCancel(_("Really log out from the selected target?")))
-		    if ( !(IscsiClient::deleteRecord( record )) ) Popup::Error(_("Error occurred while logging out from the selected target."));
+		    if ( !(IscsiClient::deleteRecord()) ) Popup::Error(_("Error occurred while logging out from the selected target."));
 			else {
-				y2milestone("Delete record %1", record);
+				y2milestone("Delete record %1", IscsiClient::currentRecord);
 				initConnectedTable("");
 			     }
 		} else Popup::Error(_("No record found."));
 		break;
+  case(`edit):
+               setRecord();
+               return `edit;
+               break;
+
   case(`toggle):
 		// change manual/automatic status of connected target
-		record = getRecord();
-		if (size( record )>0){
-		y2milestone("toggle record %1", record);
-		string startup = IscsiClient::getStartupStatus(record);
+		setRecord();
+		if (size( IscsiClient::currentRecord )>0){
+		y2milestone("toggle record %1", IscsiClient::currentRecord);
+		string startup = IscsiClient::getStartupStatus();
 		if (size(startup)>0){
 		 if (startup == "manual"){
-				 y2milestone("Change status for %1 to %2", record, "automatic");
-				 IscsiClient::setStartupStatus(record, "automatic");
+				 y2milestone("Change status for %1 to %2", IscsiClient::currentRecord, "automatic");
+				 IscsiClient::setStartupStatus("automatic");
 				}
 			else {
-				y2milestone("Change status for %1 to %2", record, "manual");
-				IscsiClient::setStartupStatus(record, "manual");
+				y2milestone("Change status for %1 to %2", IscsiClient::currentRecord, "manual");
+				IscsiClient::setStartupStatus("manual");
 			     }
 		  initConnectedTable("");
 		 }
@@ -161,13 +164,13 @@
   }
  }
  // if nothing selected - disable some buttons, otherwise enable them
- if( getRecord() == []){
+ if( setRecord() == []){
    UI::ChangeWidget (`id (`del), `Enabled, false);
-   UI::ChangeWidget (`id (`toggle), `Enabled, false);
+   UI::ChangeWidget (`id (`edit), `Enabled, false);
 
   } else {
    UI::ChangeWidget (`id (`del), `Enabled, true);
-   UI::ChangeWidget (`id (`toggle), `Enabled, true);
+   UI::ChangeWidget (`id (`edit), `Enabled, true);
 
 	}
  return nil;
@@ -303,40 +306,46 @@
 // ***************** add table ***************************
 
 // set incoming widget status
+/*
 void setAuthIn(boolean status){
  UI::ChangeWidget(`id(`user_in),`Enabled, status );
  UI::ChangeWidget(`id(`pass_in),`Enabled, status );
  UI::ChangeWidget(`id(`auth_in),`Value, status );
  if(status) UI::ChangeWidget(`id(`auth_none),`Value, !status );
 }
+*/
 
 // set outgoing widget status
+/*
 void setAuthOut(boolean status){
  UI::ChangeWidget(`id(`user_out),`Enabled, status );
  UI::ChangeWidget(`id(`pass_out),`Enabled, status );
  UI::ChangeWidget(`id(`auth_out),`Value, status );
  if(status) UI::ChangeWidget(`id(`auth_none),`Value, !status );
 }
+*/
 
 // disable both incoming and outgoing
 void initDiscAuth(string key){
- setAuthIn(false);
- setAuthOut(false);
+// setAuthIn(false);
+// setAuthOut(false);
 }
 
 void initConnAuth(string key){
- setAuthIn(false);
- setAuthOut(false);
- map auth = IscsiClient::getNode(curr_rec);
+// setAuthIn(false);
+// setAuthOut(false);
+ map auth = IscsiClient::getNode();
  if (size(auth)>0)
   {
     UI::ChangeWidget(`id(`user_in),`Value, auth["username_in"]:"" );
     UI::ChangeWidget(`id(`pass_in),`Value, auth["password_in"]:"" );
-   if ((size(auth["username_in"]:"")>0)&&(size(auth["password_in"]:"")>0)) setAuthOut(true);
+//   if ((size(auth["username_in"]:"")>0)&&(size(auth["password_in"]:"")>0)) setAuthOut(true);
    UI::ChangeWidget(`id(`user_out),`Value, auth["username"]:"" );
    UI::ChangeWidget(`id(`pass_out),`Value, auth["password"]:"" );
-   if ((size(auth["username"]:"")>0)&&(size(auth["password"]:"")>0)) setAuthOut(true);
+//   if ((size(auth["username"]:"")>0)&&(size(auth["password"]:"")>0)) setAuthOut(true);
   }
+ string startup=IscsiClient::getStartupStatus();
+ if(size(startup)>0) UI::ChangeWidget(`id("startup"), `Value, startup);
 }
 // handle for enable/disable widgets in authentication dialog
 symbol handleDiscAuth(string key, map event){
@@ -345,16 +354,16 @@
  switch((symbol)event["ID"]:nil){
   case(`auth_none):
 		status = (boolean)UI::QueryWidget(`id(`auth_none), `Value);
-		setAuthIn(!status);
-		setAuthOut(!status);
+//		setAuthIn(!status);
+//		setAuthOut(!status);
 		break;
   case(`auth_in):
 		status = (boolean)UI::QueryWidget(`id(`auth_in), `Value);
-		setAuthIn(status);
+//		setAuthIn(status);
 		break;
   case(`auth_out):
 		status = (boolean)UI::QueryWidget(`id(`auth_out), `Value);
-		setAuthOut(status);
+//		setAuthOut(status);
 		break;
   }
  }
@@ -398,12 +407,12 @@
  IscsiClient::getConfig();
 
  boolean auth_none = (boolean) UI::QueryWidget(`id(`auth_none), `Value);
- boolean auth_in = (boolean) UI::QueryWidget(`id(`auth_in), `Value);
- boolean auth_out = (boolean) UI::QueryWidget(`id(`auth_out), `Value);
  string user_in = tostring( UI::QueryWidget(`id(`user_in), `Value) );
  string pass_in = tostring( UI::QueryWidget(`id(`pass_in), `Value) );
  string user_out = tostring( UI::QueryWidget(`id(`user_out), `Value) );
  string pass_out = tostring( UI::QueryWidget(`id(`pass_out), `Value) );
+ boolean auth_in = (!auth_none && size(user_in)>0 && size(pass_in)>0);
+ boolean auth_out = (!auth_none && size(user_out)>0 && size(pass_out)>0);
 
  if (auth_none){
   user_in  = "";
@@ -429,8 +438,8 @@
  list<string>trg_list = runInBg( command );
  IscsiClient::targets = [];
 foreach(string row, trg_list, {
- list<string> tmp_list=splitstring(row, " ");
- if (issubstring(tmp_list[0]:"", sformat("%1:%2",ip,port))) IscsiClient::targets=add(IscsiClient::targets, sformat("%1 %2", tmp_list[0]:"", tmp_list[1]:""));
+ IscsiClient::currentRecord=splitstring(row, " ");
+ if (issubstring(IscsiClient::currentRecord[0]:"", sformat("%1:%2",ip,port))) IscsiClient::targets=add(IscsiClient::targets, sformat("%1 %2", IscsiClient::currentRecord[0]:"", IscsiClient::currentRecord[1]:""));
 });
  while(!bg_finish){};
  // restore old config
@@ -448,7 +457,8 @@
    any selected = UI::QueryWidget(`discovered, `CurrentItem);
    if (selected != nil) { params = splitstring( IscsiClient::discovered[tointeger(selected)]:"", " " ); }
         else  { params = []; }
- if ((params==[])||(IscsiClient::connected( [ splitstring(params[0]:"", ",")[0]:"", params[1]:""], true ))){
+ IscsiClient::currentRecord = [ splitstring(params[0]:"", ",")[0]:"", params[1]:""];
+ if ((params==[])||(IscsiClient::connected( true ))){
    UI::ChangeWidget (`id (`connect), `Enabled, false);
    UI::ChangeWidget (`id (`delete), `Enabled, false);
   } else{
@@ -462,10 +472,10 @@
      list <term> items = [];
      integer row = 0;
      foreach(string s, IscsiClient::getDiscovered(), {
-     list<string> row_in_string = splitstring(s, " ");
+     IscsiClient::currentRecord = splitstring(s, " ");
 //        string record = deletechars(row_in_string[0]:"", "[]");
-        items = add(items, `item(`id(row), row_in_string[0]:"", row_in_string[1]:"",
-		(IscsiClient::connected( row_in_string, true ))?_("True"):_("False") ));
+        items = add(items, `item(`id(row), IscsiClient::currentRecord[0]:"", IscsiClient::currentRecord[1]:"",
+		(IscsiClient::connected( true ))?_("True"):_("False") ));
       row = row + 1;
      });
 
@@ -480,13 +490,12 @@
    any selected = UI::QueryWidget(`discovered, `CurrentItem);
    if (selected != nil) { params = splitstring( IscsiClient::discovered[tointeger(selected)]:"", " " ); }
 	else  { params = []; }
-   curr_rec = [ splitstring(params[0]:"", ",")[0]:"", params[1]:"" ] ;
-    params = curr_rec;
+   IscsiClient::currentRecord = [ splitstring(params[0]:"", ",")[0]:"", params[1]:"" ] ;
  if ( event["EventReason"]:"" == "Activated" ){
   // connect new target
   if ( event["ID"]:nil == `connect) {
    // check if not already connected
-   if ( IscsiClient::connected( curr_rec , false) == true){
+   if ( IscsiClient::connected( false) == true){
      if (!Popup::AnyQuestion(Label::WarningMsg(), _("The target with this TargetName is already connected. Make sure that Multipathing is enabled to prevent data corruption."), _("Continue"), _("Cancel"), `focus_yes)) return nil;
     }
 
@@ -499,8 +508,8 @@
   }
   // delete connected item
   if ( event["ID"]:nil == `delete) {
-   if ((params == [])||(!IscsiClient::connected( curr_rec, true ))){
-	 SCR::Execute (.target.bash_output,sformat("iscsiadm -m node -T %1 -p %2 --op=delete", params[1]:"", params[0]:""),  $[] );
+   if ((params == [])||(!IscsiClient::connected( true ))){
+	 SCR::Execute (.target.bash_output,sformat("iscsiadm -m node -T %1 -p %2 --op=delete", IscsiClient::currentRecord[1]:"", IscsiClient::currentRecord[0]:""),  $[] );
 	 IscsiClient::readSessions();
 	 initDiscoveredTable("");
    if (selected != nil) { params = splitstring( IscsiClient::discovered[tointeger(selected)]:"", " " ); }
@@ -519,9 +528,9 @@
      list <term> items = [];
      integer row = 0;
      foreach(string s, IscsiClient::targets, {
-     list<string> row_in_string = splitstring(s, " ");
-        items = add(items, `item(`id(row), row_in_string[0]:"", row_in_string[1]:"",
-		(IscsiClient::connected( row_in_string, true ))?_("True"):_("False") ));
+     IscsiClient::currentRecord = splitstring(s, " ");
+        items = add(items, `item(`id(row), IscsiClient::currentRecord[0]:"", IscsiClient::currentRecord[1]:"",
+		(IscsiClient::connected( true ))?_("True"):_("False") ));
       row = row + 1;
      });
         UI::ChangeWidget (`id (`targets), `Items, items);
@@ -540,12 +549,13 @@
   if ( event["ID"]:nil == `connect) {
    // check if is not already connected
    list <string> params = splitstring( IscsiClient::targets[(integer)UI::QueryWidget(`targets, `CurrentItem)]:"", " " );
-   if ( IscsiClient::connected( params, true ) == true){
+   IscsiClient::currentRecord = params;
+   if ( IscsiClient::connected( true ) == true){
     Popup::Error(_("The target is already connected."));
    } else {
-	 curr_rec = [ splitstring(params[0]:"", ",")[0]:"", params[1]:"" ];
+	 IscsiClient::currentRecord = [ splitstring(params[0]:"", ",")[0]:"", params[1]:"" ];
    // check if not already connected
-   if ( IscsiClient::connected( curr_rec , false) == true){
+   if ( IscsiClient::connected( false) == true){
      if (!Popup::AnyQuestion(Label::WarningMsg(), _("The target with this TargetName is already connected. Make sure that Multipathing is enabled to prevent data corruption."), _("Continue"), _("Cancel"), `focus_yes)) return nil;
     }
 
@@ -562,31 +572,23 @@
 // login to target with authentication
 boolean validateConnAuth(string key, map event){
  boolean auth_none = (boolean) UI::QueryWidget(`id(`auth_none), `Value);
- boolean auth_in = (boolean) UI::QueryWidget(`id(`auth_in), `Value);
- boolean auth_out = (boolean) UI::QueryWidget(`id(`auth_out), `Value);
- string user_in = "";
- string pass_in = "";
- string user_out = "";
- string pass_out = "";
- if (auth_in){
-  user_in = tostring( UI::QueryWidget(`id(`user_in), `Value) );
-  pass_in = tostring( UI::QueryWidget(`id(`pass_in), `Value) );
- }
- if (auth_out){
-  user_out = tostring( UI::QueryWidget(`id(`user_out), `Value) );
-  pass_out = tostring( UI::QueryWidget(`id(`pass_out), `Value) );
- }
+ string  user_in = tostring( UI::QueryWidget(`id(`user_in), `Value) );
+ string  pass_in = tostring( UI::QueryWidget(`id(`pass_in), `Value) );
+ string  user_out = tostring( UI::QueryWidget(`id(`user_out), `Value) );
+ string  pass_out = tostring( UI::QueryWidget(`id(`pass_out), `Value) );
 
  map target=$[
-		"target" : curr_rec[1]:"",
-		"portal" : curr_rec[0]:"",
+		"target" : IscsiClient::currentRecord[1]:"",
+		"portal" : IscsiClient::currentRecord[0]:"",
 		"authmethod" : (auth_none)?"None":"CHAP",
 		"username" : user_out,
 		"password" : pass_out,
 		"username_in" : user_in,
 		"password_in" : pass_in
 		];
-  if (checkAuthEntry() && IscsiClient::loginIntoTarget(target)) {
+  if (IscsiClient::connected(false) || IscsiClient::loginIntoTarget(target)) {
+//		IscsiClientLib::currentRecord = [target["portal"]:"", target["target"]:""];
+		IscsiClient::setStartupStatus((string)UI::QueryWidget(`id("startup"), `Value));
 		 IscsiClient::readSessions();
 		 return true;
 		}

Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/wizards.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/wizards.ycp?rev=56890&r1=56889&r2=56890&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/wizards.ycp (original)
+++ branches/SuSE-SLE-10-SP3-Branch/iscsi-client/src/wizards.ycp Tue Apr 21 16:00:20 2009
@@ -31,6 +31,7 @@
 	"targets"	:   ``( TargetsDialog() ),
 	"conn_auth"	:   ``( ConnAuthDialog("client") ),
 	"conn_disc"	:   ``( ConnAuthDialog("discovered") ),
+	"edit_conn"	:   ``( ConnAuthDialog("client") ),
 	"disc"		:   ``( DiscAuthDialog("discovered") ),
     ];
 
@@ -41,6 +42,7 @@
 	    `abort	: `abort,
 	    `next	: `next,
 	    `add  : "disc_auth",
+	    `edit : "edit_conn",
 	    `conn : "conn_disc",
 	    `disc : "disc"
 	],
@@ -64,6 +66,10 @@
 	    `abort	: `abort,
 	    `next	: "targets"
 	],
+	"edit_conn" : $[
+	    `abort	: `abort,
+	    `next	: "global"
+	],
 	"disc"		: $[
 	    `abort	: `abort,
 	    `back	: `back,

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

[yast-commit] r56890 - in /branches/SuSE-SLE-10-SP3-Branch/iscsi-client: VERSION package/yast2-iscsi-client.changes src/IscsiClient.ycp src/dialogs.ycp src/widgets.ycp src/wizards.ycp

mzugec＠svn.opensuse.org