Author: lslezak Date: Thu Sep 22 11:19:26 2011 New Revision: 65907 URL: http://svn.opensuse.org/viewcvs/yast?rev=65907&view=rev Log: - updated Network_YaPI test (adapted to systemd and sysctl changes) - 2.21.7 Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/testsuite/tests/Network_YaPI.out trunk/network/testsuite/tests/Network_YaPI.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=65907&r1=65906&r2=65907&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Thu Sep 22 11:19:26 2011 @@ -1 +1 @@ -2.21.6 +2.21.7 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=65907&r1=65906&r2=65907&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Thu Sep 22 11:19:26 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Sep 22 09:04:17 UTC 2011 - lslezak@suse.cz + +- updated Network_YaPI test (adapted to systemd and sysctl changes) +- 2.21.7 + +------------------------------------------------------------------- Wed Sep 21 14:15:44 UTC 2011 - lslezak@suse.cz - Routing.ycp - use /etc/sysctl.conf file instead of deprecated Modified: trunk/network/testsuite/tests/Network_YaPI.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/testsuite/tests/Network_YaPI.out?rev=65907&r1=65906&r2=65907&view=diff ============================================================================== --- trunk/network/testsuite/tests/Network_YaPI.out (original) +++ trunk/network/testsuite/tests/Network_YaPI.out Thu Sep 22 11:19:26 2011 @@ -10,8 +10,9 @@ Read .target.size "/etc/sysconfig/network/routes" 27 Read .routes [$["destination":"default", "gateway":"10.20.30.40"]] Execute .target.bash "rpm -q --whatprovides SuSEfirewall2" 0 -Read .init.scripts.exists "SuSEfirewall2_init" false -Read .sysconfig.sysctl.IP_FORWARD nil +Read .target.stat "/etc/init.d/SuSEfirewall2_init" $[] +Read .target.stat "/lib/systemd/system/SuSEfirewall2_init.service" $[] +Read .etc.sysctl_conf."net.ipv4.ip_forward" nil Dir .network.section: ["eth0", "eth1", "eth2", "eth3", "eth4", "eth5", "eth5.23"] Dir .network.value."eth0": ["BOOTPROTO", "STARTMODE"] Read .network.value."eth0".BOOTPROTO "dhcp4" @@ -65,16 +66,19 @@ Write .network.value."eth0".BOOTPROTO "dhcp4" true Write .network.value."eth0".STARTMODE "auto" true Write .network nil true -Read .init.scripts.exists "network" false +Read .target.stat "/etc/init.d/network" $[] +Read .target.stat "/lib/systemd/system/network.service" $[] Return $["error":"", "exit":"0"] Read .target.size "/etc/sysconfig/network/routes" 27 Read .routes [$["destination":"default", "gateway":"10.20.30.40"]] -Read .init.scripts.exists "SuSEfirewall2_init" false -Read .sysconfig.sysctl.IP_FORWARD nil -Read .init.scripts.exists "SuSEfirewall2_init" false -Write .sysconfig.sysctl.IP_FORWARD "no" true -Write .sysconfig.sysctl.IPV6_FORWARD "no" true -Write .sysconfig.sysctl nil true +Read .target.stat "/etc/init.d/SuSEfirewall2_init" $[] +Read .target.stat "/lib/systemd/system/SuSEfirewall2_init.service" $[] +Read .etc.sysctl_conf."net.ipv4.ip_forward" nil +Read .target.stat "/etc/init.d/SuSEfirewall2_init" $[] +Read .target.stat "/lib/systemd/system/SuSEfirewall2_init.service" $[] +Write .etc.sysctl_conf."net.ipv4.ip_forward" "0" true +Write .etc.sysctl_conf."net.ipv6.conf.all.forwarding" "0" true +Write .etc.sysctl_conf nil true Execute .target.bash "echo 0 > /proc/sys/net/ipv4/ip_forward" 0 Execute .target.bash "echo 0 > /proc/sys/net/ipv6/conf/all/forwarding" 0 Read .target.size "/etc/sysconfig/network/routes" 27 @@ -86,7 +90,8 @@ Write .network.value."eth3".IPADDR "1.2.3.7/24" true Write .network.value."eth3".STARTMODE "auto" true Write .network nil true -Read .init.scripts.exists "network" false +Read .target.stat "/etc/init.d/network" $[] +Read .target.stat "/lib/systemd/system/network.service" $[] Return $["error":"", "exit":"0"] Write .network.value."eth5.23".BOOTPROTO "static" true Write .network.value."eth5.23".ETHERDEVICE "eth5" true @@ -94,12 +99,14 @@ Write .network.value."eth5.23".STARTMODE "auto" true Write .network.value."eth5.23".VLAN_ID "42" true Write .network nil true -Read .init.scripts.exists "network" false +Read .target.stat "/etc/init.d/network" $[] +Read .target.stat "/lib/systemd/system/network.service" $[] Return $["error":"", "exit":"0"] Read .target.size "/etc/sysconfig/network/routes" 27 Read .routes [$["destination":"default", "gateway":"10.20.30.40"]] -Read .init.scripts.exists "SuSEfirewall2_init" false -Read .sysconfig.sysctl.IP_FORWARD nil +Read .target.stat "/etc/init.d/SuSEfirewall2_init" $[] +Read .target.stat "/lib/systemd/system/SuSEfirewall2_init.service" $[] +Read .etc.sysctl_conf."net.ipv4.ip_forward" nil Read .probe.netcard nil Log hardware detection failure Read .etc.install_inf.BrokenModules nil Modified: trunk/network/testsuite/tests/Network_YaPI.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/testsuite/tests/Network_YaPI.ycp?rev=65907&r1=65906&r2=65907&view=diff ============================================================================== --- trunk/network/testsuite/tests/Network_YaPI.ycp (original) +++ trunk/network/testsuite/tests/Network_YaPI.ycp Thu Sep 22 11:19:26 2011 @@ -3,14 +3,10 @@ import "YaPI::NETWORK"; map READ = $[ - "init" : $[ - "scripts" :$[ - "exists" : false - ] - ], "target" : $[ "size":27, "string" : "laptop.suse.cz", + "stat" : $[] ], "sysconfig": $[ "network" : $[ @@ -76,7 +72,12 @@ ], ], ], - "routes" : [ $["destination":"default", "gateway":"10.20.30.40"] ] + "routes" : [ $["destination":"default", "gateway":"10.20.30.40"] ], + "etc" : $[ + "sysctl_conf" : $[ + "net.ipv4.ip_forward" : nil + ] + ] ]; map EXEC = $[ @@ -84,7 +85,8 @@ "bash_output" : $[ "exit" : 0, "stdout" : "laptop.suse.cz" - ] + ], + "bash" : 0 ] ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org