[yast-commit] r39754 - in /branches/SuSE-SLE-10-SP2-Branch/iscsi-client: VERSION package/yast2-iscsi-client.changes src/IscsiClient.ycp src/dialogs.ycp src/helps.ycp src/iscsi-client.desktop src/widgets.ycp

27 Jul 2007

Author: mzugec
Date: Fri Jul 27 17:40:10 2007
New Revision: 39754

URL: http://svn.opensuse.org/viewcvs/yast?rev=39754&view=rev
Log:
support for iSNS (fate #302083)

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

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

--- branches/SuSE-SLE-10-SP2-Branch/iscsi-client/VERSION (original)
+++ branches/SuSE-SLE-10-SP2-Branch/iscsi-client/VERSION Fri Jul 27 17:40:10 2007
@@ -1 +1 @@
-2.13.35
+2.14.36

Modified: branches/SuSE-SLE-10-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes?rev=39754&r1=39753&r2=39754&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes (original)
+++ branches/SuSE-SLE-10-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes Fri Jul 27 17:40:10 2007
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Fri Jul 27 17:43:17 CEST 2007 - mzugec@suse.cz
+
+- support for iSNS (fate #302083)
+- 2.14.36
+
+-------------------------------------------------------------------
 Wed Jun 13 18:23:41 CEST 2007 - mzugec@suse.cz
 
 - added validation for InitiatorName (#245364)

Modified: branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/IscsiClient.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/IscsiClient.ycp?rev=39754&r1=39753&r2=39754&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/IscsiClient.ycp (original)
+++ branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/IscsiClient.ycp Fri Jul 27 17:40:10 2007
@@ -66,15 +66,34 @@
 
 // read configuration file
 global list  > getConfig(){
- config = (map) SCR::Read(.etc.iscsid.all);
- y2milestone("read config %1", config);
+ // use cache if available
+ if (size(config)==0){
+  config = (map) SCR::Read(.etc.iscsid.all);
+  y2milestone("read config %1", config);
+ }
  return config["value"]:[];
 }
 
+global void setConfig(list new_config){
+ config["value"]=new_config;
+}
+
+global boolean useISNS(){
+ boolean use = false;
+ foreach(map row, getConfig(), {
+  if (row["name"]:""=="isns.address" || row["name"]:""=="isns.port") {
+	 use = true;
+	}
+ });
+ return use;
+}
+
+
 // write temporary changed old config
 global void oldConfig(){
- y2milestone("Store temporary config");
+ y2milestone("Store temporary config %1", config);
  SCR::Write(.etc.iscsid.all, config);
+ SCR::Write(.etc.iscsid, nil);
 }
 
 

Modified: branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/dialogs.ycp?rev=39754&r1=39753&r2=39754&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/dialogs.ycp (original)
+++ branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/dialogs.ycp Fri Jul 27 17:40:10 2007
@@ -40,24 +40,31 @@
                     _("Manually")
                 ),
             ]),
+	"isns" : $[
+		"widget" : `custom,
+		"custom_widget"	:
+		  `HBox(
+			`MinWidth( 16,
+			  `HBox(
+				`TextEntry(`id(`isns_address), _("iSNS Address")),
+				`TextEntry(`id(`isns_port),    _("iSNS Port"))
+				))
+		  ),
+		"init"	: initISNS,
+		"validate_type" : `function,
+		"validate_function" : validateISNS,
+		"store"	 : storeISNS,
+		"help"	: HELPS["isns"]:""
+		],
 	"initiator_name" : $[
 		"widget" : `custom,
 		"custom_widget"	:
 		  `HBox(
-//		   `HSpacing(7),
-			`MinWidth( 16, `TextEntry(`id(`initiator_name), /*`opt(`notify),*/ _("Initiator Name")) )
-/*
-			`VBox(
-			     `VSpacing(1),
-			     `PushButton(`id(`write), _("Save Name"))
-			     )
-*/
-//		   `HSpacing(7)
+			`MinWidth( 16, `TextEntry(`id(`initiator_name), _("Initiator Name")) )
 		  ),
 		"init"	: initInitName,
 		"validate_type" : `function,
 		"validate_function" : validateInitName,
-//		"handle" : handleInitName,
 		"store"	 : storeInitName,
 		"help"	: HELPS["initiator_name"]:""
 		],
@@ -175,6 +182,7 @@
 		`TextEntry(`id(`hostname), _("IP Address")),
                 `IntField(`id(`port), _("Port"), 0,65535,3260)
 		),
+		   "init" : initServerLocation,
                    "validate_type" : `function,
                    "validate_function" : validateServerLocation
 	],
@@ -204,9 +212,11 @@
                            `HStretch(),
                            `HSpacing (1),
                             `VBox(
+                                "auto_start_up",
+                                `VSpacing (2),
 				"initiator_name",
                                 `VSpacing (2),
-                                "auto_start_up",
+				"isns",
                                 `VSpacing (2)
                                 ),
                            `HSpacing (1),
@@ -214,7 +224,7 @@
                               ),
                           `VStretch()
                         ),
-         "widget_names" : [ "auto_start_up", "initiator_name" ]
+         "widget_names" : [ "auto_start_up", "initiator_name", "isns" ]
         ],
 
 	// list og connected targets
@@ -222,7 +232,6 @@
          "header"       : _("Connected Targets"),
          "contents"     :
                           `VBox(
-//                          `VStretch(),
                           `HBox(
                            `HSpacing (1),
                             `VBox(
@@ -230,7 +239,6 @@
                                  ),
                            `HSpacing (1)
                                )
-//                          `VStretch()
                         ),
          "widget_names" : [ "connected_table" ]
         ],
@@ -240,15 +248,11 @@
          "header"       : _("Discovered Targets"),
          "contents"     :
                          `VBox(
-//                          `VStretch(),
                           `HBox(
-//                           `HSpacing (1),
                             `VBox(
                                 "discovered_table"
                                  )
-//                           `HSpacing (1)
                                )
-//                          `VStretch()
                         ),
          "widget_names" : [ "discovered_table" ]
         ],
@@ -256,7 +260,6 @@
          "header"       : "iBFT",
          "contents"     :
                          `VBox(
-//                          `VStretch(),
                           `HBox(
                            `HSpacing (1),
                             `VBox(
@@ -264,7 +267,6 @@
                                  ),
                            `HSpacing (1)
                                )
-//                          `VStretch()
                         ),
          "widget_names" : [ "ibft_table" ]
         ]
@@ -277,9 +279,13 @@
     if (Stage::initial()) tabs_descr["general", "widget_names"] = [ "initiator_name" ];
     string caption = _("iSCSI Initiator Overview");
 
+    list tab_order = ["general", "client"];
+    if (!Stage::initial()) tab_order = add(tab_order, "discovered");
+    if (size(IscsiClient::getiBFT())>0) tab_order = add(tab_order, "ibft");
+
     map widget_descr = $[
 	"tab": CWMTab::CreateWidget($[
-            "tab_order": (Stage::initial()) ? ["general", "client"] : ((IscsiClient::getiBFT()!=$[])?[ "general", "client", "discovered", "ibft" ] : [ "general", "client", "discovered" ]),
+            "tab_order": tab_order,
             "tabs": tabs_descr,
             "widget_descr": widgets,
             "initial_tab" : (Stage::initial()) ? "client" : current_tab,
@@ -291,7 +297,7 @@
     string help = CWM::MergeHelps(w);
     contents = CWM::PrepareDialog(contents, w);
     Wizard::SetContentsButtons(caption, contents, help, Label::NextButton (), Label::FinishButton ());
-    Wizard::HideBackButton();
+    Wizard::DisableBackButton();
     symbol ret = CWM::Run(w, $[`abort:ReallyAbort ]);
     return ret;
 }
@@ -335,7 +341,6 @@
     string caption = _("iSCSI Initiator Discovery");
     list > w = CWM::CreateWidgets (["targets_table"], (map  >)widgets);
         term contents =`VBox(
-//                          `VStretch(),
                           `HBox(
                            `HSpacing (1),
                             `VBox(
@@ -343,7 +348,6 @@
                                  ),
                            `HSpacing (1)
                                )
-//                          `VStretch()
                         );
     string help = CWM::MergeHelps(w);
     contents = CWM::PrepareDialog(contents, w);

Modified: branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/helps.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/helps.ycp?rev=39754&r1=39753&r2=39754&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/helps.ycp (original)
+++ branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/helps.ycp Fri Jul 27 17:40:10 2007
@@ -83,7 +83,10 @@
 _("<h1>Warning</h1>") + _("<p>When accessing an iSCSI device <b>READ</b>/<b>WRITE</b>, make sure that this access is exclusive. Otherwise there is a potential risk of data corruption.</p>
 "),
 
- "initiator_name" : _("<p><b>InitiatorName</b> is value from /etc/initiatorname.iscsi. In case you have iBFT this value will be replaced from there and you are not able to change it (do it in BIOS Setup).</p><p>When you want to change this value, use <b>Save Name</b> button. This value is not saved automatically.</p>"),
+ "initiator_name" : _("<p><b>InitiatorName</b> is value from /etc/initiatorname.iscsi. In case you have iBFT this value will be replaced from there and you are not able to change it (do it in BIOS Setup).</p>"),
+
+ "isns" : _("If you want to use <b>iSNS</b> (Internet  Storage  Name Service) for discovering targets instead of default SendTargets method,
+fill IP address of iSNS server and port. Default port should be 3205."),
 
  // discovery new target
  "discovery"	: _("<h1>iSCSI Initiator</h1>") + _("Enter the <b>IP Address</b> of the discovered server.

Modified: branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/iscsi-client.desktop
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/iscsi-client.desktop?rev=39754&r1=39753&r2=39754&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/iscsi-client.desktop (original)
+++ branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/iscsi-client.desktop Fri Jul 27 17:40:10 2007
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Misc;
+Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
 
 X-KDE-ModuleType=Library
 X-KDE-RootOnly=true

Modified: branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/widgets.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/widgets.ycp?rev=39754&r1=39753&r2=39754&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/widgets.ycp (original)
+++ branches/SuSE-SLE-10-SP2-Branch/iscsi-client/src/widgets.ycp Fri Jul 27 17:40:10 2007
@@ -1,5 +1,6 @@
 {
  textdomain "iscsi-client";
+ import "IP";
 
  boolean stat = false;
  list<string> curr_rec = [];
@@ -172,6 +173,63 @@
  return nil;
 }
 
+void initISNS(string key){
+ foreach(map row, IscsiClient::getConfig(), {
+  if (row["name"]:""=="isns.address") UI::ChangeWidget(`isns_address, `Value, row["value"]:"");
+  if (row["name"]:""=="isns.port")    UI::ChangeWidget(`isns_port,    `Value, row["value"]:"");
+ });
+ UI::ChangeWidget(`isns_port, `ValidChars, "0123456789");
+}
+
+boolean validateISNS(string key, map event){
+ string address = (string)UI::QueryWidget(`isns_address, `Value);
+ string port	= (string)UI::QueryWidget(`isns_port,	 `Value);
+ if (size(address)==0 && size(port)==0) return true;
+ if(!IP::Check4(address)){
+  Popup::Error(_("Not valid IP address"));
+  UI::SetFocus(`isns_address);
+  return false;
+ }
+ if (size(port)==0){
+  Popup::Error(_("Port field can't be empty"));
+  UI::SetFocus(`isns_port);
+  return false;
+ }
+ return true;
+}
+
+
+symbol storeISNS (string key, map event){
+ string address = (string)UI::QueryWidget(`isns_address, `Value);
+ string port    = (string)UI::QueryWidget(`isns_port,    `Value);
+ boolean found_addr = false;
+ boolean found_port = false;
+ list tmp_config=[];
+
+ foreach(map row, IscsiClient::getConfig(), {
+  if (row["name"]:""=="isns.address") {
+	 row["value"]=address;
+	 found_addr = true;
+	}
+  if (row["name"]:""=="isns.port") {
+	 row["value"]=port;
+	 found_port = true;
+	}
+  if (((row["name"]:""=="isns.address" || row["name"]:""=="isns.port")&&(size(address)>0&&size(port)>0))
+	|| (row["name"]:""!="isns.address"&&row["name"]:""!="isns.port"))  tmp_config = add(tmp_config, row);
+ });
+ if (size(address)>0&&size(port)>0){
+  if (!found_addr) tmp_config = add(tmp_config, $["name":"isns.address", "value":address, "kind":"value", "type":1, "comment":""]);
+  if (!found_port) tmp_config = add(tmp_config, $["name":"isns.port",    "value":port, "kind":"value", "type":1, "comment":""]);
+ }
+
+ IscsiClient::setConfig(tmp_config);
+ IscsiClient::oldConfig();
+ return nil;
+}
+
+
+
 void initInitName(string key){
     y2milestone("initiatorname %1", IscsiClient::initiatorname);
     UI::ChangeWidget(`initiator_name, `Value, IscsiClient::initiatorname);
@@ -305,23 +363,34 @@
 }
 // *******************Server Location ***********************
 
+void initServerLocation(string key){
+y2internal("is iSNS %1", IscsiClient::useISNS());
+ if (IscsiClient::useISNS()){
+  UI::ChangeWidget(`hostname, `Enabled, false);
+  UI::ChangeWidget(`port, `Enabled, false);
+ }
+}
+
 // do discovery to selected portal
 boolean validateServerLocation(string key, map event){
  boolean ret = true;
  string ip = tostring(UI::QueryWidget(`hostname, `Value));
  string port = tostring(UI::QueryWidget(`port, `Value));
  // validate IP address
- if (size(ip)==0) {
+if (!IscsiClient::useISNS()) 
+ {
+  if (size(ip)==0) {
 		Popup::Error(_("Insert the IP address."));
 		UI::SetFocus(`hostname);
 		return false;
 		}
- // validate port number
- if (size(port)==0) {
+   // validate port number
+   if (size(port)==0) {
 		Popup::Error(_("Insert the port."));
 		UI::SetFocus(`port);
 		return false;
 		}
+  }
  // store old config
  IscsiClient::getConfig();
 
@@ -352,8 +421,9 @@
  IscsiClient::saveConfig(user_in, pass_in, user_out, pass_out);
 
  bg_finish=false;
- // discovery with authentication
- list<string>trg_list = runInBg( sformat("iscsiadm -m discovery -t st -p %1:%2", ip, port) );
+ // ` with authentication
+ string command = IscsiClient::useISNS()? "iscsiadm -m discovery -t isns" : sformat("iscsiadm -m discovery -t st -p %1:%2", ip, port);
+ list<string>trg_list = runInBg( command );
  IscsiClient::targets = [];
 foreach(string row, trg_list, {
  list<string> tmp_list=splitstring(row, " ");

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

    

[yast-commit] r39754 - in /branches/SuSE-SLE-10-SP2-Branch/iscsi-client: VERSION package/yast2-iscsi-client.changes src/IscsiClient.ycp src/dialogs.ycp src/helps.ycp src/iscsi-client.desktop src/widgets.ycp

mzugec＠svn.opensuse.org