April 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67974 - in /branches/SuSE-Code-11-SP1-Branch/dns-server: package/yast2-dns-server.changes src/DnsZones.pm
by locilka＠svn2.opensuse.org 20 Apr '12

20 Apr '12

Author: locilka Date: Fri Apr 20 16:19:43 2012 New Revision: 67974 URL: http://svn.opensuse.org/viewcvs/yast?rev=67974&view=rev Log: - Fixed removing RRs from LDAP when they share the same LDAP object with another non-deleted RRs (BNC#755592). Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsZones.pm Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes Fri Apr 20 16:19:43 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------ +Fri Apr 20 16:16:11 CEST 2012 - locilka(a)suse.com + +- Fixed removing RRs from LDAP when they share the same LDAP + object with another non-deleted RRs (BNC#755592). + +------------------------------------------------------------------ Tue Apr 17 16:53:59 CEST 2012 - locilka(a)suse.com - Triggering the global "modified" flag while adding/modifying Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsZones.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsZones.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsZones.pm Fri Apr 20 16:19:43 2012 @@ -33,6 +33,7 @@ my $zone_base_config_dn = ""; +my $LDAP_RECORD = 'Record'; YaST::YCP::Import ("SCR"); use DnsTsigKeys; @@ -470,6 +471,11 @@ # LDAP data +# @param string record type +sub LDAPRecordString { + return drunkCamelType (shift).$LDAP_RECORD; +} + BEGIN { $TYPEINFO{ZoneReadLdap} = ["function", [ "map", "any", "any" ], "string", "string" ]; } sub ZoneReadLdap { my $self = shift; @@ -506,7 +512,7 @@ my %zonemap = %{$found[0] || {}}; my $serial = $self->UpdateSerial (""); - my @soa_str_lst = @{$zonemap{"sOARecord"}|| ["@ root $serial 3H 1H 1W 1D"]}; + my @soa_str_lst = @{$zonemap{LDAPRecordString('SOA')}|| ["@ root $serial 3H 1H 1W 1D"]}; my $soa_str = $soa_str_lst[0]; my @soa_lst = split (" ", $soa_str); @@ -557,7 +563,7 @@ foreach my $rec_type (@all_rec_types) { - my $value_key = $rec_type."Record"; + my $value_key = $rec_type.$LDAP_RECORD; my @values = @{$record{$value_key} || []}; foreach my $value (@values) { @@ -574,6 +580,41 @@ return \%ret; } +sub FillUpTmpLDAPRecords { + my $ref_found = shift; + + my ($ldap_key, $record_key); + my $ldap_records = {}; + + foreach my $l_record (@{$$ref_found}) { + $ldap_key = $l_record->{'relativeDomainName'}[0]; + $ldap_records->{$ldap_key} = [] if not defined $ldap_records->{$ldap_key}; + foreach $record_key (keys %{$l_record}) { + push @{$ldap_records->{$ldap_key}}, $record_key if ($record_key =~ /^.*$LDAP_RECORD$/); + } + } + + return $ldap_records; +} + +sub MarkRemovedRecords { + my $ref_ldap_record = shift; + my $ref_relative_domain = shift; + my $ref_all_records = shift; + + # Record is currently in LDAP + if (defined $$ref_all_records->{$$ref_relative_domain}) { + # All record types in relative domain + foreach my $recordtype (@{$$ref_all_records->{$$ref_relative_domain}}) { + # The new record does not contain such record type (thus it's removed) + if (not defined $$ref_ldap_record{$recordtype}) { + $$ref_ldap_record{$recordtype} = []; + y2milestone ("Record ".$recordtype." has been removed from ".$$ref_relative_domain." object"); + } + } + } +} + BEGIN { $TYPEINFO{ZoneFileWriteLdap} = ["function", "boolean", [ "map", "any", "any"]];} sub ZoneFileWriteLdap { my $self = shift; @@ -611,16 +652,16 @@ "relativeDomainName" => ["@"], "dNSTTL" => [DnsRoutines->NormalizeTime ($zone_map{"ttl"} || "2D")], "dNSClass" => ["IN"], - "sOARecord" => $soa_record, + LDAPRecordString('SOA') => $soa_record, ); my @current_records = grep { my %r = %{$_}; - $r{"key"} eq "@" || $r{"key"} eq $zone . "." + $r{"key"} eq "@" || $r{"key"} eq $zone."." } @records; foreach my $rec_ref (@current_records) { - my $type = lc ($rec_ref->{"type"}) . "record"; + my $type = LDAPRecordString($rec_ref->{"type"}); my @cur_vals = @{$ldap_record{$type} || []}; push @cur_vals, $rec_ref->{"value"}; $ldap_record{$type} = \@cur_vals; @@ -639,15 +680,24 @@ ); my $found_ref = SCR->Read (".ldap.search", \%ldap_query); + y2debug ("Base record: ".Dumper($found_ref)); + + my $ldap_records = FillUpTmpLDAPRecords(\$found_ref); + + # Some (sub)records have been removed but the LDAP record have to stay + foreach my $r ('@', $zone.'.') { + MarkRemovedRecords (\%ldap_record, \$r, \$ldap_records); + } + y2debug ("New base record: ".Dumper(\%ldap_record)); if (scalar (@{$found_ref || []}) == 0) { - y2milestone ("Creating new record"); + y2milestone ("Creating new zone record"); SCR->Write (".ldap.add", \%ldap_cmd, \%ldap_record); } else { - y2milestone ("Modifying existing record"); + y2milestone ("Modifying existing zone record"); delete $ldap_record{"objectClass"}; # objectclass can be changed by mail-server SCR->Write (".ldap.modify", \%ldap_cmd, \%ldap_record); } @@ -656,7 +706,9 @@ my %r = %{$_}; $r{"key"} } @records; + # Never delete the base entry push @all_records, "@"; + # the search config map %ldap_query = ( "base_dn" => $zone_dn, @@ -668,13 +720,16 @@ $found_ref = SCR->Read (".ldap.search", \%ldap_query) || []; my @found = @{$found_ref}; - @found = map { my @l = @{$_->{"relativeDomainName"}}; $l[0]; } @found; - #remove removed entries + $ldap_records = FillUpTmpLDAPRecords(\$found_ref); + y2debug ("Records currently in LDAP: ".Dumper($ldap_records)); + y2debug ("New state of records: ".Dumper(\@records)); + + # Delete removed entries (only fully removed entries will be deleted) my @deleted = grep { my $current = $_; my @equiv = grep { @@ -716,12 +771,16 @@ } @records; foreach my $rec_ref (@current_records) { - my $type = drunkCamelType ($rec_ref->{"type"})."Record"; + my $type = LDAPRecordString($rec_ref->{"type"}); my @cur_vals = @{$ldap_record{$type} || []}; push @cur_vals, $rec_ref->{"value"}; $ldap_record{$type} = \@cur_vals; } + # Some (sub)records have been removed but the LDAP record have to stay + MarkRemovedRecords (\%ldap_record, \$r, \$ldap_records); + y2debug ("New record: ".Dumper(\%ldap_record)); + # the search config map - to choose add or modify my %ldap_query = ( "base_dn" => $rec_dn, -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67973 - /branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 20 Apr '12

20 Apr '12

Author: jsuchome Date: Fri Apr 20 15:34:31 2012 New Revision: 67973 URL: http://svn.opensuse.org/viewcvs/yast?rev=67973&view=rev Log: - check for text mode - stop before destroying Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp Fri Apr 20 15:34:31 2012 @@ -96,6 +96,8 @@ map security = Security::Export (); string method = tolower (security["PASSWD_ENCRYPTION"]:"des"); + boolean textmode = UI::GetDisplayInfo()["TextMode"]:false; + /* Lxc configure1 dialog caption */ string caption = _("LXC Configuration"); @@ -329,6 +331,11 @@ { string cmd = sformat ("xterm -e lxc-start -n %1", name); + if (textmode) + { + cmd = sformat ("lxc-start -d -n %1", name); + } + UI::ReplaceWidget (`id (`rp_status), `Label (`id (`status), "")); integer id = (integer) SCR::Execute (.process.start_shell, cmd); @@ -336,6 +343,12 @@ `PushButton (`id (`cancel), Label::CancelButton ()) ); UI::ChangeWidget (`id (`destroy), `Enabled, false); + if (textmode) + { + // message + Popup::Message (sformat (_("The Container '%1' was started in the background. +Use 'lxc-console' command to connect to the running Container."), name)); + } while (true) { symbol ui = (symbol) UI::PollInput(); @@ -364,7 +377,7 @@ // busy message Popup::ShowFeedback ("", sformat ("Destroying Container '%1'...", name)); - string cmd = "lxc-destroy -n " + name; + string cmd = "lxc-destroy -f -n " + name; map out = (map) SCR::Execute (.target.bash_output, cmd); y2internal ("out: %1", out); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67972 - in /branches/SuSE-Code-11-SP2-Branch/lxc: VERSION package/yast2-lxc.changes src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 20 Apr '12

20 Apr '12

Author: jsuchome Date: Fri Apr 20 12:50:34 2012 New Revision: 67972 URL: http://svn.opensuse.org/viewcvs/yast?rev=67972&view=rev Log: - read bridges id's - explicit buttons for Create/Start/Destroy - 2.17.1 Modified: branches/SuSE-Code-11-SP2-Branch/lxc/VERSION branches/SuSE-Code-11-SP2-Branch/lxc/package/yast2-lxc.changes branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/lxc/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/V… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/VERSION Fri Apr 20 12:50:34 2012 @@ -1 +1 @@ -2.17.0 +2.17.1 Modified: branches/SuSE-Code-11-SP2-Branch/lxc/package/yast2-lxc.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/p… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/package/yast2-lxc.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/package/yast2-lxc.changes Fri Apr 20 12:50:34 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Apr 20 12:38:23 CEST 2012 - jsuchome(a)suse.cz + +- read bridges id's +- explicit buttons for Create/Start/Destroy +- 2.17.1 + +------------------------------------------------------------------- Fri Apr 13 13:01:03 2012 - jsuchome(a)suse.cz - initial version Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp Fri Apr 20 12:50:34 2012 @@ -71,6 +71,18 @@ return crypt (pw); } +list<string> read_bridges_ids () { + + map out = (map) SCR::Execute (.target.bash_output, "brctl show | tail -n +2 | cut -f 1"); + list<string> ret = []; + + if (out["stdout"]:"" != "") + { + ret = maplist (string line, splitstring (out["stdout"]:"", "\n"), ``(line)); + } + return ret; +} + /** * Configure1 dialog * @return dialog result @@ -87,28 +99,41 @@ /* Lxc configure1 dialog caption */ string caption = _("LXC Configuration"); - list<string> bridge_items = [ "br0", "br1" ]; list<term> template_items = read_templates (); term contents = `HBox (`HSpacing (), `VBox ( `VSpacing (), - // text entry - `Left (`TextEntry (`id (`name), _("Container Name"))), - // combo box label - `Left (`ComboBox (`id (`template), `opt (`hstretch), _("Template"), template_items)), + // frame label + `Frame (_("New Container"), `HBox ( + `HSpacing (0.5), + // text entry + `Left (`TextEntry (`id (`name), _("Name"))), + // combo box label + `ComboBox (`id (`template), _("Template"), template_items) + )), `VSpacing (), // frame label `Frame (_("Network Settings"), `HBox ( `HSpacing (0.5), `VBox ( - `VSpacing (0.5), `HBox ( + // text entry label `TextEntry (`id (`ip), _("IP Address")), - `TextEntry (`id (`subnet), _("Subnet"), "/24") + // text entry label + `TextEntry (`id (`subnet), _("Subnet"), "/24"), + `ReplacePoint (`id (`rp_lan), + // combo box label + `ComboBox (`id (`bridge), _("Bridge"), read_bridges_ids ()) + ) ), - `Left (`ComboBox (`id (`bridge), _("Bridge"), bridge_items)) + `VSpacing (0.5), + `Right ( + // push button label + `PushButton (`id (`lan), _("Configure Network...")) + ) ), `HSpacing (0.5) )), + `VSpacing (), // frame label `Frame (_("Password Settings"), `HBox ( `HSpacing (0.5), @@ -119,9 +144,19 @@ `HSpacing (0.5) )), `VSpacing (2), - `ReplacePoint (`id (`rpbutton), + `ReplacePoint (`id (`rp_status), + `Label (`id (`status), "") + ), + `VSpacing (), + `HBox ( + // button label + `PushButton (`id (`create), _("Create")), + `ReplacePoint (`id (`rpbutton), + // button label + `PushButton (`id (`start), _("Start")) + ), // button label - `PushButton (`id (`start), _("Create New Container")) + `PushButton (`id (`destroy), _("Destroy")) ) ), `HSpacing ()); @@ -135,6 +170,10 @@ UI::ChangeWidget (`id (`ip), `ValidChars, IP::ValidChars4); + foreach (any b, [ `start, `destroy ], { + UI::ChangeWidget (`id (b), `Enabled, false); + }); + any ret = nil; while(true) { @@ -144,6 +183,19 @@ break; } + if (ret == `lan) + { + any lan_ret = WFM::CallFunction ("lan"); + if (lan_ret == `next || lan_ret == `finish) + { + UI::ReplaceWidget (`id (`rp_lan), + // combo box label + `ComboBox (`id (`bridge), _("Bridge"), read_bridges_ids ()) + ); + } + continue; + } + string name = (string) UI::QueryWidget (`id (`name), `Value); string ip = (string) UI::QueryWidget (`id (`ip), `Value); string subnet = (string) UI::QueryWidget (`id (`subnet), `Value); @@ -174,10 +226,10 @@ continue; } - if (ret == `start) + if (ret == `create) { // busy message - Popup::ShowFeedback ("", "Creating Configuration..."); + Popup::ShowFeedback ("", _("Creating Configuration...")); // lxc-createconfig -n <name> [-i <ipaddr/cidr>] [-b <bridge>] [-t <template] string cmd = sformat ("echo 'y' | lxc-createconfig -n %1", name); @@ -222,7 +274,7 @@ } // busy message - Popup::ShowFeedback ("", "Creating Container..."); + Popup::ShowFeedback ("", sformat (_("Creating Container %1..."), name)); // lxc-create -n <name> -f /root/<name>.config -t <template> cmd = sformat ("lxc-create -n %1 -f /root/%1.config", name); @@ -247,25 +299,43 @@ } // busy message - Popup::ShowFeedback ("", "Saving Root Password..."); + Popup::ShowFeedback ("", _("Saving Root Password...")); string password = crypt_password (pw1, method); string file = sformat ("/var/lib/lxc/%1/rootfs/etc/shadow", name); if (pw1 != "" && FileUtils::Exists (file)) { + // slash would break sed command + password = mergestring (splitstring (password, "/"), "\\/"); // change the root password in the file /var/lib/lxc/<name>/rootfs/etc/shadow/ - SCR::Execute (.target.bash, sformat ("sed --in-place 's/^root:[^:]*:/root:%1:/' %2", - password, file)); + cmd = sformat ("sed --in-place 's/^root:[^:]*:/root:%1:/' %2", password, file); + out = (map) SCR::Execute (.target.bash_output, cmd); + y2security ("out: %1", out); } Popup::ClearFeedback (); + foreach (any t, [ `create, `name, `ip, `subnet, `bridge, `lan, `template, `pw1, `pw2 ], { + UI::ChangeWidget (`id (t), `Enabled, false); + }); + UI::ChangeWidget (`id (`start), `Enabled, true); + UI::ChangeWidget (`id (`destroy), `Enabled, true); + UI::ReplaceWidget (`id (`rp_status), + // status text + `Label (`id (`status), sformat (_("Container '%1' was successfully created."), name)) + ); + continue; + } + if (ret == `start) + { + string cmd = sformat ("xterm -e lxc-start -n %1", name); - cmd = sformat ("xterm -e lxc-start -n %1", name); + UI::ReplaceWidget (`id (`rp_status), `Label (`id (`status), "")); integer id = (integer) SCR::Execute (.process.start_shell, cmd); UI::ReplaceWidget (`id (`rpbutton), `PushButton (`id (`cancel), Label::CancelButton ()) ); + UI::ChangeWidget (`id (`destroy), `Enabled, false); while (true) { symbol ui = (symbol) UI::PollInput(); @@ -281,11 +351,43 @@ break; } } + UI::ChangeWidget (`id (`destroy), `Enabled, true); UI::ReplaceWidget (`id (`rpbutton), - `PushButton (`id (`start), _("Create New Container")) + `PushButton (`id (`start), _("Start")) ); continue; } + if (ret == `destroy) + { + UI::ReplaceWidget (`id (`rp_status), `Label (`id (`status), "")); + + // busy message + Popup::ShowFeedback ("", sformat ("Destroying Container '%1'...", name)); + + string cmd = "lxc-destroy -n " + name; + map out = (map) SCR::Execute (.target.bash_output, cmd); + + y2internal ("out: %1", out); + + Popup::ClearFeedback (); + + if (out["exit"]:0 != 0) + { + // error message + Report::Error (sformat (_("Error while destroying: + +%1"), out["stdout"]:"")); + } + else + { + foreach (any t, [ `create, `name, `ip, `subnet, `bridge, `lan, `template, `pw1, `pw2 ], { + UI::ChangeWidget (`id (t), `Enabled, true); + }); + UI::ChangeWidget (`id (`start), `Enabled, false); + UI::ChangeWidget (`id (`destroy), `Enabled, false); + } + continue; + } } UI::CloseDialog(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67971 - in /branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src: IscsiLioData.ycp IscsiLioServer.ycp
by fehr＠svn2.opensuse.org 19 Apr '12

19 Apr '12

Author: fehr Date: Thu Apr 19 16:47:56 2012 New Revision: 67971 URL: http://svn.opensuse.org/viewcvs/yast?rev=67971&view=rev Log: checkin for backup purposes Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioServer.ycp Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp Thu Apr 19 16:47:56 2012 @@ -474,11 +474,11 @@ state = mapmap( string s, boolean b, state, { ls = splitstring( s, "/" ); - return( $[ ls[6]:"" + " " + ls[7]:"" + " " + ls[9]:"" : b ] ); + return( $[ ls[6]:"" + " " + substring(ls[7]:"",5) + " " + ls[9]:"" : b ] ); }); y2milestone( "GetConnected state:%1", state ); ls = maplist( string s, boolean b, filter( string s, boolean b, state, ``(b)), - ``(splitstring( s, " " )[2]:"")); + ``(s)); y2milestone( "GetConnected ret:%1", ls ); return( ls ); } @@ -700,6 +700,18 @@ } }); }); + list<string> cl = GetConnected(); + foreach( string s, cl, + { + list ls = SplitStringNE( s, " " ); + ls[1] = tointeger( ls[1]:"-1" ); + y2milestone( "ParseConfigLio conn:%1", ls ); + if( haskey( tgmap[ls[0]:""]:$[], ls[1]:-1 )) + tgmap[ls[0]:"",ls[1]:-1,"conn"] = + tgmap[ls[0]:"",ls[1]:"","conn"]:0 + 1; + if( haskey(tgmap[ls[0]:"",ls[1]:-1,"clnt"]:$[], ls[2]:"" )) + tgmap[ls[0]:"",ls[1]:-1,"clnt",ls[2]:"","connected"] = true; + }); ret["tgt"] = tgmap; return( ret ); } Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioServer.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioServer.ycp Thu Apr 19 16:47:56 2012 @@ -194,83 +194,6 @@ return true; } -// #157643 - reload server -boolean reloadServer() - { - return true; - // ask user whether reload or restart server - // #180205 - gettext problem - string wasn't marked to translate - if (Popup::YesNo(_( "If changes have been made, the iSCSI target is not able -to reload current configuration. It can only restart. -When restarting, all sessions are aborted. -Restart the target service? -"))) - Service::Restart("target"); - else - { - // get changes from perl module - map<string, any> changes = IscsiLioData::GetChanges(); - list<string> connected = IscsiLioData::GetConnected(); - // delete targets - foreach(string row, changes["del"]:[], - { - if (!contains(connected, row)){ - y2milestone("row to delete %1", row); - string target=((map<string, any>)SCR::Execute(.target.bash_output, - // get TID number for target - "cat /proc/net/iet/volume|grep $TARGET", $["TARGET":row]))["stdout"]:"" ; - string to_delete = splitstring( splitstring(target, " ")[0]:"", ":")[1]:""; - y2milestone("to delete %1", to_delete); - // delete record with that TID - SCR::Execute(.target.bash_output, "ietadm --op delete --tid=$TID", $["TID":to_delete]); - } - else - y2error("Cannot remove target %1 - already connected", row); - }); - - // add a new target - foreach(string row, changes["add"]:[], - { - y2milestone("row to add %1", row); - // create new target - SCR::Execute(.target.bash_output, "ietadm --op new --tid=0 --params Name=$NAME", $["NAME":row]); - string target=((map<string, any>)SCR::Execute(.target.bash_output, - "cat /proc/net/iet/volume|grep $TARGET", $["TARGET":row]))["stdout"]:"" ; - // get TID of that target - string to_add = splitstring( splitstring(target, " ")[0]:"", ":")[1]:""; - y2milestone("to add %1", to_add); - list<string> lun = []; - list <string> secret = []; - // add authentication to target - foreach( map<string, any> conf_row, (list<map<string, any> >) IscsiLioData::GetConfig()[row]:[], - { - switch (conf_row["KEY"]:"") - { - case("Lun") : lun = splitstring(conf_row["VALUE"]:"", " "); - break; - case("IncomingUser") : - secret = splitstring(conf_row["VALUE"]:"", " "); - y2milestone("params %1 %2 %3", to_add, secret[0]:"", secret[1]:""); - SCR::Execute(.target.bash_output, "ietadm --op new --tid=$TID --user --params=IncomingUser=$US,Password=$PASS", $["TID":to_add, "US":secret[0]:"", "PASS":secret[1]:""]); - break; - case("OutgoingUser") : - secret = splitstring(conf_row["VALUE"]:"", " "); - SCR::Execute(.target.bash_output, "ietadm --op new --tid=$TID --user --params=OutgoingUser=$US,Password=$PASS", $["TID":to_add, "US":secret[0]:"", "PASS":secret[1]:""]); - break; - } - }); - string lun_num = lun[0]:""; - string lun_path = splitstring(lun[1]:"", ",")[0]:""; - // add LUN for target - string command = sformat("ietadm --op new --tid=%1 --lun=%2 --params %3", to_add, lun_num, lun_path); - SCR::Execute(.target.bash_output, command, $[]); - y2milestone("lun %1,%2", lun_num, lun_path); - }); - } - return true; - } - - /** * Read all iscsi-lio-server settings * @return true on success @@ -356,11 +279,6 @@ sleep(sl); if(Abort()) return false; - /* Progress finished */ - Progress::NextStage(); - sleep(sl); - - if(Abort()) return false; modified = false; configured = true; return true; @@ -407,18 +325,6 @@ Progress::NextStage(); sleep(sl); - - if(Abort()) return false; - Progress::NextStage (); - // ask user whether reload or restart server and do it - if ( (serviceStatus) || (statusOnStart) ) - if (!reloadServer()) return false; - sleep(sl); - - if(Abort()) return false; - Progress::NextStage(); - sleep(sl); - // set target initscript status if(!setServiceStatus()) return false; return true; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67970 - in /trunk: dhcp-server/package/ dhcp-server/src/ ftp-server/package/ ftp-server/src/ http-server/package/ http-server/src/ isns/package/ isns/src/
by jsrain＠svn2.opensuse.org 19 Apr '12

19 Apr '12

Author: jsrain Date: Thu Apr 19 13:57:38 2012 New Revision: 67970 URL: http://svn.opensuse.org/viewcvs/yast?rev=67970&view=rev Log: use the ButtonBox widget (bnc#684863) Modified: trunk/dhcp-server/package/yast2-dhcp-server.changes trunk/dhcp-server/src/dns-server-dialogs.ycp trunk/dhcp-server/src/dns-server-management.ycp trunk/dhcp-server/src/dns-server-wizard.ycp trunk/ftp-server/package/yast2-ftp-server.changes trunk/ftp-server/src/complex.ycp trunk/ftp-server/src/wid_functions.ycp trunk/http-server/package/yast2-http-server.changes trunk/http-server/src/HttpServerWidgets.ycp trunk/isns/package/yast2-isns.changes trunk/isns/src/widgets.ycp Modified: trunk/dhcp-server/package/yast2-dhcp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/package/yast2-dhcp-s… ============================================================================== --- trunk/dhcp-server/package/yast2-dhcp-server.changes (original) +++ trunk/dhcp-server/package/yast2-dhcp-server.changes Thu Apr 19 13:57:38 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Apr 19 10:57:31 UTC 2012 - jsrain(a)suse.cz + +- use the ButtonBox widget (bnc#684863) + +------------------------------------------------------------------- Thu Mar 29 14:28:18 CEST 2012 - jsuchome(a)suse.cz - merged proofed texts Modified: trunk/dhcp-server/src/dns-server-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/src/dns-server-dialo… ============================================================================== --- trunk/dhcp-server/src/dns-server-dialogs.ycp (original) +++ trunk/dhcp-server/src/dns-server-dialogs.ycp Thu Apr 19 13:57:38 2012 @@ -88,9 +88,8 @@ ) ) )), - `HBox ( + `ButtonBox ( `PushButton (`id(`ok), Label::OKButton()), - `HSpacing (1), `PushButton (`id(`cancel), Label::CancelButton()) ) )); Modified: trunk/dhcp-server/src/dns-server-management.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/src/dns-server-manag… ============================================================================== --- trunk/dhcp-server/src/dns-server-management.ycp (original) +++ trunk/dhcp-server/src/dns-server-management.ycp Thu Apr 19 13:57:38 2012 @@ -206,9 +206,8 @@ `TextEntry (`id ("new_ip"), _("&IP Address")) ) )), - `HBox ( + `ButtonBox ( `PushButton (`id(`ok), Label::OKButton()), - `HSpacing (1), `PushButton (`id(`cancel), Label::CancelButton()) ) )); @@ -309,9 +308,8 @@ `HWeight (1, `TextEntry (`id ("last_ip"), _("&Last IP Address"))) ) )), - `HBox ( + `ButtonBox ( `PushButton (`id(`ok), Label::OKButton()), - `HSpacing (1), `PushButton (`id(`cancel), Label::CancelButton()) ) )); Modified: trunk/dhcp-server/src/dns-server-wizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/src/dns-server-wizar… ============================================================================== --- trunk/dhcp-server/src/dns-server-wizard.ycp (original) +++ trunk/dhcp-server/src/dns-server-wizard.ycp Thu Apr 19 13:57:38 2012 @@ -129,7 +129,7 @@ ) ) ), - `HBox ( + `ButtonBox ( `PushButton (`id(`ok), Label::OKButton()), `PushButton (`id(`cancel), Label::CancelButton()) ) Modified: trunk/ftp-server/package/yast2-ftp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/package/yast2-ftp-ser… ============================================================================== --- trunk/ftp-server/package/yast2-ftp-server.changes (original) +++ trunk/ftp-server/package/yast2-ftp-server.changes Thu Apr 19 13:57:38 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Apr 19 10:57:21 UTC 2012 - jsrain(a)suse.cz + +- use the ButtonBox widget (bnc#684863) + +------------------------------------------------------------------- Mon Apr 16 07:13:41 UTC 2012 - jsrain(a)suse.cz - fixed reading of PureFTPD passive port range (bnc#756612) Modified: trunk/ftp-server/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/complex.ycp?rev=6… ============================================================================== --- trunk/ftp-server/src/complex.ycp (original) +++ trunk/ftp-server/src/complex.ycp Thu Apr 19 13:57:38 2012 @@ -84,7 +84,7 @@ `Left(`Label(_("Press Cancel to cancel FTP configuration."))), `Left(`RadioButton(`id(0), `opt(`notify), _("&vsftpd"), true)), `Left(`RadioButton(`id(1), `opt(`notify), _("&pure-ftpd"))), - `HBox( + `ButtonBox( `PushButton(`id(`accept), Label::OKButton()), `PushButton(`id(`cancel), Label::CancelButton()) ) @@ -185,7 +185,7 @@ `Label(_("Choose daemon?")), `Left(`RadioButton(`id(0), `opt(`notify), _("&vsftpd"), ((FtpServer::vsftpd_edit)? true:false))), `Left(`RadioButton(`id(1), `opt(`notify), _("&pure-ftpd"), ((FtpServer::vsftpd_edit)? false:true))), - `HBox( + `ButtonBox( `PushButton(`id(`close), Label::OKButton()), `PushButton(`id(`abort), Label::CancelButton()) ) Modified: trunk/ftp-server/src/wid_functions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/wid_functions.ycp… ============================================================================== --- trunk/ftp-server/src/wid_functions.ycp (original) +++ trunk/ftp-server/src/wid_functions.ycp Thu Apr 19 13:57:38 2012 @@ -84,7 +84,7 @@ UI::OpenDialog( `VBox( `Label(_("Xinetd is not running.")), `Label(_("Start it now?")), - `HBox( + `ButtonBox( `PushButton(`id(`accept), Label::OKButton()), `PushButton(`id(`cancel), Label::CancelButton()) ) Modified: trunk/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/package/yast2-http-s… ============================================================================== --- trunk/http-server/package/yast2-http-server.changes (original) +++ trunk/http-server/package/yast2-http-server.changes Thu Apr 19 13:57:38 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Apr 19 10:56:50 UTC 2012 - jsrain(a)suse.cz + +- use the ButtonBox widget (bnc#684863) + +------------------------------------------------------------------- Thu Mar 29 15:11:25 CEST 2012 - jsuchome(a)suse.cz - merged proofed texts Modified: trunk/http-server/src/HttpServerWidgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/HttpServerWidget… ============================================================================== --- trunk/http-server/src/HttpServerWidgets.ycp (original) +++ trunk/http-server/src/HttpServerWidgets.ycp Thu Apr 19 13:57:38 2012 @@ -1067,7 +1067,7 @@ `TextEntry(`id(`serv_name), _("ServerName")) , `VSpacing(), - `HBox( + `ButtonBox( `PushButton( `id(`ok), Label::OKButton() ), `PushButton( `id(`cancel), Label::CancelButton() ) ) @@ -1901,7 +1901,7 @@ // translators: combo box label for list of configured IPs `Left( `ComboBox( `id("address"), `opt( `editable ), _("Network &Address:"), ips ) ), `VSpacing(), - `HBox( + `ButtonBox( `PushButton( `id(`ok), Label::OKButton() ), `PushButton( `id(`cancel), Label::CancelButton() ) ) @@ -2578,7 +2578,7 @@ `VBox( // translators: combo box for selsect module from installed unknown modules `ComboBox(`id(`mod), _("New Module &Name:"), unknown_modules ), - `HBox( + `ButtonBox( `PushButton(`id(`ok), `opt(`default), Label::OKButton() ), `PushButton(`id(`cancel), Label::CancelButton() ) ) Modified: trunk/isns/package/yast2-isns.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/package/yast2-isns.changes?… ============================================================================== --- trunk/isns/package/yast2-isns.changes (original) +++ trunk/isns/package/yast2-isns.changes Thu Apr 19 13:57:38 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Apr 19 10:57:13 UTC 2012 - jsrain(a)suse.cz + +- use the ButtonBox widget (bnc#684863) + +------------------------------------------------------------------- Thu Mar 29 15:17:08 CEST 2012 - jsuchome(a)suse.cz - merged proofread texts Modified: trunk/isns/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/src/widgets.ycp?rev=67970&r… ============================================================================== --- trunk/isns/src/widgets.ycp (original) +++ trunk/isns/src/widgets.ycp Thu Apr 19 13:57:38 2012 @@ -35,7 +35,7 @@ `HSpacing(3) ), `VSpacing(1), - `HBox( `PushButton(`id(`ok), Label::OKButton() ), `PushButton(`id(`cancel), Label::CancelButton() )), + `ButtonBox( `PushButton(`id(`ok), Label::OKButton() ), `PushButton(`id(`cancel), Label::CancelButton() )), `VSpacing(1) ); UI::OpenDialog(dd_dialog); @@ -108,7 +108,7 @@ `VBox( `VSpacing(1), `Left( `HWeight(3,`InputField( `id( `ddsentry ), `opt(`hstretch), _("Discovery Domain Set Name") )) ), - `Left( `HBox( `PushButton(`id(`ok), Label::OKButton() ), `PushButton(`id(`cancel), Label::CancelButton() ))), + `Left( `ButtonBox( `PushButton(`id(`ok), Label::OKButton() ), `PushButton(`id(`cancel), Label::CancelButton() ))), `VSpacing(1) ), `HSpacing(5) @@ -138,7 +138,7 @@ `VBox( `VSpacing(1), `Left( `HWeight(3,`InputField( `id( `nodeentry ), `opt(`hstretch), _("iSCSI Node Name"))) ), - `Left( `HBox( `PushButton(`id(`ok), Label::OKButton() ), `PushButton(`id(`cancel), Label::CancelButton() ))), + `Left( `ButtonBox( `PushButton(`id(`ok), Label::OKButton() ), `PushButton(`id(`cancel), Label::CancelButton() ))), `VSpacing(1) ), `HSpacing(5) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67969 - /branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/yast2-iscsi-lio-server.spec.in
by fehr＠svn2.opensuse.org 18 Apr '12

18 Apr '12

Author: fehr Date: Wed Apr 18 18:33:07 2012 New Revision: 67969 URL: http://svn.opensuse.org/viewcvs/yast?rev=67969&view=rev Log: checkin for backup purposes Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/yast2-iscsi-lio-server.spec.in Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/yast2-iscsi-lio-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/yast2-iscsi-lio-server.spec.in (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/yast2-iscsi-lio-server.spec.in Wed Apr 18 18:33:07 2012 @@ -2,15 +2,21 @@ @HEADER@ +Group: System/YaST +License: GPL-2.0 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 -Requires: yast2 + +# network needs Wizard::OpenCancelOKDialog() +# function from yast2-2.18.2 +# Wizard::SetDesktopTitleAndIcon() +Requires: yast2 >= 2.21.22 BuildArchitectures: noarch Summary: Configuration of iSCSI LIO target %description -- +Configuration of iSCSI LIO target @PREP@ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67968 - in /branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src: IscsiLioData.ycp dialogs.ycp widgets.ycp
by fehr＠svn2.opensuse.org 18 Apr '12

18 Apr '12

Author: fehr Date: Wed Apr 18 17:55:14 2012 New Revision: 67968 URL: http://svn.opensuse.org/viewcvs/yast?rev=67968&view=rev Log: checkin for backup purposes Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/dialogs.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp Wed Apr 18 17:55:14 2012 @@ -286,6 +286,8 @@ global map GetAuth( string tgt, integer tpg, string clnt ) { map m = GetTgt(data,tgt,tpg); + if( !isempty(tgt) ) + m = m["clnt",clnt]:$[]; return( $[ "incoming" : m["incoming",0]:[], "outgoing" : m["outgoing"]:[] ] ); } @@ -881,7 +883,7 @@ } else { - string param = tgt + " " + tpg + " " + clnt; + string param = tgt + " " + tpg + " " + clnt + " "; if( !isempty(inc) ) { cmd = "lio_node --setchapauth " + param; @@ -936,6 +938,26 @@ return( ret ); } +global boolean DoRemoveClntLun( string tgt, integer tpg, string clnt, + integer lun ) + { + string kt = tgt + " " + tpg + " " + clnt + " " + lun; + boolean ret = LogExecCmd( "lio_node --dellunacl " + kt ); + y2milestone( "DoRemoveClntLun tgt:%1 tpg:%2 clnt:%3 lun:%4 ret:%5", + tgt, tpg, clnt, lun, ret ); + return( ret ); + } + +global boolean DoCreateClntLun( string tgt, integer tpg, string clnt, + integer lun, integer tlun ) + { + string kt = tgt + " " + tpg + " " + clnt + " " + tlun + " " + lun; + boolean ret = LogExecCmd( "lio_node --addlunacl " + kt ); + y2milestone( "DoCreateClntLun tgt:%1 tpg:%2 clnt:%3 lun:%4:%5 ret:%6", + tgt, tpg, clnt, lun, tlun, ret ); + return( ret ); + } + global void UpdateConfig() { data = ParseConfigLio(); Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/dialogs.ycp Wed Apr 18 17:55:14 2012 @@ -346,7 +346,6 @@ // Main dialog - tabbed any SummaryDialog() { string caption = _("LIO iSCSI Target Overview"); - curr_target = ""; map widget_descr = $[ "tab": CWMTab::CreateWidget($[ "tab_order": [ "service", "global", "targets" ], Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp Wed Apr 18 17:55:14 2012 @@ -684,13 +684,19 @@ list <term> inc_items = []; // create items from targets list<list> tgt = IscsiLioData::GetTargets(); + integer cur = 0; foreach(list l, tgt, { inc_items = add(inc_items, `item(`id(count), l[0]:"", tostring(l[1]:0))); + y2milestone( "tgt:%1 tpg:%2 ctgt:%3 ctpg:%4", l[0]:"", l[1]:0, curr_target, curr_tpg ); + if( curr_target==l[0]:"" && curr_tpg==l[1]:1 ) + cur = count; count = count + 1; }); // put it into table UI::ChangeWidget(`id(`server), `Items, inc_items); + if( cur!=0 ) + UI::ChangeWidget(`id(`server), `CurrentItem, cur); } symbol handleTable (string table, map event) @@ -734,11 +740,6 @@ curr_target = t[1]:""; curr_tpg = tointeger(t[2]:""); y2milestone("handleTable tgt:%1 tpg:%2", curr_target, curr_tpg ); - if (IscsiServerFunctions::setModifChanges( curr_target ) == 0) - y2milestone("modified %1", curr_target); - else - y2error("%1 already modified", curr_target); - // goto EditDialog() (initModify) ret = `edit; break; } @@ -1212,10 +1213,33 @@ return( ret ); } +boolean removeClntLun( string tgt, integer tpg, string clnt, integer lun ) + { + boolean ret = IscsiLioData::DoRemoveClntLun( tgt, tpg, clnt, lun ); + if( !ret ) + { + string txt = sformat( _("Problem removing lun %4 for client %3 in %1:%2"), + tgt, tpg, clnt, lun ); + Popup::Error( txt ); + } + return( ret ); + } + +boolean createClntLun( string tgt, integer tpg, string clnt, integer lun, integer tlun ) + { + boolean ret = IscsiLioData::DoCreateClntLun( tgt, tpg, clnt, lun, tlun ); + if( !ret ) + { + string txt = sformat( _("Problem adding lun %4:%5 for client %3 in %1:%2"), + tgt, tpg, clnt, lun, tlun ); + Popup::Error( txt ); + } + return( ret ); + } + void storeClient(string option_id, map option_map) { boolean chg = false; - //map<string, map<integer,integer> > changed_lun = $[]; list<string> cl = IscsiLioData::GetClntList( curr_target, curr_tpg ); foreach( string c, del_clnt, ``{ @@ -1231,21 +1255,27 @@ } }); del_clnt = []; - foreach( string c, map m, changed_auth, + list<string> new_clnt = maplist( string c, map m, changed_auth, ``(c)); + new_clnt = (list<string>)union( new_clnt, + maplist( string c, map m, changed_lun, ``(c))); + new_clnt = filter( string c, new_clnt, ``(!contains( cl, c ))); + if( !isempty(new_clnt) ) + y2milestone( "storeClient new clnt:%1", new_clnt ); + foreach( string c, new_clnt, { - boolean ok = true; - if( !contains( cl, c )) + chg = true; + if( !IscsiLioData::DoCreateClnt( curr_target, curr_tpg, c )) { - chg = true; - if( !IscsiLioData::DoCreateClnt( curr_target, curr_tpg, c )) - { - string txt = sformat( _("Problem creating client %3 for %1:%2"), - curr_target, curr_tpg, c ); - Popup::Error( txt ); - ok = false; - } + string txt = sformat( _("Problem creating client %3 for %1:%2"), + curr_target, curr_tpg, c ); + Popup::Error( txt ); } - if( ok ) + else + cl = add( cl, c ); + }); + foreach( string c, map m, changed_auth, + { + if( contains( cl, c )) { map ca = IscsiLioData::GetAuth( curr_target, curr_tpg, c ); if( isempty(m["incoming"]:[])!=isempty(ca["incoming"]:[]) || @@ -1267,9 +1297,36 @@ } } } - }); changed_auth = $[]; + foreach( string c, map<integer,integer> m, changed_lun, + { + if( contains( cl, c )) + { + map<integer,integer> cl = IscsiLioData::GetClntLun( curr_target, curr_tpg, c ); + foreach( integer l, integer ol, cl, + { + if( !haskey( m, l ) && removeClntLun( curr_target, curr_tpg, c, l )) + chg = true; + }); + foreach( integer l, integer ol, m, + { + if( !haskey( cl, l ) ) + { + if( createClntLun( curr_target, curr_tpg, c, l, ol )) + chg = true; + } + else if( cl[l]:-1!=ol ) + { + if( removeClntLun( curr_target, curr_tpg, c, l )) + chg = true; + if( createClntLun( curr_target, curr_tpg, c, l, ol )) + chg = true; + } + }); + } + }); + changed_lun = $[]; y2milestone( "storeClient chg:%1", chg ); if( chg ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67967 - in /branches/SuSE-Code-11-SP2-Branch/lxc/src: Lxc.ycp dialogs.ycp lxc.ycp
by jsuchome＠svn2.opensuse.org 18 Apr '12

18 Apr '12

Author: jsuchome Date: Wed Apr 18 08:31:12 2012 New Revision: 67967 URL: http://svn.opensuse.org/viewcvs/yast?rev=67967&view=rev Log: its new year... Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp branches/SuSE-Code-11-SP2-Branch/lxc/src/lxc.ycp Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp Wed Apr 18 08:31:12 2012 @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------------ - * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * Copyright (c) 2012 Novell, Inc. All Rights Reserved. * * * This program is free software; you can redistribute it and/or modify it under Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp Wed Apr 18 08:31:12 2012 @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------------ - * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * Copyright (c) 2012 Novell, Inc. All Rights Reserved. * * * This program is free software; you can redistribute it and/or modify it under Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/lxc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/lxc.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/lxc.ycp Wed Apr 18 08:31:12 2012 @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------------------ - * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * Copyright (c) 2012 Novell, Inc. All Rights Reserved. * * * This program is free software; you can redistribute it and/or modify it under -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67966 - in /branches/SuSE-Code-11-SP2-Branch/lxc/testsuite/tests: Lxc.err Lxc.out Lxc.ycp
by jsuchome＠svn2.opensuse.org 17 Apr '12

17 Apr '12

Author: jsuchome Date: Tue Apr 17 17:43:53 2012 New Revision: 67966 URL: http://svn.opensuse.org/viewcvs/yast?rev=67966&view=rev Log: none so far Removed: branches/SuSE-Code-11-SP2-Branch/lxc/testsuite/tests/Lxc.err branches/SuSE-Code-11-SP2-Branch/lxc/testsuite/tests/Lxc.out branches/SuSE-Code-11-SP2-Branch/lxc/testsuite/tests/Lxc.ycp -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67965 - in /branches/SuSE-Code-11-SP2-Branch/lxc: ./ doc/ doc/autodocs/ package/ src/ testsuite/ testsuite/tests/
by jsuchome＠svn2.opensuse.org 17 Apr '12

17 Apr '12

Author: jsuchome Date: Tue Apr 17 17:43:25 2012 New Revision: 67965 URL: http://svn.opensuse.org/viewcvs/yast?rev=67965&view=rev Log: module for LXC (Linux Containers) Added: branches/SuSE-Code-11-SP2-Branch/lxc/ branches/SuSE-Code-11-SP2-Branch/lxc/MAINTAINER branches/SuSE-Code-11-SP2-Branch/lxc/Makefile.cvs branches/SuSE-Code-11-SP2-Branch/lxc/RPMNAME branches/SuSE-Code-11-SP2-Branch/lxc/VERSION branches/SuSE-Code-11-SP2-Branch/lxc/_cvsignore branches/SuSE-Code-11-SP2-Branch/lxc/configure.in.in branches/SuSE-Code-11-SP2-Branch/lxc/doc/ branches/SuSE-Code-11-SP2-Branch/lxc/doc/Makefile.am branches/SuSE-Code-11-SP2-Branch/lxc/doc/_cvsignore branches/SuSE-Code-11-SP2-Branch/lxc/doc/autodocs/ branches/SuSE-Code-11-SP2-Branch/lxc/doc/autodocs/Makefile.am branches/SuSE-Code-11-SP2-Branch/lxc/doc/autodocs/_cvsignore branches/SuSE-Code-11-SP2-Branch/lxc/package/ branches/SuSE-Code-11-SP2-Branch/lxc/package/_cvsignore branches/SuSE-Code-11-SP2-Branch/lxc/package/yast2-lxc.changes branches/SuSE-Code-11-SP2-Branch/lxc/src/ branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp (with props) branches/SuSE-Code-11-SP2-Branch/lxc/src/Makefile.am branches/SuSE-Code-11-SP2-Branch/lxc/src/_cvsignore branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp (with props) branches/SuSE-Code-11-SP2-Branch/lxc/src/lxc.desktop branches/SuSE-Code-11-SP2-Branch/lxc/src/lxc.ycp (with props) branches/SuSE-Code-11-SP2-Branch/lxc/testsuite/ branches/SuSE-Code-11-SP2-Branch/lxc/testsuite/Makefile.am branches/SuSE-Code-11-SP2-Branch/lxc/testsuite/_cvsignore branches/SuSE-Code-11-SP2-Branch/lxc/testsuite/tests/ branches/SuSE-Code-11-SP2-Branch/lxc/testsuite/tests/Lxc.err branches/SuSE-Code-11-SP2-Branch/lxc/testsuite/tests/Lxc.out branches/SuSE-Code-11-SP2-Branch/lxc/testsuite/tests/Lxc.ycp (with props) branches/SuSE-Code-11-SP2-Branch/lxc/testsuite/tests/_cvsignore branches/SuSE-Code-11-SP2-Branch/lxc/yast2-lxc.spec.in Added: branches/SuSE-Code-11-SP2-Branch/lxc/MAINTAINER URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/M… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/MAINTAINER (added) +++ branches/SuSE-Code-11-SP2-Branch/lxc/MAINTAINER Tue Apr 17 17:43:25 2012 @@ -0,0 +1 @@ +Jiri Suchomel <jsuchome(a)suse.cz> Added: branches/SuSE-Code-11-SP2-Branch/lxc/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/M… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/Makefile.cvs (added) +++ branches/SuSE-Code-11-SP2-Branch/lxc/Makefile.cvs Tue Apr 17 17:43:25 2012 @@ -0,0 +1,22 @@ +# +# Makefile.cvs +# +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + +configure: all + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) + +all: + y2tool y2autoconf + y2tool y2automake + autoreconf --force --install + +install: configure + make + make install + +reconf: all + ./config.status --recheck + ./config.status Added: branches/SuSE-Code-11-SP2-Branch/lxc/RPMNAME URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/R… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/RPMNAME (added) +++ branches/SuSE-Code-11-SP2-Branch/lxc/RPMNAME Tue Apr 17 17:43:25 2012 @@ -0,0 +1 @@ +yast2-lxc Added: branches/SuSE-Code-11-SP2-Branch/lxc/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/V… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/VERSION (added) +++ branches/SuSE-Code-11-SP2-Branch/lxc/VERSION Tue Apr 17 17:43:25 2012 @@ -0,0 +1 @@ +2.17.0 Added: branches/SuSE-Code-11-SP2-Branch/lxc/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/_… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/_cvsignore (added) +++ branches/SuSE-Code-11-SP2-Branch/lxc/_cvsignore Tue Apr 17 17:43:25 2012 @@ -0,0 +1,20 @@ +Makefile +Makefile.am +Makefile.am.common +Makefile.in +aclocal.m4 +config.cache +config.guess +config.h.in +config.log +config.status +config.sub +configure +configure.in +depcomp +install-sh +missing +mkinstalldirs +stamp-h +lxc.pot +autom4te.cache Added: branches/SuSE-Code-11-SP2-Branch/lxc/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/c… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/configure.in.in (added) +++ branches/SuSE-Code-11-SP2-Branch/lxc/configure.in.in Tue Apr 17 17:43:25 2012 @@ -0,0 +1,12 @@ +## YCP module configure.in.in + +## Initialize +@YAST2-INIT-COMMON@ +@YAST2-INIT-YCP@ + +## some common checks +@YAST2-CHECKS-COMMON@ +@YAST2-CHECKS-YCP@ + +## and generate the output... +@YAST2-OUTPUT@ Added: branches/SuSE-Code-11-SP2-Branch/lxc/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/d… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/doc/Makefile.am (added) +++ branches/SuSE-Code-11-SP2-Branch/lxc/doc/Makefile.am Tue Apr 17 17:43:25 2012 @@ -0,0 +1,10 @@ +# Makefile.am for lxc/doc + +SUBDIRS = autodocs + +htmldir = $(docdir) + +doc_DATA = +html_DATA = + +EXTRA_DIST = $(doc_DATA) $(html_DATA) Added: branches/SuSE-Code-11-SP2-Branch/lxc/doc/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/d… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/doc/_cvsignore (added) +++ branches/SuSE-Code-11-SP2-Branch/lxc/doc/_cvsignore Tue Apr 17 17:43:25 2012 @@ -0,0 +1,2 @@ +Makefile +Makefile.in Added: branches/SuSE-Code-11-SP2-Branch/lxc/doc/autodocs/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/d… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/doc/autodocs/Makefile.am (added) +++ branches/SuSE-Code-11-SP2-Branch/lxc/doc/autodocs/Makefile.am Tue Apr 17 17:43:25 2012 @@ -0,0 +1,3 @@ +# Makefile.am for lxc/doc/autodocs + +include $(top_srcdir)/autodocs-ycp.ami Added: branches/SuSE-Code-11-SP2-Branch/lxc/doc/autodocs/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/d… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/doc/autodocs/_cvsignore (added) +++ branches/SuSE-Code-11-SP2-Branch/lxc/doc/autodocs/_cvsignore Tue Apr 17 17:43:25 2012 @@ -0,0 +1,3 @@ +Makefile +Makefile.in +*.html Added: branches/SuSE-Code-11-SP2-Branch/lxc/package/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/p… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/package/_cvsignore (added) +++ branches/SuSE-Code-11-SP2-Branch/lxc/package/_cvsignore Tue Apr 17 17:43:25 2012 @@ -0,0 +1,2 @@ +*.spec +*.bz2 Added: branches/SuSE-Code-11-SP2-Branch/lxc/package/yast2-lxc.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/p… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/package/yast2-lxc.changes (added) +++ branches/SuSE-Code-11-SP2-Branch/lxc/package/yast2-lxc.changes Tue Apr 17 17:43:25 2012 @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +Fri Apr 13 13:01:03 2012 - jsuchome(a)suse.cz + +- initial version Added: branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp Tue Apr 17 17:43:25 2012 @@ -0,0 +1,323 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: modules/Lxc.ycp + * Package: Configuration of lxc + * Summary: Lxc settings, input and output functions + * Authors: Jiri Suchomel <jsuchome(a)suse.cz> + * + * $Id$ + * + * Representation of the configuration of lxc. + * Input and output routines. + */ + +{ + +module "Lxc"; +textdomain "lxc"; + +import "Progress"; +import "Report"; +import "Summary"; +import "Message"; + +/** + * Prototypes + */ +global boolean Modified(); + +/** + * Data was modified? + */ +boolean modified = false; + +/** + */ +boolean proposal_valid = false; + +/** + * Write only, used during autoinstallation. + * Don't run services and SuSEconfig, it's all done at one place. + */ +boolean write_only = false; + +/** + * Abort function + * return boolean return true if abort + */ +boolean() AbortFunction = Modified; + +/** + * Abort function + * @return boolean return true if abort + */ +global define boolean Abort() ``{ + if(AbortFunction != nil) + { + return AbortFunction () == true; + } + return false; +} + +/** + * Data was modified? + * @return true if modified + */ +global boolean Modified() { + y2debug("modified=%1",modified); + return modified; +} + +/** + * Mark as modified, for Autoyast. + */ +global void SetModified(boolean value) { + modified = true; + } + +global boolean ProposalValid() { + return proposal_valid; +} + +global void SetProposalValid(boolean value) { + proposal_valid = value; +} + +/** + * @return true if module is marked as "write only" (don't start services etc...) + */ +global boolean WriteOnly() { + return write_only; +} + +/** + * Set write_only flag (for autoinstalation). + */ +global void SetWriteOnly(boolean value) { + write_only = value; +} + + +global void SetAbortFunction(boolean() function) { + AbortFunction = function; +} + + +// Settings: Define all variables needed for configuration of lxc +// TODO FIXME: Define all the variables necessary to hold +// TODO FIXME: the configuration here (with the appropriate +// TODO FIXME: description) +// TODO FIXME: For example: +// /** +// * List of the configured cards. +// */ +// list cards = []; +// +// /** +// * Some additional parameter needed for the configuration. +// */ +// boolean additional_parameter = true; + +/** + * Read all lxc settings + * @return true on success + */ +global boolean Read() { + + /* Lxc read dialog caption */ + string caption = _("Initializing lxc Configuration"); + + // TODO FIXME Set the right number of stages + integer steps = 4; + + integer sl = 500; + sleep(sl); + + // TODO FIXME Names of real stages + // We do not set help text here, because it was set outside + Progress::New( caption, " ", steps, [ + /* Progress stage 1/3 */ + _("Read the database"), + /* Progress stage 2/3 */ + _("Read the previous settings"), + /* Progress stage 3/3 */ + _("Detect the devices") + ], [ + /* Progress step 1/3 */ + _("Reading the database..."), + /* Progress step 2/3 */ + _("Reading the previous settings..."), + /* Progress step 3/3 */ + _("Detecting the devices..."), + /* Progress finished */ + _("Finished") + ], + "" + ); + + // read database + if(Abort()) return false; + Progress::NextStage(); + /* Error message */ + if(false) Report::Error(_("Cannot read database1.")); + sleep(sl); + + // read another database + if(Abort()) return false; + Progress::NextStep(); + /* Error message */ + if(false) Report::Error(_("Cannot read database2.")); + sleep(sl); + + // read current settings + if(Abort()) return false; + Progress::NextStage(); + /* Error message */ + if(false) Report::Error(Message::CannotReadCurrentSettings()); + sleep(sl); + + // detect devices + if(Abort()) return false; + Progress::NextStage(); + /* Error message */ + if(false) Report::Warning(_("Cannot detect devices.")); + sleep(sl); + + if(Abort()) return false; + /* Progress finished */ + Progress::NextStage(); + sleep(sl); + + if(Abort()) return false; + modified = false; + return true; +} + +/** + * Write all lxc settings + * @return true on success + */ +global boolean Write() { + + /* Lxc read dialog caption */ + string caption = _("Saving lxc Configuration"); + + // TODO FIXME And set the right number of stages + integer steps = 2; + + integer sl = 500; + sleep(sl); + + // TODO FIXME Names of real stages + // We do not set help text here, because it was set outside + Progress::New(caption, " ", steps, [ + /* Progress stage 1/2 */ + _("Write the settings"), + /* Progress stage 2/2 */ + _("Run SuSEconfig") + ], [ + /* Progress step 1/2 */ + _("Writing the settings..."), + /* Progress step 2/2 */ + _("Running SuSEconfig..."), + /* Progress finished */ + _("Finished") + ], + "" + ); + + // write settings + if(Abort()) return false; + Progress::NextStage(); + /* Error message */ + if(false) Report::Error (_("Cannot write settings.")); + sleep(sl); + + // run SuSEconfig + if(Abort()) return false; + Progress::NextStage (); + /* Error message */ + if(false) Report::Error (Message::SuSEConfigFailed()); + sleep(sl); + + if(Abort()) return false; + /* Progress finished */ + Progress::NextStage(); + sleep(sl); + + if(Abort()) return false; + return true; +} + +/** + * Get all lxc settings from the first parameter + * (For use by autoinstallation.) + * @param settings The YCP structure to be imported. + * @return boolean True on success + */ +global boolean Import (map settings) { + // TODO FIXME: your code here (fill the above mentioned variables)... + return true; +} + +/** + * Dump the lxc settings to a single map + * (For use by autoinstallation.) + * @return map Dumped settings (later acceptable by Import ()) + */ +global map Export () { + // TODO FIXME: your code here (return the above mentioned variables)... + return $[]; +} + +/** + * Create a textual summary and a list of unconfigured cards + * @return summary of the current configuration + */ +global list Summary() { + // TODO FIXME: your code here... + /* Configuration summary text for autoyast */ + return [ _("Configuration summary..."), [] ]; +} + +/** + * Create an overview table with all configured cards + * @return table items + */ +global list Overview() { + // TODO FIXME: your code here... + return []; +} + +/** + * Return packages needed to be installed and removed during + * Autoinstallation to insure module has all needed software + * installed. + * @return map with 2 lists. + */ +global map AutoPackages() { + // TODO FIXME: your code here... + return $[ "install":[], "remove":[] ]; +} + +/* EOF */ +} Added: branches/SuSE-Code-11-SP2-Branch/lxc/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/Makefile.am (added) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/Makefile.am Tue Apr 17 17:43:25 2012 @@ -0,0 +1,24 @@ +# Makefile.am for lxc/src + +yncludedir = @yncludedir@/lxc + +client_DATA = \ + lxc.ycp + +ynclude_DATA = \ + dialogs.ycp + +desktop_DATA = \ + lxc.desktop + +module_DATA = \ + Lxc.ycp + +# create a symlink for local build, #145327 +lxc: + ln -sf . $@ +ycpchook = lxc + +EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) + +include $(top_srcdir)/Makefile.am.common Added: branches/SuSE-Code-11-SP2-Branch/lxc/src/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/_cvsignore (added) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/_cvsignore Tue Apr 17 17:43:25 2012 @@ -0,0 +1,4 @@ +Makefile +Makefile.in +*.ybc +.dep Added: branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp Tue Apr 17 17:43:25 2012 @@ -0,0 +1,298 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: include/lxc/dialogs.ycp + * Package: Configuration of lxc + * Summary: Dialogs definitions + * Authors: Jiri Suchomel <jsuchome(a)suse.cz> + * + * $Id$ + */ + +{ + +textdomain "lxc"; + +import "FileUtils"; +import "IP"; +import "Label"; +import "Popup"; +import "Progress"; +import "Report"; +import "Security"; +import "Wizard"; + + +list<term> read_templates () { + + list<term> ret = []; + map out = (map) SCR::Execute (.target.bash_output, "rpm -ql lxc | grep 'templates/' | cut -f 2 -d -"); + if (out["stdout"]:"" != "") + { + foreach (string line, splitstring (out["stdout"]:"", "\n"), { + if (line != "") + { + ret = add (ret, `item (line, line == "sles")); + } + }); + } + return ret; +} + +// encrypt given password using current method +string crypt_password (string pw, string method) { + + if (method == "md5") + return cryptmd5 (pw); + if (method == "blowfish") + return cryptblowfish (pw); + if (method == "sha256") + return cryptsha256 (pw); + if (method == "sha512") + return cryptsha512 (pw); + return crypt (pw); +} + +/** + * Configure1 dialog + * @return dialog result + */ +any LxcDialog () { + + boolean orig = Progress::set (false); + Security::Read (); + Progress::set (orig); + + map security = Security::Export (); + string method = tolower (security["PASSWD_ENCRYPTION"]:"des"); + + /* Lxc configure1 dialog caption */ + string caption = _("LXC Configuration"); + + list<string> bridge_items = [ "br0", "br1" ]; + list<term> template_items = read_templates (); + + term contents = `HBox (`HSpacing (), `VBox ( + `VSpacing (), + // text entry + `Left (`TextEntry (`id (`name), _("Container Name"))), + // combo box label + `Left (`ComboBox (`id (`template), `opt (`hstretch), _("Template"), template_items)), + `VSpacing (), + // frame label + `Frame (_("Network Settings"), `HBox ( + `HSpacing (0.5), `VBox ( + `VSpacing (0.5), + `HBox ( + `TextEntry (`id (`ip), _("IP Address")), + `TextEntry (`id (`subnet), _("Subnet"), "/24") + ), + `Left (`ComboBox (`id (`bridge), _("Bridge"), bridge_items)) + ), + `HSpacing (0.5) + )), + // frame label + `Frame (_("Password Settings"), `HBox ( + `HSpacing (0.5), + // password entry + `HWeight (1, `Password (`id (`pw1), _("Root Password"))), + // password entry + `HWeight (1, `Password (`id (`pw2), _("Repeat Password"))), + `HSpacing (0.5) + )), + `VSpacing (2), + `ReplacePoint (`id (`rpbutton), + // button label + `PushButton (`id (`start), _("Create New Container")) + ) + ), `HSpacing ()); + + string help_text = ""; + + Wizard::CreateDialog(); + Wizard::SetContentsButtons(caption, contents, help_text, + Label::BackButton(), Label::CloseButton()); + Wizard::HideBackButton (); + Wizard::HideAbortButton (); + + UI::ChangeWidget (`id (`ip), `ValidChars, IP::ValidChars4); + + any ret = nil; + while(true) { + + ret = UI::UserInput(); + + if (ret == `abort || ret == `cancel || ret == `next || ret == `back) { + break; + } + + string name = (string) UI::QueryWidget (`id (`name), `Value); + string ip = (string) UI::QueryWidget (`id (`ip), `Value); + string subnet = (string) UI::QueryWidget (`id (`subnet), `Value); + string bridge = (string) UI::QueryWidget (`id (`bridge), `Value); + string template = (string) UI::QueryWidget (`id (`template), `Value); + string pw1 = (string) UI::QueryWidget (`id (`pw1), `Value); + string pw2 = (string) UI::QueryWidget (`id (`pw2), `Value); + + if (name == "") + { + // error popup + Report::Error (_("Name was not entered.")); + UI::SetFocus (`id (`name)); + continue; + } + + if (ip != "" && !IP::Check (ip)) + { + Report::Error (IP::Valid4 ()); + UI::SetFocus (`id (`ip)); + continue; + } + if (pw1 != pw2) + { + // error message + Report::Error (_("The passwords do not match.")); + UI::SetFocus (`id (`pw1)); + continue; + } + + if (ret == `start) + { + // busy message + Popup::ShowFeedback ("", "Creating Configuration..."); + + // lxc-createconfig -n <name> [-i <ipaddr/cidr>] [-b <bridge>] [-t <template] + string cmd = sformat ("echo 'y' | lxc-createconfig -n %1", name); + if (ip != "") + { + cmd = cmd + " -i " + ip; + if (subnet != "") + { + if (substring (subnet, 0, 1) != "/") + { + cmd = cmd + "/"; + } + cmd = cmd + subnet; + } + } + + if (bridge != "") + { + cmd = cmd + " -b " + bridge; + } + + if (template != "") + { + cmd = cmd + " -t " + template; + } + + y2internal ("cmd: %1", cmd); + + map out = (map) SCR::Execute (.target.bash_output, cmd); + + y2internal ("out: %1", out); + + Popup::ClearFeedback (); + + if (out["exit"]:0 != 0) + { + // error message + Report::Error (sformat (_("Error occured during configuration: + +%1"), out["stdout"]:"")); + continue; + } + + // busy message + Popup::ShowFeedback ("", "Creating Container..."); + + // lxc-create -n <name> -f /root/<name>.config -t <template> + cmd = sformat ("lxc-create -n %1 -f /root/%1.config", name); + if (template != "") + { + cmd = cmd + " -t " + template; + } + y2internal ("cmd: %1", cmd); + + out = (map) SCR::Execute (.target.bash_output, cmd); + + y2internal ("out: %1", out); + + Popup::ClearFeedback (); + + if (out["exit"]:0 != 0) + { + Report::Error (sformat (_("Error occured during container creation: + +%1"), out["stdout"]:"")); + continue; + } + + // busy message + Popup::ShowFeedback ("", "Saving Root Password..."); + + string password = crypt_password (pw1, method); + + string file = sformat ("/var/lib/lxc/%1/rootfs/etc/shadow", name); + if (pw1 != "" && FileUtils::Exists (file)) + { + // change the root password in the file /var/lib/lxc/<name>/rootfs/etc/shadow/ + SCR::Execute (.target.bash, sformat ("sed --in-place 's/^root:[^:]*:/root:%1:/' %2", + password, file)); + } + Popup::ClearFeedback (); + + cmd = sformat ("xterm -e lxc-start -n %1", name); + + integer id = (integer) SCR::Execute (.process.start_shell, cmd); + UI::ReplaceWidget (`id (`rpbutton), + `PushButton (`id (`cancel), Label::CancelButton ()) + ); + while (true) + { + symbol ui = (symbol) UI::PollInput(); + if (SCR::Read(.process.running, id) != true) + { + break; + } + if (ui == `cancel) + { + y2internal ("lxc-stop: %1", + SCR::Execute (.target.bash_output, "lxc-stop -n " + name) + ); + break; + } + } + UI::ReplaceWidget (`id (`rpbutton), + `PushButton (`id (`start), _("Create New Container")) + ); + continue; + } + } + + UI::CloseDialog(); + + return ret; +} + + +/* EOF */ +} Added: branches/SuSE-Code-11-SP2-Branch/lxc/src/lxc.desktop URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/lxc.desktop (added) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/lxc.desktop Tue Apr 17 17:43:25 2012 @@ -0,0 +1,23 @@ +[Desktop Entry] +Type=Application +Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc; + +X-KDE-ModuleType=Library +X-KDE-HasReadOnlyMode=true +X-KDE-Library=yast2 +X-SuSE-YaST-Call=lxc + +X-SuSE-YaST-Group=Misc +X-SuSE-YaST-Argument= +X-SuSE-YaST-RootOnly=true +X-SuSE-YaST-AutoInst= +X-SuSE-YaST-Geometry= +X-SuSE-YaST-SortKey= +X-SuSE-YaST-AutoInstResource=lxc + +Icon=yast-lxc +Exec=/usr/bin/xdg-su -c '/sbin/yast2 lxc' + +Name=Lxc +GenericName=lxc +StartupNotify=true Added: branches/SuSE-Code-11-SP2-Branch/lxc/src/lxc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/lxc.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/lxc.ycp Tue Apr 17 17:43:25 2012 @@ -0,0 +1,77 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: clients/lxc.ycp + * Package: Configuration of lxc + * Summary: Main file + * Authors: Jiri Suchomel <jsuchome(a)suse.cz> + * + * $Id$ + * + * Main file for lxc configuration. Uses all other files. + */ + +{ + +/*** + * <h3>Configuration of lxc</h3> + */ + +textdomain "lxc"; + +/* The main () */ +y2milestone ("----------------------------------------"); +y2milestone ("Lxc module started"); + +import "Progress"; +import "Report"; +import "Summary"; + +import "CommandLine"; +include "lxc/dialogs.ycp"; + +map cmdline_description = $[ + "id" : "lxc", + /* Command line help text for the Xlxc module */ + "help" : _("Configuration of LXC"), + "guihandler" : LxcDialog, + "actions" : $[ + ], + "options" : $[ + ], + "mappings" : $[ + ] +]; + +/* main ui function */ +any ret = nil; + +ret = CommandLine::Run(cmdline_description); +y2debug("ret=%1", ret); + +/* Finish */ +y2milestone("Lxc module finished"); +y2milestone("----------------------------------------"); + +return ret; + +/* EOF */ +} Added: branches/SuSE-Code-11-SP2-Branch/lxc/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/t… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/testsuite/Makefile.am (added) +++ branches/SuSE-Code-11-SP2-Branch/lxc/testsuite/Makefile.am Tue Apr 17 17:43:25 2012 @@ -0,0 +1,21 @@ +# +# Makefile.am for .../testsuite +# +# Do not edit this file (Makefile.am) as it will be overwritten! +# + +AUTOMAKE_OPTIONS = dejagnu +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) + +testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite + +all-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) + +clean-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean + +check-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check + +# EOF Added: branches/SuSE-Code-11-SP2-Branch/lxc/testsuite/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/t… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/testsuite/_cvsignore (added) +++ branches/SuSE-Code-11-SP2-Branch/lxc/testsuite/_cvsignore Tue Apr 17 17:43:25 2012 @@ -0,0 +1,11 @@ +Makefile +Makefile.in +site.exp +*.sum +*.log +tmp.out* +tmp.err* +tmp.log* +config +run +*.test Added: branches/SuSE-Code-11-SP2-Branch/lxc/testsuite/tests/Lxc.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/t… ============================================================================== (empty) Added: branches/SuSE-Code-11-SP2-Branch/lxc/testsuite/tests/Lxc.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/t… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/testsuite/tests/Lxc.out (added) +++ branches/SuSE-Code-11-SP2-Branch/lxc/testsuite/tests/Lxc.out Tue Apr 17 17:43:25 2012 @@ -0,0 +1,2 @@ +Dump Lxc::Modified +Return false Added: branches/SuSE-Code-11-SP2-Branch/lxc/testsuite/tests/Lxc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/t… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/testsuite/tests/Lxc.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/lxc/testsuite/tests/Lxc.ycp Tue Apr 17 17:43:25 2012 @@ -0,0 +1,13 @@ +{ + +// testedfiles: Lxc.ycp + +include "testsuite.ycp"; +TESTSUITE_INIT([], nil); + +import "Lxc"; + +DUMP("Lxc::Modified"); +TEST(``(Lxc::Modified()), [], nil); + +} Added: branches/SuSE-Code-11-SP2-Branch/lxc/testsuite/tests/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/t… ============================================================================== (empty) Added: branches/SuSE-Code-11-SP2-Branch/lxc/yast2-lxc.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/y… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/yast2-lxc.spec.in (added) +++ branches/SuSE-Code-11-SP2-Branch/lxc/yast2-lxc.spec.in Tue Apr 17 17:43:25 2012 @@ -0,0 +1,29 @@ +@HEADER-COMMENT@ + +@HEADER@ +Requires: yast2 yast2-security lxc +BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite + +BuildArchitectures: noarch + +Summary: Configuration of lxc + +%description +- + +@PREP@ + +@BUILD@ + +@INSTALL@ + +@CLEAN@ + +%files +%defattr(-,root,root) +%dir @yncludedir@/lxc +@yncludedir@/lxc/* +@clientdir@/lxc.ycp +@moduledir@/Lxc.* +@desktopdir@/lxc.desktop +%doc @docdir@ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0