[yast-commit] r59272 - in /branches/SuSE-Code-11-SP1-Branch/iscsi-server: VERSION package/yast2-iscsi-server.changes src/IscsiServerFunctions.pm src/dialogs.ycp src/helps.ycp src/widgets.ycp

Author: mzugec Date: Tue Nov 3 12:55:46 2009 New Revision: 59272 URL: http://svn.opensuse.org/viewcvs/yast?rev=59272&view=rev Log: export credentials for target (fate#301932) Modified: branches/SuSE-Code-11-SP1-Branch/iscsi-server/VERSION branches/SuSE-Code-11-SP1-Branch/iscsi-server/package/yast2-iscsi-server.changes branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/IscsiServerFunctions.pm branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/dialogs.ycp branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/helps.ycp branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/widgets.ycp Modified: branches/SuSE-Code-11-SP1-Branch/iscsi-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/iscsi-server/VERSION?rev=59272&r1=59271&r2=59272&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/iscsi-server/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/iscsi-server/VERSION Tue Nov 3 12:55:46 2009 @@ -1 +1 @@ -2.17.7 +2.17.8 Modified: branches/SuSE-Code-11-SP1-Branch/iscsi-server/package/yast2-iscsi-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/iscsi-server/package/yast2-iscsi-server.changes?rev=59272&r1=59271&r2=59272&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/iscsi-server/package/yast2-iscsi-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/iscsi-server/package/yast2-iscsi-server.changes Tue Nov 3 12:55:46 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 3 12:52:14 CET 2009 - mzugec@suse.cz + +- export credentials for target (fate#301932) +- 2.17.8 + +------------------------------------------------------------------- Thu May 21 09:19:02 CEST 2009 - mzugec@suse.cz - handle correctly when tgt is already installed (bnc#501375) Modified: branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/IscsiServerFunctions.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/IscsiServerFunctions.pm?rev=59272&r1=59271&r2=59272&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/IscsiServerFunctions.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/IscsiServerFunctions.pm Tue Nov 3 12:55:46 2009 @@ -5,8 +5,13 @@ package IscsiServerFunctions; use strict; +use YaST::YCP qw(:LOGGING); use Data::Dumper; use YaPI; +use Switch; + +YaST::YCP::Import ("SCR"); + our %TYPEINFO; @@ -392,5 +397,63 @@ return \$ret; } +BEGIN { $TYPEINFO{SaveIntoFile} = ["function", "boolean", "string" ]; } +sub SaveIntoFile { + my $self = shift; + my $filename = shift; + my $file=""; + my $delimiter = "---------------------\n"; + + my $auth = $self->getConfig()->{"auth"}; + if (defined $auth && scalar(@{$auth})>0){ + $file = "Discovery authentication:\n" . $delimiter; + foreach my $row (@{$auth}){ + $file = $file . $row->{'KEY'} . ": " . $row->{'VALUE'} . "\n"; + } + $file = $file . "\n"; + } + +# my $isns = $self->getConfig()->{"iSNS"}; +# if (defined $isns && $isns>0){ +# foreach my $row (@{$isns}){ +# y2internal("isns ", Dumper($row)); +# } +# } + + my %targets = %{$self->getTargets()}; + if (scalar(keys %targets)>0){ + $file = $file . "Targets\n" . $delimiter . "\n"; + } + foreach my $target (keys %targets){ + my $target_name = ""; + my @auths = (); + my @luns = (); + foreach my $row (@{$targets{$target}}){ + switch ($row->{'KEY'}) { + case ('Target') { + $target_name = $row->{'VALUE'}; + } + case ('Lun') { + push(@luns, $row->{'VALUE'}); + } + case ('IncomingUser' || 'OutgoingUser') { + push(@auths, $row->{'KEY'} . ": " . $row->{'VALUE'}) + } + } + } + $file = $file . $target_name . "\n"; + $file = $file . "Luns: " . join(', ', @luns) . "\n" if (scalar(@luns) > 0); + $file = $file . join("\n", @auths) if (scalar(@auths) > 0); + $file = $file . "\n"; + } + + y2milestone("Save report : \n", $file); + + my $result = SCR -> Write (".target.string", $filename, $file); + y2milestone("Save result: ", $result); + return $result; +} + + 1; # EOF Modified: branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/dialogs.ycp?rev=59272&r1=59271&r2=59272&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/dialogs.ycp Tue Nov 3 12:55:46 2009 @@ -49,6 +49,8 @@ "isns", `VSpacing (2), "firewall", + `VSpacing (2), + "save", `VSpacing (2) ), `HSpacing (1), @@ -56,7 +58,7 @@ ), `VStretch() ), - "widget_names" : [ "auto_start_up", "isns", "firewall" ] + "widget_names" : [ "auto_start_up", "isns", "firewall", "save" ] ], // second tab - global authentication "global":$[ @@ -102,8 +104,8 @@ "contents" : `VBox( `HBox( - `TextEntry(`id(`target), _("Target"), "iqn.2001-04.com.example"), - `TextEntry(`id(`identifier), _("Identifier"), "test") + `InputField(`id(`target), `opt(`hstretch), _("Target"), "iqn.2001-04.com.example"), + `InputField(`id(`identifier), `opt(`hstretch), _("Identifier"), "test") ), `VBox( `Table(`id(`lun_table), @@ -144,7 +146,7 @@ `VSpacing(2), `Left( `CheckBox(`id(`auth_out),`opt(`notify), _("Outgoing Authentication"), false) ), `HBox( - `TextEntry(`id(`user_out), _("Username")), `Password(`id(`pass_out), _("Password")) + `InputField(`id(`user_out), `opt(`hstretch), _("Username")), `Password(`id(`pass_out), _("Password")) ) ) ] @@ -174,13 +176,20 @@ "services" : [ "service:iscsitarget" ], "display_details" : true, ]), + "save" : $[ + "widget" : `push_button, + "label" : Label::SaveButton(), + "handle" : saveConfiguration, + "opt": [], + "help": HELPS["save_configuration"]:"" + ], "isns" : $[ "widget" : `custom, "custom_widget" : `HBox( `CheckBoxFrame(`id(`isns_ac), _("iSNS Access Control"), true, `VBox( - `TextEntry(`id(`isns_ip), _("iSNS Server")) + `InputField(`id(`isns_ip), `opt(`hstretch), _("iSNS Server")) )) ), "init" : initiSNS, Modified: branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/helps.ycp?rev=59272&r1=59271&r2=59272&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/helps.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/helps.ycp Tue Nov 3 12:55:46 2009 @@ -38,6 +38,10 @@ </p> "), + "save_configuration" : _("<p><b>Save</b> button will export some informations about +targets into selected file.</p>"), + + /* Summary dialog help 1/3 */ "summary" : _("<p><b><big>iSCSI Target Configuration</big></b><br> Configure an iSCSI target here.<br></p> Modified: branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/widgets.ycp?rev=59272&r1=59271&r2=59272&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/widgets.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/iscsi-server/src/widgets.ycp Tue Nov 3 12:55:46 2009 @@ -47,22 +47,22 @@ map ret_map = $[]; term lun_dialog = `VBox( - `Left( `HWeight(3, `TextEntry( `id( `lun ), "LUN", previous["lun"]:"0" )) ), + `Left( `HWeight(3, `InputField( `id( `lun ), `opt(`hstretch), "LUN", previous["lun"]:"0" )) ), `VSpacing(2), `RadioButtonGroup(`id(`rb), `VBox( `Left( `RadioButton(`id(`fileio), `opt(`notify), "Type=fileio", previous["fileio"]:true) ), `HBox( - `TextEntry( `id( `file_path ), _("Path:"), previous["path"]:""), + `InputField( `id( `file_path ), `opt(`hstretch), _("Path:"), previous["path"]:""), `VBox( `Label(""), `PushButton(`id(`browse), _("Browse")) ) ), - `TextEntry( `id( `scsi_id ), "ScsiId:", previous["scsi_id"]:"" ), + `InputField( `id( `scsi_id ), `opt(`hstretch), "ScsiId:", previous["scsi_id"]:"" ), `VSpacing(2), `Left( `RadioButton(`id(`nullio), `opt(`notify), "Type=nullio", previous["nullio"]:false) ), - `TextEntry( `id( `sectors ), _("Sectors:"), previous["sectors"]:"" ) + `InputField( `id( `sectors ), `opt(`hstretch), _("Sectors:"), previous["sectors"]:"" ) ) ), `Left( `HBox( `PushButton(`id(`ok), Label::OKButton() ), `PushButton(`id(`cancel), Label::CancelButton() ))) @@ -149,7 +149,7 @@ // dialog to add/modify user and password list <string> getDialogValues(string user, string pass){ UI::OpenDialog( `VBox( - `TextEntry(`id(`p_user),_("Username"), user), + `InputField(`id(`p_user), `opt(`hstretch), _("Username"), user), `Password(`id(`p_pass), _("Password"), pass), `HBox( `PushButton(`id(`ok), _("OK")), @@ -175,6 +175,31 @@ else return []; } + +symbol saveConfiguration(string key, map event){ + if (is(event["ID"]:nil, string) && event["ID"]:"" == "save"){ + any filename = UI::AskForSaveFileName("/", "*", _("Save as...")); + if ( filename != nil && (string)filename!="") + { + if ( IscsiServerFunctions::SaveIntoFile( (string)filename )) + { + Popup::Message(sformat(_("File %1 was saved successfully."), filename)); + list pathComponents = splitstring( (string)filename, "/"); + integer s = size(pathComponents) - 1; + string base = pathComponents[s]:"default"; + } + else + { + Popup::Warning(_("An error occured while saving the file.")); + } + } + } + return nil; +} + + + + // **************** Server Dialog ********************* // dialog with targets -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org