Author: mzugec
Date: Fri Jul 27 17:12:38 2007
New Revision: 39750
URL: http://svn.opensuse.org/viewcvs/yast?rev=39750&view=rev
Log:
support for iSNS (fate #302083)
Modified:
trunk/iscsi-client/VERSION
trunk/iscsi-client/package/yast2-iscsi-client.changes
trunk/iscsi-client/src/IscsiClient.ycp
trunk/iscsi-client/src/dialogs.ycp
trunk/iscsi-client/src/helps.ycp
trunk/iscsi-client/src/widgets.ycp
trunk/iscsi-client/testsuite/tests/SaveConfig.out
trunk/iscsi-client/yast2-iscsi-client.spec.in
Modified: trunk/iscsi-client/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/VERSION?rev=39750&r1=39749&r2=39750&view=diff
==============================================================================
--- trunk/iscsi-client/VERSION (original)
+++ trunk/iscsi-client/VERSION Fri Jul 27 17:12:38 2007
@@ -1 +1 @@
-2.15.1
+2.15.2
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=39750&r1=39749&r2=39750&view=diff
==============================================================================
--- trunk/iscsi-client/package/yast2-iscsi-client.changes (original)
+++ trunk/iscsi-client/package/yast2-iscsi-client.changes Fri Jul 27 17:12:38 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Jul 27 17:11:42 CEST 2007 - mzugec@suse.cz
+
+- support for iSNS (fate #302083)
+- 2.15.2
+
+-------------------------------------------------------------------
Wed Jun 13 18:26:24 CEST 2007 - mzugec@suse.cz
- added validator for InitiatorName (#245364)
Modified: trunk/iscsi-client/src/IscsiClient.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClient.ycp?rev=39750&r1=39749&r2=39750&view=diff
==============================================================================
--- trunk/iscsi-client/src/IscsiClient.ycp (original)
+++ trunk/iscsi-client/src/IscsiClient.ycp Fri Jul 27 17:12:38 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: trunk/iscsi-client/src/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/dialogs.ycp?rev=39750&r1=39749&r2=39750&view=diff
==============================================================================
--- trunk/iscsi-client/src/dialogs.ycp (original)
+++ trunk/iscsi-client/src/dialogs.ycp Fri Jul 27 17:12:38 2007
@@ -40,11 +40,27 @@
_("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(
- `MinWidth( 16, `TextEntry(`id(`initiator_name), /*`opt(`notify),*/ _("Initiator Name")) )
+ `MinWidth( 16, `TextEntry(`id(`initiator_name), _("iSNS")) )
),
"init" : initInitName,
"validate_type" : `function,
@@ -166,6 +182,7 @@
`TextEntry(`id(`hostname), _("IP Address")),
`IntField(`id(`port), _("Port"), 0,65535,3260)
),
+ "init" : initServerLocation,
"validate_type" : `function,
"validate_function" : validateServerLocation
],
@@ -197,6 +214,8 @@
`VBox(
"initiator_name",
`VSpacing (2),
+ "isns",
+ `VSpacing (2),
"auto_start_up",
`VSpacing (2)
),
@@ -205,7 +224,7 @@
),
`VStretch()
),
- "widget_names" : [ "auto_start_up", "initiator_name" ]
+ "widget_names" : [ "auto_start_up", "isns", "initiator_name" ]
],
// list og connected targets
@@ -278,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;
}
Modified: trunk/iscsi-client/src/helps.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/helps.ycp?rev=39750&r1=39749&r2=39750&view=diff
==============================================================================
--- trunk/iscsi-client/src/helps.ycp (original)
+++ trunk/iscsi-client/src/helps.ycp Fri Jul 27 17:12:38 2007
@@ -85,6 +85,9 @@
"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>"),
+ "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.
Only change <b>Port</b> if needed. For authentication, use <b>Username</b> and <b>Password</b>. If you do not need authentication,
Modified: trunk/iscsi-client/src/widgets.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/widgets.ycp?rev=39750&r1=39749&r2=39750&view=diff
==============================================================================
--- trunk/iscsi-client/src/widgets.ycp (original)
+++ trunk/iscsi-client/src/widgets.ycp Fri Jul 27 17:12:38 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, " ");
Modified: trunk/iscsi-client/testsuite/tests/SaveConfig.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/testsuite/tests/SaveConfig.out?rev=39750&r1=39749&r2=39750&view=diff
==============================================================================
--- trunk/iscsi-client/testsuite/tests/SaveConfig.out (original)
+++ trunk/iscsi-client/testsuite/tests/SaveConfig.out Fri Jul 27 17:12:38 2007
@@ -5,4 +5,5 @@
Write .etc.iscsid nil true
Return nil
Write .etc.iscsid.all $["comment":"", "file":-1, "kind":"section", "name":"", "type":-1, "value":[$["comment":"#\n# Open-iSCSI default configuration.\n# Could be located at /etc/iscsid.conf or ~/.iscsid.conf\n#\n", "kind":"value", "name":"node.active_cnx", "type":1, "value":"1"], $["comment":"", "kind":"value", "name":"node.startup", "type":1, "value":"manual"], $["comment":"#node.session.auth.username = dima\n#node.session.auth.password = aloha\n", "kind":"value", "name":"node.session.timeo.replacement_timeout", "type":1, "value":"120"], $["comment":"", "kind":"value", "name":"node.session.err_timeo.abort_timeout", "type":1, "value":"10"], $["comment":"", "kind":"value", "name":"node.session.err_timeo.reset_timeout", "type":1, "value":"30"], $["comment":"", "kind":"value", "name":"node.session.iscsi.InitialR2T", "type":1, "value":"No"], $["comment":"", "kind":"value", "name":"node.session.iscsi.ImmediateData", "type":1, "value":"Yes"], $["comment":"", "kind":"value", "name":"node.session.iscsi.FirstBurstLength", "type":1, "value":"262144"], $["comment":"", "kind":"value", "name":"node.session.iscsi.MaxBurstLength", "type":1, "value":"16776192"], $["comment":"", "kind":"value", "name":"node.session.iscsi.DefaultTime2Wait", "type":1, "value":"0"], $["comment":"", "kind":"value", "name":"node.session.iscsi.DefaultTime2Retain", "type":1, "value":"0"], $["comment":"", "kind":"value", "name":"node.session.iscsi.MaxConnections", "type":1, "value":"0"], $["comment":"", "kind":"value", "name":"node.cnx[0].iscsi.HeaderDigest", "type":1, "value":"None"], $["comment":"", "kind":"value", "name":"node.cnx[0].iscsi.DataDigest", "type":1, "value":"None"], $["comment":"", "kind":"value", "name":"node.cnx[0].iscsi.MaxRecvDataSegmentLength", "type":1, "value":"65536"]]] true
+Write .etc.iscsid nil true
Return nil
Modified: trunk/iscsi-client/yast2-iscsi-client.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/yast2-iscsi-client.spec.in?rev=39750&r1=39749&r2=39750&view=diff
==============================================================================
--- trunk/iscsi-client/yast2-iscsi-client.spec.in (original)
+++ trunk/iscsi-client/yast2-iscsi-client.spec.in Fri Jul 27 17:12:38 2007
@@ -2,7 +2,7 @@
@HEADER@
-BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite
+BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite libicu-devel
Requires: yast2 yast2-packager
BuildArchitectures: noarch
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
