February 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67410 - in /branches/SuSE-Code-11-SP2-Branch/dns-server: package/yast2-dns-server.changes src/DnsServer.pm
by locilka＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: locilka Date: Fri Feb 10 14:57:05 2012 New Revision: 67410 URL: http://svn.opensuse.org/viewcvs/yast?rev=67410&view=rev Log: - Fixed saving the current status of all zones to LDAP/files while switching from using files to LDAP and vice versa (bnc#746401). Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServer.pm Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes Fri Feb 10 14:57:05 2012 @@ -3,6 +3,8 @@ - Fixed transforming records from absolute to relative format while they are listed in UI (bnc#746363). +- Fixed saving the current status of all zones to LDAP/files while + switching from using files to LDAP and vice versa (bnc#746401). ------------------------------------------------------------------ Thu Feb 9 15:16:58 CET 2012 - locilka(a)suse.com Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServer.pm (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServer.pm Fri Feb 10 14:57:05 2012 @@ -120,15 +120,21 @@ return 0; } - if (! ($zone_map{"modified"} || $save_all)) + if ($zone_name eq "localhost" || $zone_name eq "0.0.127.in-addr.arpa") { - y2milestone ("Skipping zone $zone_name, wasn't modified"); + y2milestone ("Skipping system zone $zone_name"); return 1; } - if ($zone_name eq "localhost" || $zone_name eq "0.0.127.in-addr.arpa") + if ($save_all) { + y2milestone ("Saving all zones, flagging ".$zone_name." zone as modified"); + $zone_map{"modified"} = 1; + } + + # zone not modified (it's not modified if the flag is not set) + if (! (defined $zone_map{"modified"} ? $zone_map{"modified"} : 0)) { - y2milestone ("Skipping system zone $zone_name"); + y2milestone ("Skipping zone $zone_name, wasn't modified"); return 1; } @@ -645,12 +651,20 @@ return $start_service; } +sub UseLdapModified { + my $self = shift; + + $self->SetModified (); + # Save all zones as they are into the new config location (LDAP/files) + $save_all = 1; +} + BEGIN { $TYPEINFO{SetUseLdap} = [ "function", "boolean", "boolean" ];} sub SetUseLdap { my $self = shift; - $use_ldap = shift; + my $new_use_ldap = shift; - if ($use_ldap) { + if ($new_use_ldap) { # trying init LDAP if use_ldap selected my $success = $self->LdapInit (1, 1); @@ -659,9 +673,10 @@ } } - $self->SetModified (); + $use_ldap = $new_use_ldap; + y2milestone ("Using LDAP set to: ".$use_ldap); - $save_all = 1; + $self->UseLdapModified(); return 1; } @@ -1674,7 +1689,8 @@ if ($ask_user_to_enable_ldap) { # yes-no popup $use_ldap = Popup->YesNo (__("Enable LDAP support?")); - y2milestone ("User choose to use LDAP: $use_ldap"); + $self->UseLdapModified(); + y2milestone ("User chose to use LDAP: $use_ldap"); # just disable LDAP } else { $use_ldap = 0; -- 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] r67409 - in /branches/SuSE-Code-11-SP1-Branch/dns-server: package/yast2-dns-server.changes src/DnsServer.pm
by locilka＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: locilka Date: Fri Feb 10 14:56:54 2012 New Revision: 67409 URL: http://svn.opensuse.org/viewcvs/yast?rev=67409&view=rev Log: - Fixed saving the current status of all zones to LDAP/files while switching from using files to LDAP and vice versa (bnc#746401). Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServer.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 Feb 10 14:56:54 2012 @@ -3,6 +3,8 @@ - Fixed transforming records from absolute to relative format while they are listed in UI (bnc#746363). +- Fixed saving the current status of all zones to LDAP/files while + switching from using files to LDAP and vice versa (bnc#746401). ------------------------------------------------------------------ Thu Feb 9 15:16:58 CET 2012 - locilka(a)suse.com Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServer.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/DnsServer.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServer.pm Fri Feb 10 14:56:54 2012 @@ -120,15 +120,21 @@ return 0; } - if (! ($zone_map{"modified"} || $save_all)) + if ($zone_name eq "localhost" || $zone_name eq "0.0.127.in-addr.arpa") { - y2milestone ("Skipping zone $zone_name, wasn't modified"); + y2milestone ("Skipping system zone $zone_name"); return 1; } - if ($zone_name eq "localhost" || $zone_name eq "0.0.127.in-addr.arpa") + if ($save_all) { + y2milestone ("Saving all zones, flagging ".$zone_name." zone as modified"); + $zone_map{"modified"} = 1; + } + + # zone not modified (it's not modified if the flag is not set) + if (! (defined $zone_map{"modified"} ? $zone_map{"modified"} : 0)) { - y2milestone ("Skipping system zone $zone_name"); + y2milestone ("Skipping zone $zone_name, wasn't modified"); return 1; } @@ -645,12 +651,20 @@ return $start_service; } +sub UseLdapModified { + my $self = shift; + + $self->SetModified (); + # Save all zones as they are into the new config location (LDAP/files) + $save_all = 1; +} + BEGIN { $TYPEINFO{SetUseLdap} = [ "function", "boolean", "boolean" ];} sub SetUseLdap { my $self = shift; - $use_ldap = shift; + my $new_use_ldap = shift; - if ($use_ldap) { + if ($new_use_ldap) { # trying init LDAP if use_ldap selected my $success = $self->LdapInit (1, 1); @@ -659,9 +673,10 @@ } } - $self->SetModified (); + $use_ldap = $new_use_ldap; + y2milestone ("Using LDAP set to: ".$use_ldap); - $save_all = 1; + $self->UseLdapModified(); return 1; } @@ -1674,7 +1689,8 @@ if ($ask_user_to_enable_ldap) { # yes-no popup $use_ldap = Popup->YesNo (__("Enable LDAP support?")); - y2milestone ("User choose to use LDAP: $use_ldap"); + $self->UseLdapModified(); + y2milestone ("User chose to use LDAP: $use_ldap"); # just disable LDAP } else { $use_ldap = 0; -- 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] r67408 - in /trunk/dns-server: package/ src/ testsuite/tests/
by locilka＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: locilka Date: Fri Feb 10 13:27:51 2012 New Revision: 67408 URL: http://svn.opensuse.org/viewcvs/yast?rev=67408&view=rev Log: - Fixed transforming records from absolute to relative format while they are listed in UI (bnc#746363). Added: trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.err trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.out trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp Modified: trunk/dns-server/package/yast2-dns-server.changes trunk/dns-server/src/DnsServerHelperFunctions.ycp trunk/dns-server/src/dialog-masterzone.ycp Modified: trunk/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/package/yast2-dns-ser… ============================================================================== --- trunk/dns-server/package/yast2-dns-server.changes (original) +++ trunk/dns-server/package/yast2-dns-server.changes Fri Feb 10 13:27:51 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------ +Fri Feb 10 13:13:43 CET 2012 - locilka(a)suse.com + +- Fixed transforming records from absolute to relative format + while they are listed in UI (bnc#746363). + +------------------------------------------------------------------ Thu Feb 9 15:16:58 CET 2012 - locilka(a)suse.com - Fixed transforming records from relative to absolute format. Modified: trunk/dns-server/src/DnsServerHelperFunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/DnsServerHelperFu… ============================================================================== --- trunk/dns-server/src/DnsServerHelperFunctions.ycp (original) +++ trunk/dns-server/src/DnsServerHelperFunctions.ycp Fri Feb 10 13:27:51 2012 @@ -216,5 +216,39 @@ DnsServer::StoreZone (); } +map <string, list <string> > skip_converting_to_relative = $[ + "key" : [ + ], + "value" : [ + "TXT", "SPF", "SRV" + ] +]; + +global string RRToRelativeName (string absolute_name, string zone_name, string record_type, string key_or_value) { + if (absolute_name == nil || zone_name == nil) { + y2error ("Erroneous record: %1/%2/%3/%4", absolute_name, zone_name, record_type, key_or_value); + return nil; + } + + if (key_or_value != "key" && key_or_value != "value") { + y2error ("Unknown key/value %1", key_or_value); + return absolute_name; + } + + // these records are not wanted to be converted to a relative name + if (contains (skip_converting_to_relative[key_or_value]:[], toupper(record_type))) { + y2debug ("Not converting %1/%2", key_or_value, record_type); + return absolute_name; + } + + string remove_this_to_be_relative = "\\." + zone_name + "\\.$"; + string relative_name = regexpsub (absolute_name, "([^ \t]*)" + remove_this_to_be_relative, "\\1"); + if (relative_name != nil) { + return relative_name; + } + + return absolute_name; +} + /* EOF */ } Modified: trunk/dns-server/src/dialog-masterzone.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/dialog-masterzone… ============================================================================== --- trunk/dns-server/src/dialog-masterzone.ycp (original) +++ trunk/dns-server/src/dialog-masterzone.ycp Fri Feb 10 13:27:51 2012 @@ -32,20 +32,6 @@ include "dns-server/misc.ycp"; -string ToRelativeName (string absolute_name, string zone_name) { - if (absolute_name == nil || zone_name == nil) { - return nil; - } - - string remove_this_to_be_relative = "." + zone_name + "."; - string relative_name = regexpsub(absolute_name, "(.*)" + remove_this_to_be_relative, "\\1"); - if ((relative_name != nil) && (! regexpmatch(relative_name, "\\."))) { - return relative_name; - } - - return absolute_name; -} - // zone ACL --> list <string> available_zones_to_connect = []; @@ -1198,14 +1184,14 @@ // Applies to all UI::ChangeWidget (`id ("add_record_name"), `Value, - ToRelativeName( - Punycode::DecodeDomainName (current_key), decoded_zone_name + DnsServerHelperFunctions::RRToRelativeName( + Punycode::DecodeDomainName (current_key), decoded_zone_name, current_type, "key" ) ); UI::ChangeWidget (`id ("add_record_type"), `Value, current_type); UI::ChangeWidget (`id ("add_record_val"), `Value, - ToRelativeName( - Punycode::DecodeDomainName (current_val), decoded_zone_name + DnsServerHelperFunctions::RRToRelativeName( + Punycode::DecodeDomainName (current_val), decoded_zone_name, current_type, "value" ) ); } @@ -1252,11 +1238,17 @@ list items = maplist (integer r, ret, { counter = counter + 1; + string record_type = current_zone["records", r, "type"]:""; + return `item ( `id (r), - ToRelativeName (decoded_names[counter]:current_zone["records", r, "key"]:"", decoded_zone_name), - current_zone["records", r, "type"]:"", - ToRelativeName (decoded_names[counter+const_plus]:current_zone["records", r, "value"]:"", decoded_zone_name) + DnsServerHelperFunctions::RRToRelativeName ( + decoded_names[counter]:current_zone["records", r, "key"]:"", decoded_zone_name, record_type, "key" + ), + record_type, + DnsServerHelperFunctions::RRToRelativeName ( + decoded_names[counter+const_plus]:current_zone["records", r, "value"]:"", decoded_zone_name, record_type, "value" + ) ); }); Added: trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/testsuite/tests/DnsSe… ============================================================================== (empty) Added: trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/testsuite/tests/DnsSe… ============================================================================== --- trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.out (added) +++ trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.out Fri Feb 10 13:27:51 2012 @@ -0,0 +1,12 @@ +Dump ========================================================== +Return dhcp1 +Return relative-name-1 +Return relative-name-2 +Return dhcp1.subdomain +Return dhcp1.different-example.com. +Return v=spf1 include:example.com -all +Return some-text +Return v=spf1 include:example.com -all +Return _http._tcp +Return 0 5 80 example.com. +Dump ========================================================== Added: trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/testsuite/tests/DnsSe… ============================================================================== --- trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp (added) +++ trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp Fri Feb 10 13:27:51 2012 @@ -0,0 +1,113 @@ +/** + * File: DnsServerHelperFunctions.ycp + * Package: Configuration of dns-server + * Summary: Testsuite helper module + * Authors: Lukas Ocilka <locilka(a)suse.com> + * Copyright: Copyright 2012, Novell, Inc. All rights reserved. + * + * $Id$ + * + * Testsuite for helper functions module + */ + +{ + include "testsuite.ycp"; + // testedfiles: DnsServerHelperFunctions.ycp + + map READ = $[]; + map WRITE = $[]; + map EXEC = $[]; + + TESTSUITE_INIT ([READ, WRITE, EXEC], nil); + + import "DnsServerHelperFunctions"; + import "Mode"; + + Mode::SetMode("test"); + + string zone = "example.com"; + + DUMP ("=========================================================="); + + // cuts the zone name off + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1." + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // CNAME - key can be relative + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "relative-name-1." + zone + ".", + zone, + "cname", + "key" + )), [READ, WRITE, EXEC], nil); + + // CNAME - value can be relative + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "relative-name-2." + zone + ".", + zone, + "cname", + "value" + )), [READ, WRITE, EXEC], nil); + + // cuts the zone name off (leaves subdomain) + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1.subdomain." + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // different zone name + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1.different-" + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // TXT record (value), not changed + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "v=spf1 include:" + zone + " -all", + zone, + "TXT", + "value" + )), [READ, WRITE, EXEC], nil); + + // TXT record (key), can be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "some-text." + zone + ".", + zone, + "TXT", + "key" + )), [READ, WRITE, EXEC], nil); + + // SPF record (value), not changed + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "v=spf1 include:" + zone + " -all", + zone, + "SPF", + "value" + )), [READ, WRITE, EXEC], nil); + + // SRV record (key) can be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "_http._tcp." + zone + ".", + zone, + "SRV", + "key" + )), [READ, WRITE, EXEC], nil); + + // SRV record (value) can't be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "0 5 80 " + zone + ".", + zone, + "SRV", + "value" + )), [READ, WRITE, EXEC], nil); + + DUMP ("=========================================================="); +} -- 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] r67407 - in /branches/SuSE-Code-11-SP2-Branch/dns-server: package/ src/ testsuite/tests/
by locilka＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: locilka Date: Fri Feb 10 13:27:40 2012 New Revision: 67407 URL: http://svn.opensuse.org/viewcvs/yast?rev=67407&view=rev Log: - Fixed transforming records from absolute to relative format while they are listed in UI (bnc#746363). Added: branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.err branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.out branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServerHelperFunctions.ycp branches/SuSE-Code-11-SP2-Branch/dns-server/src/dialog-masterzone.ycp Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes Fri Feb 10 13:27:40 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------ +Fri Feb 10 13:13:43 CET 2012 - locilka(a)suse.com + +- Fixed transforming records from absolute to relative format + while they are listed in UI (bnc#746363). + +------------------------------------------------------------------ Thu Feb 9 15:16:58 CET 2012 - locilka(a)suse.com - Fixed transforming records from relative to absolute format. Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServerHelperFunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServerHelperFunctions.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServerHelperFunctions.ycp Fri Feb 10 13:27:40 2012 @@ -216,5 +216,39 @@ DnsServer::StoreZone (); } +map <string, list <string> > skip_converting_to_relative = $[ + "key" : [ + ], + "value" : [ + "TXT", "SPF", "SRV" + ] +]; + +global string RRToRelativeName (string absolute_name, string zone_name, string record_type, string key_or_value) { + if (absolute_name == nil || zone_name == nil) { + y2error ("Erroneous record: %1/%2/%3/%4", absolute_name, zone_name, record_type, key_or_value); + return nil; + } + + if (key_or_value != "key" && key_or_value != "value") { + y2error ("Unknown key/value %1", key_or_value); + return absolute_name; + } + + // these records are not wanted to be converted to a relative name + if (contains (skip_converting_to_relative[key_or_value]:[], toupper(record_type))) { + y2debug ("Not converting %1/%2", key_or_value, record_type); + return absolute_name; + } + + string remove_this_to_be_relative = "\\." + zone_name + "\\.$"; + string relative_name = regexpsub (absolute_name, "([^ \t]*)" + remove_this_to_be_relative, "\\1"); + if (relative_name != nil) { + return relative_name; + } + + return absolute_name; +} + /* EOF */ } Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/src/dialog-masterzone.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/src/dialog-masterzone.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/src/dialog-masterzone.ycp Fri Feb 10 13:27:40 2012 @@ -32,20 +32,6 @@ include "dns-server/misc.ycp"; -string ToRelativeName (string absolute_name, string zone_name) { - if (absolute_name == nil || zone_name == nil) { - return nil; - } - - string remove_this_to_be_relative = "." + zone_name + "."; - string relative_name = regexpsub(absolute_name, "(.*)" + remove_this_to_be_relative, "\\1"); - if ((relative_name != nil) && (! regexpmatch(relative_name, "\\."))) { - return relative_name; - } - - return absolute_name; -} - // zone ACL --> list <string> available_zones_to_connect = []; @@ -1198,14 +1184,14 @@ // Applies to all UI::ChangeWidget (`id ("add_record_name"), `Value, - ToRelativeName( - Punycode::DecodeDomainName (current_key), decoded_zone_name + DnsServerHelperFunctions::RRToRelativeName( + Punycode::DecodeDomainName (current_key), decoded_zone_name, current_type, "key" ) ); UI::ChangeWidget (`id ("add_record_type"), `Value, current_type); UI::ChangeWidget (`id ("add_record_val"), `Value, - ToRelativeName( - Punycode::DecodeDomainName (current_val), decoded_zone_name + DnsServerHelperFunctions::RRToRelativeName( + Punycode::DecodeDomainName (current_val), decoded_zone_name, current_type, "value" ) ); } @@ -1252,11 +1238,17 @@ list items = maplist (integer r, ret, { counter = counter + 1; + string record_type = current_zone["records", r, "type"]:""; + return `item ( `id (r), - ToRelativeName (decoded_names[counter]:current_zone["records", r, "key"]:"", decoded_zone_name), - current_zone["records", r, "type"]:"", - ToRelativeName (decoded_names[counter+const_plus]:current_zone["records", r, "value"]:"", decoded_zone_name) + DnsServerHelperFunctions::RRToRelativeName ( + decoded_names[counter]:current_zone["records", r, "key"]:"", decoded_zone_name, record_type, "key" + ), + record_type, + DnsServerHelperFunctions::RRToRelativeName ( + decoded_names[counter+const_plus]:current_zone["records", r, "value"]:"", decoded_zone_name, record_type, "value" + ) ); }); Added: branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== (empty) Added: branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.out (added) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.out Fri Feb 10 13:27:40 2012 @@ -0,0 +1,12 @@ +Dump ========================================================== +Return dhcp1 +Return relative-name-1 +Return relative-name-2 +Return dhcp1.subdomain +Return dhcp1.different-example.com. +Return v=spf1 include:example.com -all +Return some-text +Return v=spf1 include:example.com -all +Return _http._tcp +Return 0 5 80 example.com. +Dump ========================================================== Added: branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp Fri Feb 10 13:27:40 2012 @@ -0,0 +1,113 @@ +/** + * File: DnsServerHelperFunctions.ycp + * Package: Configuration of dns-server + * Summary: Testsuite helper module + * Authors: Lukas Ocilka <locilka(a)suse.com> + * Copyright: Copyright 2012, Novell, Inc. All rights reserved. + * + * $Id$ + * + * Testsuite for helper functions module + */ + +{ + include "testsuite.ycp"; + // testedfiles: DnsServerHelperFunctions.ycp + + map READ = $[]; + map WRITE = $[]; + map EXEC = $[]; + + TESTSUITE_INIT ([READ, WRITE, EXEC], nil); + + import "DnsServerHelperFunctions"; + import "Mode"; + + Mode::SetMode("test"); + + string zone = "example.com"; + + DUMP ("=========================================================="); + + // cuts the zone name off + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1." + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // CNAME - key can be relative + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "relative-name-1." + zone + ".", + zone, + "cname", + "key" + )), [READ, WRITE, EXEC], nil); + + // CNAME - value can be relative + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "relative-name-2." + zone + ".", + zone, + "cname", + "value" + )), [READ, WRITE, EXEC], nil); + + // cuts the zone name off (leaves subdomain) + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1.subdomain." + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // different zone name + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1.different-" + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // TXT record (value), not changed + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "v=spf1 include:" + zone + " -all", + zone, + "TXT", + "value" + )), [READ, WRITE, EXEC], nil); + + // TXT record (key), can be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "some-text." + zone + ".", + zone, + "TXT", + "key" + )), [READ, WRITE, EXEC], nil); + + // SPF record (value), not changed + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "v=spf1 include:" + zone + " -all", + zone, + "SPF", + "value" + )), [READ, WRITE, EXEC], nil); + + // SRV record (key) can be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "_http._tcp." + zone + ".", + zone, + "SRV", + "key" + )), [READ, WRITE, EXEC], nil); + + // SRV record (value) can't be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "0 5 80 " + zone + ".", + zone, + "SRV", + "value" + )), [READ, WRITE, EXEC], nil); + + DUMP ("=========================================================="); +} -- 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] r67406 - in /branches/SuSE-Code-11-SP1-Branch/dns-server: package/ src/ testsuite/tests/
by locilka＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: locilka Date: Fri Feb 10 13:27:24 2012 New Revision: 67406 URL: http://svn.opensuse.org/viewcvs/yast?rev=67406&view=rev Log: - Fixed transforming records from absolute to relative format while they are listed in UI (bnc#746363). Added: branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.err branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.out branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServerHelperFunctions.ycp branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp 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 Feb 10 13:27:24 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------ +Fri Feb 10 13:13:43 CET 2012 - locilka(a)suse.com + +- Fixed transforming records from absolute to relative format + while they are listed in UI (bnc#746363). + +------------------------------------------------------------------ Thu Feb 9 15:16:58 CET 2012 - locilka(a)suse.com - Fixed transforming records from relative to absolute format. Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServerHelperFunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServerHelperFunctions.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServerHelperFunctions.ycp Fri Feb 10 13:27:24 2012 @@ -216,5 +216,39 @@ DnsServer::StoreZone (); } +map <string, list <string> > skip_converting_to_relative = $[ + "key" : [ + ], + "value" : [ + "TXT", "SPF", "SRV" + ] +]; + +global string RRToRelativeName (string absolute_name, string zone_name, string record_type, string key_or_value) { + if (absolute_name == nil || zone_name == nil) { + y2error ("Erroneous record: %1/%2/%3/%4", absolute_name, zone_name, record_type, key_or_value); + return nil; + } + + if (key_or_value != "key" && key_or_value != "value") { + y2error ("Unknown key/value %1", key_or_value); + return absolute_name; + } + + // these records are not wanted to be converted to a relative name + if (contains (skip_converting_to_relative[key_or_value]:[], toupper(record_type))) { + y2debug ("Not converting %1/%2", key_or_value, record_type); + return absolute_name; + } + + string remove_this_to_be_relative = "\\." + zone_name + "\\.$"; + string relative_name = regexpsub (absolute_name, "([^ \t]*)" + remove_this_to_be_relative, "\\1"); + if (relative_name != nil) { + return relative_name; + } + + return absolute_name; +} + /* EOF */ } Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp Fri Feb 10 13:27:24 2012 @@ -32,20 +32,6 @@ include "dns-server/misc.ycp"; -string ToRelativeName (string absolute_name, string zone_name) { - if (absolute_name == nil || zone_name == nil) { - return nil; - } - - string remove_this_to_be_relative = "." + zone_name + "."; - string relative_name = regexpsub(absolute_name, "(.*)" + remove_this_to_be_relative, "\\1"); - if ((relative_name != nil) && (! regexpmatch(relative_name, "\\."))) { - return relative_name; - } - - return absolute_name; -} - // zone ACL --> list <string> available_zones_to_connect = []; @@ -1198,14 +1184,14 @@ // Applies to all UI::ChangeWidget (`id ("add_record_name"), `Value, - ToRelativeName( - Punycode::DecodeDomainName (current_key), decoded_zone_name + DnsServerHelperFunctions::RRToRelativeName( + Punycode::DecodeDomainName (current_key), decoded_zone_name, current_type, "key" ) ); UI::ChangeWidget (`id ("add_record_type"), `Value, current_type); UI::ChangeWidget (`id ("add_record_val"), `Value, - ToRelativeName( - Punycode::DecodeDomainName (current_val), decoded_zone_name + DnsServerHelperFunctions::RRToRelativeName( + Punycode::DecodeDomainName (current_val), decoded_zone_name, current_type, "value" ) ); } @@ -1252,11 +1238,17 @@ list items = maplist (integer r, ret, { counter = counter + 1; + string record_type = current_zone["records", r, "type"]:""; + return `item ( `id (r), - ToRelativeName (decoded_names[counter]:current_zone["records", r, "key"]:"", decoded_zone_name), - current_zone["records", r, "type"]:"", - ToRelativeName (decoded_names[counter+const_plus]:current_zone["records", r, "value"]:"", decoded_zone_name) + DnsServerHelperFunctions::RRToRelativeName ( + decoded_names[counter]:current_zone["records", r, "key"]:"", decoded_zone_name, record_type, "key" + ), + record_type, + DnsServerHelperFunctions::RRToRelativeName ( + decoded_names[counter+const_plus]:current_zone["records", r, "value"]:"", decoded_zone_name, record_type, "value" + ) ); }); Added: branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== (empty) Added: branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.out (added) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.out Fri Feb 10 13:27:24 2012 @@ -0,0 +1,12 @@ +Dump ========================================================== +Return dhcp1 +Return relative-name-1 +Return relative-name-2 +Return dhcp1.subdomain +Return dhcp1.different-example.com. +Return v=spf1 include:example.com -all +Return some-text +Return v=spf1 include:example.com -all +Return _http._tcp +Return 0 5 80 example.com. +Dump ========================================================== Added: branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp (added) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp Fri Feb 10 13:27:24 2012 @@ -0,0 +1,113 @@ +/** + * File: DnsServerHelperFunctions.ycp + * Package: Configuration of dns-server + * Summary: Testsuite helper module + * Authors: Lukas Ocilka <locilka(a)suse.com> + * Copyright: Copyright 2012, Novell, Inc. All rights reserved. + * + * $Id$ + * + * Testsuite for helper functions module + */ + +{ + include "testsuite.ycp"; + // testedfiles: DnsServerHelperFunctions.ycp + + map READ = $[]; + map WRITE = $[]; + map EXEC = $[]; + + TESTSUITE_INIT ([READ, WRITE, EXEC], nil); + + import "DnsServerHelperFunctions"; + import "Mode"; + + Mode::SetMode("test"); + + string zone = "example.com"; + + DUMP ("=========================================================="); + + // cuts the zone name off + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1." + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // CNAME - key can be relative + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "relative-name-1." + zone + ".", + zone, + "cname", + "key" + )), [READ, WRITE, EXEC], nil); + + // CNAME - value can be relative + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "relative-name-2." + zone + ".", + zone, + "cname", + "value" + )), [READ, WRITE, EXEC], nil); + + // cuts the zone name off (leaves subdomain) + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1.subdomain." + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // different zone name + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1.different-" + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // TXT record (value), not changed + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "v=spf1 include:" + zone + " -all", + zone, + "TXT", + "value" + )), [READ, WRITE, EXEC], nil); + + // TXT record (key), can be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "some-text." + zone + ".", + zone, + "TXT", + "key" + )), [READ, WRITE, EXEC], nil); + + // SPF record (value), not changed + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "v=spf1 include:" + zone + " -all", + zone, + "SPF", + "value" + )), [READ, WRITE, EXEC], nil); + + // SRV record (key) can be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "_http._tcp." + zone + ".", + zone, + "SRV", + "key" + )), [READ, WRITE, EXEC], nil); + + // SRV record (value) can't be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "0 5 80 " + zone + ".", + zone, + "SRV", + "value" + )), [READ, WRITE, EXEC], nil); + + DUMP ("=========================================================="); +} -- 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] r67405 - in /trunk/s390/src: dasd/dialogs.ycp modules/DASDController.ycp modules/ZFCPController.ycp
by aschnell＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: aschnell Date: Fri Feb 10 12:15:08 2012 New Revision: 67405 URL: http://svn.opensuse.org/viewcvs/yast?rev=67405&view=rev Log: - use new String::YesNo Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Fri Feb 10 12:15:08 2012 @@ -18,6 +18,7 @@ import "Report"; import "Sequencer"; import "Wizard"; + import "String"; include "s390/dasd/helps.ycp"; @@ -82,17 +83,9 @@ { items = maplist (integer k, map<string,any> d, devices, { string channel = d["channel_id"]:""; - string diag = d["diag"]:false - // table cell - ? _("Yes") - // table cell - : _("No"); - string format = d["format"]:false - // table cell - ? _("Yes") - // table cell - : _("No"); - return `item (`id(k), channel, format, diag); + string diag = String::YesNo(d["diag"]:false); + string format = String::YesNo(d["format"]:false); + return `item(`id(k), channel, format, diag); }); } else @@ -102,11 +95,7 @@ integer channel = d["resource", "io", 0, "start"]:0; string str_channel = d["channel"]:""; string access = toupper(d["resource", "io", 0, "mode"]:"RO"); - string diag = DASDController::diag[str_channel]:false - // table cell - ? _("Yes") - // table cell - : _("No"); + string diag = String::YesNo(DASDController::diag[str_channel]:false); string device = d["dev_name"]:""; string type = toupper(sformat("%1/%2, %3/%4", substring(tohexstring(d["device_id"]:0 & 0xffff, 4), 2), @@ -115,11 +104,7 @@ substring(tohexstring(d["detail", "dev_model"]:0, 4), 4) )); - string formatted = d["formatted"]:false - // table cell - ? _("Yes") - // table cell - : _("No"); + string formatted = String::YesNo(d["formatted"]:false); string partition_info = d["partition_info"]:"--"; string selected = DASDController::selected[k]:false Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Fri Feb 10 12:15:08 2012 @@ -9,9 +9,7 @@ * Representation of the configuration of controller. * Input and output routines. */ - { - module "DASDController"; textdomain "s390"; @@ -283,9 +281,7 @@ // summary text, %1 is channel ID (number), // %2 and %3 are Yes or No s = sformat (_("Channel ID: %1, Format: %2, Use DIAG: %3"), - d["channel"]:"", - d["format"]:false ? _("Yes") : _("No"), - d["diag"]:false ? _("Yes") : _("No") + d["channel"]:"", String::YesNo(d["format"]:false), String::YesNo(d["diag"]:false) ); return s; }); @@ -695,5 +691,4 @@ return mergestring (l, ", "); } -/* EOF */ } Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Fri Feb 10 12:15:08 2012 @@ -9,9 +9,7 @@ * Representation of the configuration of controller. * Input and output routines. */ - { - module "ZFCPController"; textdomain "s390"; @@ -503,7 +501,4 @@ return runCommand(sformat("zfcp_san_disc -b '%1' -p '%2' -L", busid, wwpn)); } - - -/* EOF */ } -- 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] r67404 - /trunk/yast2/library/types/src/String.ycp
by aschnell＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: aschnell Date: Fri Feb 10 12:12:06 2012 New Revision: 67404 URL: http://svn.opensuse.org/viewcvs/yast?rev=67404&view=rev Log: - added String::YesNo Modified: trunk/yast2/library/types/src/String.ycp Modified: trunk/yast2/library/types/src/String.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/src/String.y… ============================================================================== --- trunk/yast2/library/types/src/String.ycp (original) +++ trunk/yast2/library/types/src/String.ycp Fri Feb 10 12:12:06 2012 @@ -75,6 +75,26 @@ return NonEmpty (splitstring (s, "\n")); } + +/** + * @param value boolean + * @return boolean value as "Yes" or "No" + */ +global string YesNo(boolean value) +{ + if (value) + { + // human text for Boolean value + return _("Yes"); + } + else + { + // human text for Boolean value + return _("No"); + } +} + + /** * Return a pretty description of a byte count * -- 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] r67403 - in /trunk/s390/src: dasd/dialogs.ycp modules/DASDController.ycp zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: aschnell Date: Fri Feb 10 11:45:05 2012 New Revision: 67403 URL: http://svn.opensuse.org/viewcvs/yast?rev=67403&view=rev Log: - replaced FourDigitHex by tohexstring - removed unneeded casts Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Fri Feb 10 11:45:05 2012 @@ -98,36 +98,24 @@ else { items = maplist(integer k, map<string, any> d, devices, { - boolean active = (boolean)(d["resource", "io", 0, "active"]:false); - integer channel = (integer)(d["resource", "io", 0, "start"]:0); - string str_channel = (string)(d["channel"]:""); - string access = toupper ((string)(d["resource", "io", 0, "mode"]:"RO")); + boolean active = d["resource", "io", 0, "active"]:false; + integer channel = d["resource", "io", 0, "start"]:0; + string str_channel = d["channel"]:""; + string access = toupper(d["resource", "io", 0, "mode"]:"RO"); string diag = DASDController::diag[str_channel]:false // table cell ? _("Yes") // table cell : _("No"); string device = d["dev_name"]:""; - string type = toupper (sformat ("%1/%2, %3/%4", - substring ( - DASDController::FourDigitHex ( - d["device_id"]:0 & tointeger ("0xffff") - ), - 2), - substring ( - DASDController::FourDigitHex (d["detail", "cu_model"]:0), - 4), - substring ( - DASDController::FourDigitHex ( - d["sub_device_id"]:0 & tointeger ("0xffff") - ), - 2), - substring ( - DASDController::FourDigitHex (d["detail", "dev_model"]:0), - 4) + string type = toupper(sformat("%1/%2, %3/%4", + substring(tohexstring(d["device_id"]:0 & 0xffff, 4), 2), + substring(tohexstring(d["detail", "cu_model"]:0, 4), 4), + substring(tohexstring(d["sub_device_id"]:0 & 0xffff, 4), 2), + substring(tohexstring(d["detail", "dev_model"]:0, 4), 4) )); - string formatted = (boolean)d["formatted"]:false + string formatted = d["formatted"]:false // table cell ? _("Yes") // table cell Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Fri Feb 10 11:45:05 2012 @@ -323,26 +323,6 @@ /** - * Translate integer number to its hexadecimal representation with leading - * 0x and exactliy 4 hexadecimal numbers - * @param i integer integer number - * @return string hexadecimal number - */ -global define string FourDigitHex(integer i) ``{ - string s = tohexstring(i); - string zeros = ""; - - integer l = 6 - size(s); - - while (l > 0) { - zeros = zeros + "0"; - l = l - 1; - } - - return substring(s, 0, 2) + zeros + substring(s, 2); -} - -/** * Probe for DASD disks */ global define void ProbeDisks () { Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Fri Feb 10 11:45:05 2012 @@ -58,7 +58,7 @@ list<term> items = []; items = maplist(integer k, map<string, any> d, devices, { - string dev_name = (string)(d["dev_name"]:""); + string dev_name = d["dev_name"]:""; string channel = d["detail", "controller_id"]:"unknown"; string wwpn = d["detail", "wwpn"]:"unknown"; string fcp_lun = d["detail", "fcp_lun"]:"unknown"; -- 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] r67402 - in /trunk/s390/src: dasd/dialogs.ycp zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: aschnell Date: Fri Feb 10 11:35:10 2012 New Revision: 67402 URL: http://svn.opensuse.org/viewcvs/yast?rev=67402&view=rev Log: - removed some unneeded casts Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Fri Feb 10 11:35:10 2012 @@ -80,7 +80,7 @@ if (Mode::config ()) { - items = (list<term>) maplist (integer k, map<string,any> d, devices, { + items = maplist (integer k, map<string,any> d, devices, { string channel = d["channel_id"]:""; string diag = d["diag"]:false // table cell @@ -92,12 +92,12 @@ ? _("Yes") // table cell : _("No"); - return `item (`id (k), channel, format, diag); + return `item (`id(k), channel, format, diag); }); - return items; } - - items = (list<term>) maplist (integer k, map<string,any> d, devices, ``{ + else + { + items = maplist(integer k, map<string, any> d, devices, { boolean active = (boolean)(d["resource", "io", 0, "active"]:false); integer channel = (integer)(d["resource", "io", 0, "start"]:0); string str_channel = (string)(d["channel"]:""); @@ -133,14 +133,14 @@ // table cell : _("No"); string partition_info = d["partition_info"]:"--"; - boolean activate = d["activate"]:false; string selected = DASDController::selected[k]:false // table cell ? _("Yes") : "-"; - if (!active) { + if (!active) + { type = "--"; access = "--"; formatted = "--"; @@ -148,13 +148,11 @@ device = "--"; } - term t = `item (`id (k), selected, str_channel, device, - type ,access); - t = add (t, diag); - t = add (t, formatted); - t = add (t, partition_info); - return t; + return `item(`id(k), selected, str_channel, device, type, access, diag, formatted, + partition_info); }); + } + return items; } Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Fri Feb 10 11:35:10 2012 @@ -57,7 +57,7 @@ list<term> items = []; - items = (list<term>) maplist (integer k, map<string,any> d, devices, ``{ + items = maplist(integer k, map<string, any> d, devices, { string dev_name = (string)(d["dev_name"]:""); string channel = d["detail", "controller_id"]:"unknown"; string wwpn = d["detail", "wwpn"]:"unknown"; @@ -69,9 +69,9 @@ ? _("Yes") : "-"; - term t = `item (`id (k), channel, wwpn, fcp_lun); - return t; + return `item(`id(k), channel, wwpn, fcp_lun); }); + return items; } -- 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] r67401 - in /trunk/s390/src: dasd/dialogs.ycp zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: aschnell Date: Fri Feb 10 11:25:17 2012 New Revision: 67401 URL: http://svn.opensuse.org/viewcvs/yast?rev=67401&view=rev Log: - code simplifications Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Fri Feb 10 11:25:17 2012 @@ -6,9 +6,7 @@ * * $Id$ */ - { - textdomain "s390"; import "Arch"; @@ -163,8 +161,8 @@ /** * Draw the DASD dialog */ -define void DisplayDASDDialog() { - +void DisplayDASDDialog() +{ string help_key = Mode::config () ? "disk_selection_config" : "disk_selection"; @@ -176,7 +174,7 @@ string caption = _("DASD Disk Management"); term header = `header( - // table header + // table header _("Sel."), // table header `Right(_("Channel")), @@ -187,11 +185,12 @@ // table header _("Access Type"), // table header - _("Use DIAG")); - // table header - header = add (header, _("Formatted")); - // table header - header = add (header, _("Partition Information")); + _("Use DIAG"), + // table header + _("Formatted"), + // table header + _("Partition Information") + ); if (Mode::config ()) { @@ -207,17 +206,16 @@ list actions = [ // menu button id - `item (`id (`activate), _("&Activate")), + `item(`id(`activate), _("&Activate")), + // menu button id + `item(`id(`deactivate), _("&Deactivate")), + // menu button id + `item(`id(`diag_on), _("Set DIAG O&n")), + // menu button id + `item(`id(`diag_off), _("Set DIAG O&ff")), // menu button id - `item (`id(`deactivate), _("&Deactivate")), + `item(`id(`format), _("&Format")) ]; - // menu button id - actions = add (actions, `item (`id(`diag_on), _("Set DIAG O&n"))); - // menu button id - actions = add (actions, `item (`id(`diag_off), _("Set DIAG O&ff"))); - - // menu button id - actions = add (actions, `item (`id(`format), _("&Format"))); /* Dialog content */ term content = `VBox( @@ -232,7 +230,7 @@ `PushButton (`id (`filter), _("&Filter")) ) ), - `Table(`id(`table), `opt (`notify), header, []), + `Table(`id(`table), `opt(`notify), header, []), Mode::config () ? `HBox ( // push button @@ -582,7 +580,4 @@ } - -// EOF } - Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Fri Feb 10 11:25:17 2012 @@ -6,9 +6,7 @@ * * $Id$ */ - { - textdomain "s390"; import "Arch"; @@ -98,14 +96,23 @@ /** * Show the ZFCP-Dialog */ -define void DisplayZFCPDialog () { - +void DisplayZFCPDialog() +{ /* Minimal text for the help */ string help = ZFCP_HELPS["disk_selection"]:""; /* Dialog caption */ string caption = _("Configured ZFCP Devices"); + term header = `header( + // table header + `Right(_("Channel Number")), + // table header + `Right(_("WWPN")), + // table header + `Right(_("ZFCP-LUN")) + ); + /* Dialog content */ term content = `VBox( `HBox( @@ -120,18 +127,7 @@ ) ), `HBox( - `Table( - `id(`table), `opt(`keepSorting, `notify), - `header( - // table header - `Right(_("Channel Number")), - // table header - `Right(_("WWPN")), - // table header - `Right(_("zfcp-LUN")) - ), - [] - ) + `Table(`id(`table), `opt(`notify), header, []) ), `HBox( `PushButton(`id(`add), Label::AddButton ()), @@ -378,7 +374,4 @@ } - -// EOF } - -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0