[yast-commit] r56867 - in /trunk/iscsi-client: VERSION package/yast2-iscsi-client.changes src/IscsiClient.ycp src/IscsiClientLib.ycp src/dialogs.ycp src/widgets.ycp src/wizards.ycp - YaST Commits

21 Apr 2009

Author: mzugec
Date: Tue Apr 21 09:29:28 2009
New Revision: 56867

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


Modified:
    trunk/iscsi-client/VERSION
    trunk/iscsi-client/package/yast2-iscsi-client.changes
    trunk/iscsi-client/src/IscsiClient.ycp
    trunk/iscsi-client/src/IscsiClientLib.ycp
    trunk/iscsi-client/src/dialogs.ycp
    trunk/iscsi-client/src/widgets.ycp
    trunk/iscsi-client/src/wizards.ycp

Modified: trunk/iscsi-client/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/VERSION?rev=56867&r1=56866&r2=56867&view=diff
==============================================================================

--- trunk/iscsi-client/VERSION (original)
+++ trunk/iscsi-client/VERSION Tue Apr 21 09:29:28 2009
@@ -1 +1 @@
-2.18.6
+2.18.7

Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi-client.changes?rev=56867&r1=56866&r2=56867&view=diff
==============================================================================
--- trunk/iscsi-client/package/yast2-iscsi-client.changes (original)
+++ trunk/iscsi-client/package/yast2-iscsi-client.changes Tue Apr 21 09:29:28 2009
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Tue Apr 21 09:23:21 CEST 2009 - mzugec@suse.cz
+
+- changed dialogs workflow to allow to edit authentication for
+ connection (fate#305306)
+- 2.18.7 
+
+-------------------------------------------------------------------
 Mon Mar 16 15:20:15 CET 2009 - mzugec@suse.cz
 
 - reload service when initiatorname is changed to re-read new value

Modified: trunk/iscsi-client/src/IscsiClient.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClient.ycp?rev=56867&r1=56866&r2=56867&view=diff
==============================================================================
--- trunk/iscsi-client/src/IscsiClient.ycp (original)
+++ trunk/iscsi-client/src/IscsiClient.ycp Tue Apr 21 09:29:28 2009
@@ -108,11 +108,12 @@
  foreach(string sess, IscsiClientLib::sessions, {
  string target = splitstring(sess, " ")[1]:"";
  string portal = splitstring(sess, " ")[0]:"";
- map auth = IscsiClientLib::getNode([portal, target]);
+ IscsiClientLib::currentRecord = [portal, target];
+ map auth = IscsiClientLib::getNode();
  map new_target =
 		$["target": target,
 		"portal"  : portal,
-		"startup" : IscsiClientLib::getStartupStatus([portal, target]),
+		"startup" : IscsiClientLib::getStartupStatus(),
 		];
  if (auth["authmethod"]:"None"=="None") new_target["authmethod"]="None";
 	else new_target = union(new_target, auth);

Modified: trunk/iscsi-client/src/IscsiClientLib.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.ycp?rev=56867&r1=56866&r2=56867&view=diff
==============================================================================
--- trunk/iscsi-client/src/IscsiClientLib.ycp (original)
+++ trunk/iscsi-client/src/IscsiClientLib.ycp Tue Apr 21 09:29:28 2009
@@ -12,6 +12,7 @@
 global list <string> sessions = [];
 global list <string> discovered = [];
 global list <string> targets = [];
+global list<string> currentRecord = [];
 
 // status of rcopen-iscsi service
 boolean serviceStatus = false;
@@ -80,7 +81,7 @@
  // use cache if available
  if (size(config)==0){
   config = (map) SCR::Read(.etc.iscsid.all);
-  y2milestone("read config %1", config);
+  y2debug("read config %1", config);
  }
  return config["value"]:[];
 }
@@ -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"), {
@@ -321,11 +322,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();
@@ -333,10 +334,10 @@
 }
 
 // get (manual/onboot) 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")){
@@ -344,14 +345,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);
@@ -365,12 +366,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;
   }
@@ -379,15 +380,16 @@
 }
 
 // change startup status (manual/onboot) 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;
 	else retcode = (map) SCR::Execute(.target.bash_output,
-        sformat("iscsiadm -m node -T %1 -p %2 --op=update --name=node.startup --value=%3", record[1]:"", record[0]:"", status));
+        sformat("iscsiadm -m node -T %1 -p %2 --op=update --name=node.startup --value=%3", currentRecord[1]:"", currentRecord[0]:"", status));
 
+y2internal("retcode %1", retcode);
  return ret;
 }
 
@@ -426,37 +428,38 @@
  return true;
 }
 */
+
 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 (output["exit"]:-1==0){
   // set startup status to auto by default (bnc#400610)
-  if (!Mode::autoinst()) setStartupStatus(curr_rec, "onboot");
+  if (!Mode::autoinst()) setStartupStatus("onboot");
   return true;
 /*
  } else {
@@ -524,7 +527,8 @@
  foreach(map target, ay_settings["targets"]:[], {
 y2internal("login into target %1", target);
   loginIntoTarget(target);
-  setStartupStatus([target["portal"]:"", target["target"]:""], target["startup"]:"manual");
+  currentRecord = [target["portal"]:"", target["target"]:""];
+  setStartupStatus(target["startup"]:"manual");
  });
  return true;
 }

Modified: trunk/iscsi-client/src/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/dialogs.ycp?rev=56867&r1=56866&r2=56867&view=diff
==============================================================================
--- trunk/iscsi-client/src/dialogs.ycp (original)
+++ trunk/iscsi-client/src/dialogs.ycp Tue Apr 21 09:29:28 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,
@@ -363,7 +378,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(),
@@ -372,6 +387,7 @@
                            `HSpacing (1),
                             `VBox(
                                 w[0, "widget"]:`VSpacing (1),
+                                w[1, "widget"]:`VSpacing (1),
 				`VSpacing (2)
                                 ),
                            `HSpacing (1),

Modified: trunk/iscsi-client/src/widgets.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/widgets.ycp?rev=56867&r1=56866&r2=56867&view=diff
==============================================================================
--- trunk/iscsi-client/src/widgets.ycp (original)
+++ trunk/iscsi-client/src/widgets.ycp Tue Apr 21 09:29:28 2009
@@ -96,8 +96,8 @@
      list <term> items = [];
      integer row = 0;
      foreach(string s, IscsiClientLib::sessions, {
-     list<string> row_in_string = splitstring(s, " ");
-	items = add(items, `item(`id(row), row_in_string[0]:"", row_in_string[1]:"", IscsiClientLib::getStartupStatus(row_in_string)));
+     IscsiClientLib::currentRecord = splitstring(s, " ");
+	items = add(items, `item(`id(row), IscsiClientLib::currentRecord[0]:"", IscsiClientLib::currentRecord[1]:"", IscsiClientLib::getStartupStatus()));
       row = row + 1;
      });
         UI::ChangeWidget (`id (`connected), `Items, items);
@@ -106,17 +106,17 @@
 }
 
 // get record identificator from selected row
-list<string> getRecord(){
- list<string> record = [];
+list<string> setRecord(){
+ IscsiClientLib::currentRecord = [];
  any sel_item = UI::QueryWidget(`id(`connected), `CurrentItem);
  if (sel_item != nil){
 	 integer current = tointeger(sel_item);
-	 record = splitstring(IscsiClientLib::sessions[current]:"", " " );
+	 IscsiClientLib::currentRecord = splitstring(IscsiClientLib::sessions[current]:"", " " );
 //	 record = deletechars(record, "[]");
 	} else
 	   if (size(IscsiClientLib::sessions)>0)
-			record = splitstring(IscsiClientLib::sessions[0]:"", " " );
- return record;
+			 IscsiClientLib::currentRecord = splitstring(IscsiClientLib::sessions[0]:"", " " );
+ return IscsiClientLib::currentRecord;
 }
 
 // handle for table of connected sessions
@@ -131,23 +131,27 @@
 		return `add;
   case(`del):
 		// delete (logout from) connected target
-		record = getRecord();
+		record = setRecord();
 		if (size( record )>0){
 		  if (Popup::ContinueCancel(_("Really log out from the selected target?")))
-		    if ( !(IscsiClientLib::deleteRecord( record )) ) Popup::Error(_("Error occurred while logging out from the selected target."));
+		    if ( !(IscsiClientLib::deleteRecord()) ) Popup::Error(_("Error occurred while logging out from the selected target."));
 			else {
 				y2milestone("Delete record %1", record);
 				initConnectedTable("");
 			     }
 		} else Popup::Error(_("No record found."));
 		break;
+  case(`edit):
+		record = setRecord();
+		return `edit;
+		break;
   case(`toggle):
 		// change manual/onboot status of connected target
 		// don't use automatic anymore (replaced by onboot) (bnc#449108)
-		record = getRecord();
+		record = setRecord();
 		if (size( record )>0){
 		y2milestone("toggle record %1", record);
-		string startup = IscsiClientLib::getStartupStatus(record);
+		string startup = IscsiClientLib::getStartupStatus();
 		if (size(startup)>0){
 		// toggle all 3 possible values (bnc#457252)
 		 list <string> options = ["manual", "onboot", "automatic"];
@@ -156,7 +160,7 @@
 		   if (startup==option){
 		     startup=options[(size(options)>pos+1) ? pos+1 : 0]:"";
 		     y2milestone("Changing state from %1 to %2", option, startup );
-		     IscsiClientLib::setStartupStatus(record, startup);
+		     IscsiClientLib::setStartupStatus(startup);
 		     break;
 		   }
 		   pos=pos+1;
@@ -168,13 +172,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;
@@ -305,39 +309,43 @@
 // ***************** 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 = IscsiClientLib::getNode(curr_rec);
+// setAuthIn(false);
+// setAuthOut(false);
+ map auth = IscsiClientLib::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);
   }
 }
 // handle for enable/disable widgets in authentication dialog
@@ -347,16 +355,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;
   }
  }
@@ -382,21 +390,26 @@
  string ip = tostring(UI::QueryWidget(`hostname, `Value));
  string port = tostring(UI::QueryWidget(`port, `Value));
  // validate IP address
-if (!IscsiClientLib::useISNS()) 
+if (!IscsiClientLib::useISNS())
  {
-  if (!IP::Check4(ip)) {
+  if (size(ip)>0){
+      if (!IP::Check4(ip)) {
 		map output = (map)SCR::Execute(.target.bash_output, sformat("host -4 %1|tr -d '\n'", ip));
 		list<string> out=splitstring(output["stdout"]:"", " ");
 		ip=out[size(out)-1]:"";
 		y2internal("%1", out);
 		if (output["exit"]:-1==0){
-		
 		} else {
 		  Popup::Error(output["stdout"]:"");
 		  UI::SetFocus(`hostname);
 		  return false;
 		 }
 		}
+   } else{
+	Popup::Error(_("Insert the IP address."));
+	UI::SetFocus(`ip);
+	return false;
+   }
    // validate port number
    if (size(port)==0) {
 		Popup::Error(_("Insert the port."));
@@ -408,12 +421,12 @@
  IscsiClientLib::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  = "";
@@ -432,7 +445,7 @@
 
  // write authentication data
  IscsiClientLib::saveConfig(user_in, pass_in, user_out, pass_out);
-
+//y2internal("auth: %1/%2, %3/%4", user_in, pass_in, user_out, pass_out);
  bg_finish=false;
  // ` with authentication
  string command = IscsiClientLib::useISNS()? "iscsiadm -m discovery -t isns" : sformat("iscsiadm -m discovery -t st -p %1:%2", ip, port);
@@ -458,7 +471,8 @@
    any selected = UI::QueryWidget(`discovered, `CurrentItem);
    if (selected != nil) { params = splitstring( IscsiClientLib::discovered[tointeger(selected)]:"", " " ); }
         else  { params = []; }
- if ((params==[])||(IscsiClientLib::connected( [ splitstring(params[0]:"", ",")[0]:"", params[1]:""], true ))){
+ IscsiClientLib::currentRecord = [ splitstring(params[0]:"", ",")[0]:"", params[1]:""];
+ if ((params==[])||(IscsiClientLib::connected( true ))){
    UI::ChangeWidget (`id (`connect), `Enabled, false);
    UI::ChangeWidget (`id (`delete), `Enabled, false);
   } else{
@@ -472,10 +486,10 @@
      list <term> items = [];
      integer row = 0;
      foreach(string s, IscsiClientLib::getDiscovered(), {
-     list<string> row_in_string = splitstring(s, " ");
+     IscsiClientLib::currentRecord = splitstring(s, " ");
 //        string record = deletechars(row_in_string[0]:"", "[]");
-        items = add(items, `item(`id(row), row_in_string[0]:"", row_in_string[1]:"",
-		(IscsiClientLib::connected( row_in_string, true ))?_("True"):_("False") ));
+        items = add(items, `item(`id(row), IscsiClientLib::currentRecord[0]:"", IscsiClientLib::currentRecord[1]:"",
+		(IscsiClientLib::connected( true ))?_("True"):_("False") ));
       row = row + 1;
      });
 
@@ -490,13 +504,13 @@
    any selected = UI::QueryWidget(`discovered, `CurrentItem);
    if (selected != nil) { params = splitstring( IscsiClientLib::discovered[tointeger(selected)]:"", " " ); }
 	else  { params = []; }
-   curr_rec = [ splitstring(params[0]:"", ",")[0]:"", params[1]:"" ] ;
+   IscsiClientLib::currentRecord = [ splitstring(params[0]:"", ",")[0]:"", params[1]:"" ] ;
     params = curr_rec;
  if ( event["EventReason"]:"" == "Activated" ){
   // connect new target
   if ( event["ID"]:nil == `connect) {
    // check if not already connected
-   if ( IscsiClientLib::connected( curr_rec , false) == true){
+   if ( IscsiClientLib::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;
     }
 
@@ -509,7 +523,7 @@
   }
   // delete connected item
   if ( event["ID"]:nil == `delete) {
-   if ((params == [])||(!IscsiClientLib::connected( curr_rec, true ))){
+   if ((params == [])||(!IscsiClientLib::connected( true ))){
 	 SCR::Execute (.target.bash_output,sformat("iscsiadm -m node -T %1 -p %2 --op=delete", params[1]:"", params[0]:""),  $[] );
 	 IscsiClientLib::readSessions();
 	 initDiscoveredTable("");
@@ -529,9 +543,9 @@
      list <term> items = [];
      integer row = 0;
      foreach(string s, IscsiClientLib::targets, {
-     list<string> row_in_string = splitstring(s, " ");
-        items = add(items, `item(`id(row), row_in_string[0]:"", row_in_string[1]:"",
-		(IscsiClientLib::connected( row_in_string, true ))?_("True"):_("False") ));
+     IscsiClientLib::currentRecord = splitstring(s, " ");
+        items = add(items, `item(`id(row), IscsiClientLib::currentRecord[0]:"", IscsiClientLib::currentRecord[1]:"",
+		(IscsiClientLib::connected( true ))?_("True"):_("False") ));
       row = row + 1;
      });
         UI::ChangeWidget (`id (`targets), `Items, items);
@@ -549,13 +563,12 @@
  if ( event["EventReason"]:"" == "Activated" ){
   if ( event["ID"]:nil == `connect) {
    // check if is not already connected
-   list <string> params = splitstring( IscsiClientLib::targets[(integer)UI::QueryWidget(`targets, `CurrentItem)]:"", " " );
-   if ( IscsiClientLib::connected( params, true ) == true){
+   IscsiClientLib::currentRecord = splitstring( IscsiClientLib::targets[(integer)UI::QueryWidget(`targets, `CurrentItem)]:"", " " );
+   if ( IscsiClientLib::connected( true ) == true){
     Popup::Error(_("The target is already connected."));
    } else {
-	 curr_rec = [ splitstring(params[0]:"", ",")[0]:"", params[1]:"" ];
    // check if not already connected
-   if ( IscsiClientLib::connected( curr_rec , false) == true){
+   if ( IscsiClientLib::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;
     }
 
@@ -572,36 +585,27 @@
 // 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" : IscsiClientLib::currentRecord[1]:"",
+		"portal" : IscsiClientLib::currentRecord[0]:"",
 		"authmethod" : (auth_none)?"None":"CHAP",
 		"username" : user_out,
 		"password" : pass_out,
 		"username_in" : user_in,
 		"password_in" : pass_in
 		];
-  if (checkAuthEntry() && IscsiClientLib::loginIntoTarget(target)) {
+  if (IscsiClientLib::connected(false) || IscsiClientLib::loginIntoTarget(target)) {
+//		IscsiClientLib::currentRecord = [target["portal"]:"", target["target"]:""];
+		IscsiClientLib::setStartupStatus((string)UI::QueryWidget(`id("startup"), `Value));
 		 IscsiClientLib::readSessions();
 		 return true;
 		}
 	else return false;
 }
 
-
 }

Modified: trunk/iscsi-client/src/wizards.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/wizards.ycp?rev=56867&r1=56866&r2=56867&view=diff
==============================================================================
--- trunk/iscsi-client/src/wizards.ycp (original)
+++ trunk/iscsi-client/src/wizards.ycp Tue Apr 21 09:29:28 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] r56867 - in /trunk/iscsi-client: VERSION package/yast2-iscsi-client.changes src/IscsiClient.ycp src/IscsiClientLib.ycp src/dialogs.ycp src/widgets.ycp src/wizards.ycp

mzugec＠svn.opensuse.org

tags

participants (1)