Author: locilka Date: Fri Nov 2 15:34:48 2007 New Revision: 41746 URL: http://svn.opensuse.org/viewcvs/yast?rev=41746&view=rev Log: - Created new YCP module InternetDevices (some functions from Internet module were moved there). - Adjusted Internet testsuite. Added: trunk/network/testsuite/tests/InternetDevices.err - copied unchanged from r41745, trunk/network/testsuite/tests/Internet.err trunk/network/testsuite/tests/InternetDevices.out - copied unchanged from r41745, trunk/network/testsuite/tests/Internet.out trunk/network/testsuite/tests/InternetDevices.ycp - copied, changed from r41745, trunk/network/testsuite/tests/Internet.ycp Removed: trunk/network/testsuite/tests/Internet.err trunk/network/testsuite/tests/Internet.out trunk/network/testsuite/tests/Internet.ycp Modified: trunk/network/package/yast2-network.changes trunk/network/src/installation/dialogs.ycp trunk/network/src/installation/inst_ask_net_test.ycp Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=41746&r1=41745&r2=41746&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri Nov 2 15:34:48 2007 @@ -3,7 +3,10 @@ - YCP Module Internet moved to yast2.rpm to break several dependencies on yast2-network. +- Created new YCP module InternetDevices (some functions from + Internet module were moved there). - Adjusted RPM dependencies. +- Adjusted Internet testsuite. - 2.16.6 ------------------------------------------------------------------- Modified: trunk/network/src/installation/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/installation/dialogs.ycp?rev=41746&r1=41745&r2=41746&view=diff ============================================================================== --- trunk/network/src/installation/dialogs.ycp (original) +++ trunk/network/src/installation/dialogs.ycp Fri Nov 2 15:34:48 2007 @@ -58,6 +58,31 @@ return ret == `ok; } +/** + * Set device from argument as default network device + */ +void SetDevice (string dev) { + Internet::device=dev; + NetworkDevices::Select(Internet::device); + Internet::type = NetworkDevices::FastestType(Internet::device); + Internet::provider = NetworkDevices::Current["PROVIDER"]:""; + + if (Internet::provider != "") { + import "Provider"; + Provider::Read(); + Provider::Select(Internet::provider); + Internet::demand = Provider::Current["DEMAND"]:"no" == "yes"; + Internet::password = Provider::Current["PASSWORD"]:""; + Internet::askpassword = Provider::Current["ASKPASSWORD"]:"no" == "yes"; + Internet::capi_adsl = Provider::Current["PPPMODE"]:"pppoe" == "capi-adsl"; + Internet::capi_isdn = Provider::Current["PPPMODE"]:"ippp" == "capi-isdn"; + } + + /* Set logfile */ + if (Internet::type == "dsl" || Internet::type == "modem" || (Internet::type == "isdn" && Internet::capi_isdn)) + Internet::logfile = "/var/log/smpppd/ifcfg-" + Internet::device + ".log"; + +} /** * Connection steps dialog @@ -199,7 +224,7 @@ }while(!exit); Internet::do_test = UI::QueryWidget(`id(`rb), `CurrentButton) == `yes; - Internet::SetDevice(current); + SetDevice(current); y2debug("Internet::do_test=%1", Internet::do_test); return (symbol) ret; Modified: trunk/network/src/installation/inst_ask_net_test.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/installation/inst_ask_net_test.ycp?rev=41746&r1=41745&r2=41746&view=diff ============================================================================== --- trunk/network/src/installation/inst_ask_net_test.ycp (original) +++ trunk/network/src/installation/inst_ask_net_test.ycp Fri Nov 2 15:34:48 2007 @@ -13,6 +13,7 @@ textdomain "network"; import "Internet"; +import "InternetDevices"; import "Mode"; include "network/routines.ycp"; @@ -28,7 +29,7 @@ } /* Nothing to test */ -if(!Internet::FindFastest()) +if(!InternetDevices::FindFastest()) { Internet::do_test = false; return `auto; Copied: trunk/network/testsuite/tests/InternetDevices.ycp (from r41745, trunk/network/testsuite/tests/Internet.ycp) URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/testsuite/tests/InternetDevices.ycp?p2=trunk/network/testsuite/tests/InternetDevices.ycp&p1=trunk/network/testsuite/tests/Internet.ycp&r1=41745&r2=41746&rev=41746&view=diff ============================================================================== --- trunk/network/testsuite/tests/Internet.ycp (original) +++ trunk/network/testsuite/tests/InternetDevices.ycp Fri Nov 2 15:34:48 2007 @@ -23,7 +23,9 @@ ]; TESTSUITE_INIT([READ, WRITE, EXECUTE], nil); + import "Internet"; +import "InternetDevices"; import "NetworkDevices"; DUMP("Fastest"); @@ -38,68 +40,68 @@ ] ] ]; -TEST(``(Internet::FindFastest()), [READ, WRITE, EXECUTE], nil); +TEST(``(InternetDevices::FindFastest()), [READ, WRITE, EXECUTE], nil); DUMP(Internet::device); DUMP(Internet::type); NetworkDevices::initialized = false; READ["network"] = $[ "section" : $[ "dsl0":$[], "eth0":$[] ]]; -TEST(``(Internet::FindFastest()), [READ, WRITE, EXECUTE], nil); +TEST(``(InternetDevices::FindFastest()), [READ, WRITE, EXECUTE], nil); DUMP(Internet::device); DUMP(Internet::type); NetworkDevices::initialized = false; READ["network"]= $[ "section" : $[ "eth1":$[], "tr0":$[] ]]; -TEST(``(Internet::FindFastest()), [READ, WRITE, EXECUTE], nil); +TEST(``(InternetDevices::FindFastest()), [READ, WRITE, EXECUTE], nil); DUMP(Internet::device); DUMP(Internet::type); NetworkDevices::initialized = false; READ["network"] = $[ "section" : $[ "dsl0":$[], "tr0":$[] ]]; -TEST(``(Internet::FindFastest()), [READ, WRITE, EXECUTE], nil); +TEST(``(InternetDevices::FindFastest()), [READ, WRITE, EXECUTE], nil); DUMP(Internet::device); DUMP(Internet::type); NetworkDevices::initialized = false; READ["network"] = $[ "section" : $[ "dsl0":$[], "ppp0":$[] ]]; -TEST(``(Internet::FindFastest()), [READ, WRITE, EXECUTE], nil); +TEST(``(InternetDevices::FindFastest()), [READ, WRITE, EXECUTE], nil); DUMP(Internet::device); DUMP(Internet::type); NetworkDevices::initialized = false; READ["network"] = $[ "section" : $[ "ppp0":$[], "tr1":$[] ]]; -TEST(``(Internet::FindFastest()), [READ, WRITE, EXECUTE], nil); +TEST(``(InternetDevices::FindFastest()), [READ, WRITE, EXECUTE], nil); DUMP(Internet::device); DUMP(Internet::type); NetworkDevices::initialized = false; READ["network"] = $[ "section" : $[ "ppp0":$[] ]]; -TEST(``(Internet::FindFastest()), [READ, WRITE, EXECUTE], nil); +TEST(``(InternetDevices::FindFastest()), [READ, WRITE, EXECUTE], nil); DUMP(Internet::device); DUMP(Internet::type); NetworkDevices::initialized = false; READ["network"] = $[ "section" : $[ "ippp0":$[], "tr1":$[] ]]; -TEST(``(Internet::FindFastest()), [READ, WRITE, EXECUTE], nil); +TEST(``(InternetDevices::FindFastest()), [READ, WRITE, EXECUTE], nil); DUMP(Internet::device); DUMP(Internet::type); NetworkDevices::initialized = false; READ["network"] = $[ "section" : $[ "ippp0":$[], "ppp0":$[] ]]; -TEST(``(Internet::FindFastest()), [READ, WRITE, EXECUTE], nil); +TEST(``(InternetDevices::FindFastest()), [READ, WRITE, EXECUTE], nil); DUMP(Internet::device); DUMP(Internet::type); NetworkDevices::initialized = false; READ["network"] = $[ "section" : $[]]; -TEST(``(Internet::FindFastest()), [READ, WRITE, EXECUTE], nil); +TEST(``(InternetDevices::FindFastest()), [READ, WRITE, EXECUTE], nil); DUMP(Internet::device); DUMP(Internet::type); NetworkDevices::initialized = false; Internet::devices = nil; READ["network"] = $[ "section" : $[]]; -TEST(``(Internet::FindFastest()), [READ, WRITE, EXECUTE2], nil); +TEST(``(InternetDevices::FindFastest()), [READ, WRITE, EXECUTE2], nil); DUMP(Internet::device); DUMP(Internet::type); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org