Author: lslezak Date: Wed Sep 21 16:19:14 2011 New Revision: 65891 URL: http://svn.opensuse.org/viewcvs/yast?rev=65891&view=rev Log: Routing.ycp - use /etc/sysctl.conf file instead of deprecated /etc/sysconfig/sysctl, adapted testsuite Modified: trunk/network/package/yast2-network.changes trunk/network/src/modules/Routing.ycp trunk/network/testsuite/tests/Routing.out trunk/network/testsuite/tests/Routing.ycp Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=65891&r1=65890&r2=65891&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Sep 21 16:19:14 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Sep 21 14:15:44 UTC 2011 - lslezak@suse.cz + +- Routing.ycp - use /etc/sysctl.conf file instead of deprecated + /etc/sysconfig/sysctl, adapted testsuite + +------------------------------------------------------------------- Mon Sep 19 09:20:00 CEST 2011 - visnov@suse.cz - Remove unneeded dialog and dependency on Wizard_hw Modified: trunk/network/src/modules/Routing.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Routing.ycp?rev=65891&r1=65890&r2=65891&view=diff ============================================================================== --- trunk/network/src/modules/Routing.ycp (original) +++ trunk/network/src/modules/Routing.ycp Wed Sep 21 16:19:14 2011 @@ -101,7 +101,7 @@ Forward = SuSEFirewall::GetSupportRoute(); } else { - Forward = (SCR::Read(.sysconfig.sysctl.IP_FORWARD) == "yes"); + Forward = (SCR::Read(.etc.sysctl_conf."net.ipv4.ip_forward") == "1"); } } @@ -110,9 +110,9 @@ SuSEFirewall::SetSupportRoute( Forward ); } else { - SCR::Write(.sysconfig.sysctl.IP_FORWARD, Forward ? "yes" : "no"); - SCR::Write(.sysconfig.sysctl.IPV6_FORWARD, Forward ? "yes" : "no"); - SCR::Write(.sysconfig.sysctl, nil); + SCR::Write(.etc.sysctl_conf."net.ipv4.ip_forward", Forward ? "1" : "0"); + SCR::Write(.etc.sysctl_conf."net.ipv6.conf.all.forwarding", Forward ? "1" : "0"); + SCR::Write(.etc.sysctl_conf, nil); } SCR::Execute(.target.bash, sformat("echo %1 > /proc/sys/net/ipv4/ip_forward", Forward ? 1 : 0)); Modified: trunk/network/testsuite/tests/Routing.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/testsuite/tests/Routing.out?rev=65891&r1=65890&r2=65891&view=diff ============================================================================== --- trunk/network/testsuite/tests/Routing.out (original) +++ trunk/network/testsuite/tests/Routing.out Wed Sep 21 16:19:14 2011 @@ -1,21 +1,21 @@ -Dump Read +Dump ==== Read ===== Read .target.size "/etc/sysconfig/network/routes" 1 Read .routes [$["1":"r1"], $["2":"r2"]] -Read .sysconfig.sysctl.IP_FORWARD "yes" +Read .etc.sysctl_conf."net.ipv4.ip_forward" "1" Return true Dump Routing::routes [$["1":"r1"], $["2":"r2"]] -Dump Write +Dump ==== Write ==== Return true -Write .sysconfig.sysctl.IP_FORWARD "yes" true -Write .sysconfig.sysctl.IPV6_FORWARD "yes" true -Write .sysconfig.sysctl nil true +Write .etc.sysctl_conf."net.ipv4.ip_forward" "1" true +Write .etc.sysctl_conf."net.ipv6.conf.all.forwarding" "1" true +Write .etc.sysctl_conf nil true Execute .target.bash "echo 1 > /proc/sys/net/ipv4/ip_forward" 0 Execute .target.bash "echo 1 > /proc/sys/net/ipv6/conf/all/forwarding" 0 Read .target.size "/etc/sysconfig/network/routes" 1 Execute .target.bash "/bin/cp /etc/sysconfig/network/routes /etc/sysconfig/network/routes.YaST2save" 0 Write .routes [$["1":"r1"], $["3":"r3"]] true Return true -Dump Import +Dump ==== Import ==== Return true -Dump Export +Dump ==== Export ==== Return $["ip_forward":true, "routes":["r7", "r8"]] Modified: trunk/network/testsuite/tests/Routing.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/testsuite/tests/Routing.ycp?rev=65891&r1=65890&r2=65891&view=diff ============================================================================== --- trunk/network/testsuite/tests/Routing.ycp (original) +++ trunk/network/testsuite/tests/Routing.ycp Wed Sep 21 16:19:14 2011 @@ -29,29 +29,38 @@ "console" : $[ "CONSOLE_ENCODING" : "UTF-8", ], - "sysctl" : $[ "IP_FORWARD" : "yes" ], ], + "etc" : $[ + "sysctl_conf" : $[ + "net.ipv4.ip_forward" : "1" + ] + ] ]; -map EXEC = $["target": $["bash_output": $[] ] ]; +map EXEC = $[ + "target": $[ + "bash_output": $[], + "bash" : -1 // simluate not running SuSEFirewall + ] +]; TESTSUITE_INIT([READ, $[], EXEC], nil); import "Routing"; -DUMP("Read"); -TEST(``(Routing::Read()), [READ], nil); +DUMP("==== Read ====="); +TEST(``(Routing::Read()), [READ, $[], EXEC], nil); DUMP(sformat("Routing::routes %1",Routing::Routes)); -DUMP("Write"); +DUMP("==== Write ===="); // Routing::Forward = true; TEST(``(Routing::Write()), [READ], nil); Routing::Routes = [ $["1":"r1"], $["3":"r3"] ]; TEST(``(Routing::Write()), [READ], nil); -DUMP("Import"); +DUMP("==== Import ===="); TEST(``(Routing::Import($["routes":["r7", "r8"], "ip_forward":true])), [], nil); -DUMP("Export"); +DUMP("==== Export ===="); TEST(``(Routing::Export()), [], nil); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org