Author: mzugec Date: Tue Jan 8 18:49:13 2008 New Revision: 43483 URL: http://svn.opensuse.org/viewcvs/yast?rev=43483&view=rev Log: use NetworkInterfaces instead of NetworkDevices Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/lan_auto.ycp trunk/network/src/clients/save_network.ycp trunk/network/src/dsl/complex.ycp trunk/network/src/dsl/dialogs.ycp trunk/network/src/installation/dialogs.ycp trunk/network/src/lan/address.ycp trunk/network/src/lan/cmdline.ycp trunk/network/src/lan/hardware.ycp trunk/network/src/lan/virtual.ycp trunk/network/src/modem/complex.ycp trunk/network/src/modules/DNS.ycp trunk/network/src/modules/DSL.ycp trunk/network/src/modules/ISDN.ycp trunk/network/src/modules/InternetDevices.ycp trunk/network/src/modules/Lan.ycp trunk/network/src/modules/LanItems.ycp trunk/network/src/modules/Modem.ycp trunk/network/src/modules/Routing.ycp trunk/network/src/provider/connection.ycp trunk/network/src/routines/complex.ycp trunk/network/src/routines/devices.ycp trunk/network/src/routines/hardware.ycp trunk/network/src/routines/routines.ycp trunk/network/src/routines/runtime.ycp trunk/network/src/routines/summary.ycp trunk/network/src/routines/widgets.ycp trunk/network/yast2-network.spec.in Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue Jan 8 18:49:13 2008 @@ -1 +1 @@ -2.16.18 +2.16.19 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue Jan 8 18:49:13 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Dec 14 17:35:15 CET 2007 - mzugec@suse.cz + +- use NetworkInterfaces instead of NetworkDevices +- 2.16.19 + +------------------------------------------------------------------- +======= Mon Jan 7 11:49:33 CET 2008 - kmachalkova@suse.cz - Enable setting a route without interface (use '-' which stands for Modified: trunk/network/src/clients/lan_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/lan_auto.ycp?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/src/clients/lan_auto.ycp (original) +++ trunk/network/src/clients/lan_auto.ycp Tue Jan 8 18:49:13 2008 @@ -19,7 +19,7 @@ import "Arch"; import "Mode"; import "Map"; -import "NetworkDevices"; +import "NetworkInterfaces"; import "LanItems"; include "network/lan/wizards.ycp"; include "network/routines.ycp"; @@ -95,13 +95,13 @@ return $[ new_device : new_interface ]; }); - // split to a two level map like NetworkDevices + // split to a two level map like NetworkInterfaces map devices = $[]; foreach(string devname, map if_data, interfaces, { - string type = NetworkDevices::device_type (devname); - string id = NetworkDevices::device_num (devname); + string type = NetworkInterfaces::device_type (devname); + string id = NetworkInterfaces::device_num (devname); map d = devices[type]:$[]; d[id] = if_data; devices[type] = d; Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network.ycp?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Tue Jan 8 18:49:13 2008 @@ -14,7 +14,7 @@ import "Hostname"; import "IP"; -import "NetworkDevices"; +import "NetworkInterfaces"; import "FileUtils"; import "Netmask"; import "NetworkStorage"; @@ -109,7 +109,7 @@ /* Split network device */ string netdevice = InstallInf["netdevice"]:""; if(netdevice != "") { - string devtype = NetworkDevices::device_type(netdevice); + string devtype = NetworkInterfaces::device_type(netdevice); if(devtype != nil && devtype != "") InstallInf["type"] = devtype; // InstallInf = remove(InstallInf, "netdevice"); } @@ -248,7 +248,7 @@ string ifcfg = sformat("ifcfg-%1", InstallInf["netdevice"]:""); - string hw_name = BuildDescription(NetworkDevices::device_type(ifcfg), NetworkDevices::device_num(ifcfg), $["dev_name":InstallInf["netdevice"]:""], hardware); + string hw_name = BuildDescription(NetworkInterfaces::device_type(ifcfg), NetworkInterfaces::device_num(ifcfg), $["dev_name":InstallInf["netdevice"]:""], hardware); // protect special characters, #305343 if (size(hw_name)>0) network_configuration = sformat("%1NAME='%2'\n", network_configuration, String::Quote (hw_name)); Modified: trunk/network/src/dsl/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/dsl/complex.ycp?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/src/dsl/complex.ycp (original) +++ trunk/network/src/dsl/complex.ycp Tue Jan 8 18:49:13 2008 @@ -16,7 +16,7 @@ import "DSL"; import "Label"; import "Mode"; -import "NetworkDevices"; +import "NetworkInterfaces"; import "Popup"; import "Provider"; import "Wizard"; @@ -248,7 +248,7 @@ string dev = WizardHW::SelectedItem (); /* Check if the provider is not used (#17497) */ - if(NetworkDevices::LocateProvider(dev)) { + if(NetworkInterfaces::LocateProvider(dev)) { y2debug("Provider used: %1", dev); /* Popup text */ Modified: trunk/network/src/dsl/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/dsl/dialogs.ycp?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/src/dsl/dialogs.ycp (original) +++ trunk/network/src/dsl/dialogs.ycp Tue Jan 8 18:49:13 2008 @@ -17,7 +17,7 @@ import "IP"; import "Label"; import "Lan"; -import "NetworkDevices"; +import "NetworkInterfaces"; import "Popup"; import "SuSEFirewall4Network"; import "Wizard"; @@ -124,7 +124,7 @@ /* FIXME: #suse27137 */ // UpdateInterfaces(); if(size(items) < 1) { - NetworkDevices::Push(); + NetworkInterfaces::Push(); if(Lan::Propose()) { // UpdateInterfaces(); // list @@ -135,7 +135,7 @@ LanItems::ipaddr = ""; LanItems::Commit(); } - NetworkDevices::Pop(); + NetworkInterfaces::Pop(); } list<map> widgets = CWM::CreateWidgets ( @@ -143,10 +143,10 @@ widget_descr); -// list<string> items = NetworkDevices::List(""); +// list<string> items = NetworkInterfaces::List(""); /* -NetworkDevices::Read(); +NetworkInterfaces::Read(); map device_descr = GetDeviceDescription(items[0]:""); y2internal("device_descr %1", device_descr); string connection_text = _("%1 - %2 (%3)"); @@ -249,9 +249,9 @@ } else if(ret == `lan) { // WFM::CallFunction("lan_proposal", ["AskUser"]); - NetworkDevices::Push(); + NetworkInterfaces::Push(); Call::Function("lan_proposal", ["AskUser"]); - NetworkDevices::Pop(); + NetworkInterfaces::Pop(); items = getNetDeviceItems(); refreshDevice(interface); // interface = (string) UI::QueryWidget(`id(`interface), `Value); Modified: trunk/network/src/installation/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/installation/dialogs.ycp?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/src/installation/dialogs.ycp (original) +++ trunk/network/src/installation/dialogs.ycp Tue Jan 8 18:49:13 2008 @@ -15,7 +15,7 @@ import "Mode"; import "Internet"; import "Label"; -import "NetworkDevices"; +import "NetworkInterfaces"; import "Popup"; import "Product"; import "String"; @@ -63,9 +63,9 @@ */ void SetDevice (string dev) { Internet::device=dev; - NetworkDevices::Select(Internet::device); - Internet::type = NetworkDevices::FastestType(Internet::device); - Internet::provider = NetworkDevices::Current["PROVIDER"]:""; + NetworkInterfaces::Select(Internet::device); + Internet::type = NetworkInterfaces::FastestType(Internet::device); + Internet::provider = NetworkInterfaces::Current["PROVIDER"]:""; if (Internet::provider != "") { import "Provider"; Modified: trunk/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/src/lan/address.ycp (original) +++ trunk/network/src/lan/address.ycp Tue Jan 8 18:49:13 2008 @@ -21,7 +21,7 @@ import "Lan"; import "Netmask"; import "NetHwDetection"; -import "NetworkDevices"; +import "NetworkInterfaces"; import "Popup"; import "ProductFeatures"; import "Routing"; @@ -109,22 +109,21 @@ void InitBridge(string key) { list items = []; - string old_name=NetworkDevices::Name; - list<string> br_ports = splitstring(NetworkDevices::Current["BRIDGE_PORTS"]:"", " "); - map configurations = NetworkDevices::FilterDevices("netcard"); - foreach(string devtype, splitstring(NetworkDevices::CardRegex["netcard"]:"", "|"), { + string old_name=NetworkInterfaces::Name; + list<string> br_ports = splitstring(NetworkInterfaces::Current["BRIDGE_PORTS"]:"", " "); + map configurations = NetworkInterfaces::FilterDevices("netcard"); + foreach(string devtype, splitstring(NetworkInterfaces::CardRegex["netcard"]:"", "|"), { foreach(string devnum, (list<string>) Map::Keys(configurations[devtype]:$[]), { //filter the eth devices (IPADDR=0.0.0.0 - promiscuited mode) if ((string)configurations[devtype, devnum, "IPADDR"]:"" == "0.0.0.0") { - string dev_name = NetworkDevices::device_name(devtype, devnum); - items = add (items, `item(`id(dev_name), sformat("%1 - %2",dev_name, NetworkDevices::GetValue(dev_name, "NAME")), contains(br_ports, dev_name)) ); + string dev_name = NetworkInterfaces::device_name(devtype, devnum); + items = add (items, `item(`id(dev_name), sformat("%1 - %2",dev_name, NetworkInterfaces::GetValue(dev_name, "NAME")), contains(br_ports, dev_name)) ); } - }); }); - NetworkDevices::Select(old_name); + NetworkInterfaces::Select(old_name); UI::ChangeWidget(`id(key), `Items, items); } @@ -145,7 +144,7 @@ void InitVLANSlave(string key) { list items = []; - settings["ETHERDEVICE"] = NetworkDevices::Current["ETHERDEVICE"]:""; + settings["ETHERDEVICE"] = NetworkInterfaces::Current["ETHERDEVICE"]:""; foreach(integer row, any value, LanItems::Items,{ LanItems::current = row; if (!LanItems::IsItemConfigured()){ @@ -345,12 +344,12 @@ } string ifcfgid = (string) UI::QueryWidget (`id ("IFCFGID"), `Value); - string ifcfgname = NetworkDevices::device_name (ifcfgtype, ifcfgid); + string ifcfgname = NetworkInterfaces::device_name (ifcfgtype, ifcfgid); // Check should be improved to find differently named but // equivalent configs (eg. by-mac and by-bus, depends on the // current hardware) - if (NetworkDevices::Check(ifcfgname)) + if (NetworkInterfaces::Check(ifcfgname)) { UI::SetFocus(`id (key)); /* Popup text */ @@ -376,7 +375,7 @@ // gets through (#62309) so warn and redirect to details string type = (string) UI::QueryWidget (`id ("IFCFGTYPE"), `Value); string id = (string) UI::QueryWidget (`id ("IFCFGID"), `Value); - string name = NetworkDevices::device_name (type, id); + string name = NetworkInterfaces::device_name (type, id); if (SuSEFirewall4Network::IsOn () && SuSEFirewall4Network::GetZoneOfInterface (name) == "" && SuSEFirewall4Network::UnconfiguredIsBlocked ()) @@ -533,7 +532,7 @@ "opt": [`hstretch, `disabled ], "help": "", "init" : initIfcfgId, -// "valid_chars": NetworkDevices::ValidCharsIfcfg (), +// "valid_chars": NetworkInterfaces::ValidCharsIfcfg (), // "handle": HandleIfcfg, ], @@ -650,7 +649,7 @@ */ list< list<string> > BuildTypesListCWM (list<string> types) { return maplist(string t, types, { - return [t, NetworkDevices::GetDevTypeDescription(t, false)]; + return [t, NetworkInterfaces::GetDevTypeDescription(t, false)]; }); } @@ -660,7 +659,7 @@ */ define any AddressDialog() { ScreenName("lan-address"); - string ifname = NetworkDevices::device_name (LanItems::type, LanItems::device); + string ifname = NetworkInterfaces::device_name (LanItems::type, LanItems::device); string fwzone = SuSEFirewall4Network::GetZoneOfInterface (ifname); // If firewall is active and interface in no zone, nothing @@ -759,10 +758,10 @@ ); if(LanItems::operation != `add) { if(LanItems::alias == "") { - settings["IFCFG"] = NetworkDevices::device_name(NetworkDevices::RealType(LanItems::type, LanItems::hotplug), LanItems::device); + settings["IFCFG"] = NetworkInterfaces::device_name(NetworkInterfaces::RealType(LanItems::type, LanItems::hotplug), LanItems::device); } else { - settings["IFCFG"] = NetworkDevices::alias_name(NetworkDevices::RealType(LanItems::type, LanItems::hotplug), LanItems::device, LanItems::alias); + settings["IFCFG"] = NetworkInterfaces::alias_name(NetworkInterfaces::RealType(LanItems::type, LanItems::hotplug), LanItems::device, LanItems::alias); } } @@ -830,13 +829,13 @@ { settings["SLAVES"] = LanItems::bond_slaves; - map configurations = NetworkDevices::FilterDevices("netcard"); - foreach(string devtype, splitstring(NetworkDevices::CardRegex["netcard"]:"", "|"), { + map configurations = NetworkInterfaces::FilterDevices("netcard"); + foreach(string devtype, splitstring(NetworkInterfaces::CardRegex["netcard"]:"", "|"), { foreach(string devnum, (list<string>) Map::Keys(configurations[devtype]:$[]), { //filter the eth devices (BOOT_PROTO=none && START_MODE=off) if (((string)configurations[devtype, devnum, "BOOTPROTO"]:"" == "none") && ((string)configurations[devtype, devnum, "STARTMODE"]:"" == "off")) - wd["BONDSLAVE", "items"] = add (wd["BONDSLAVE", "items"]:[], [NetworkDevices::device_name(devtype, devnum)] ); + wd["BONDSLAVE", "items"] = add (wd["BONDSLAVE", "items"]:[], [NetworkInterfaces::device_name(devtype, devnum)] ); }); }); @@ -986,8 +985,8 @@ // address tab if(LanItems::operation == `add) { - LanItems::device = NetworkDevices::device_num(ifcfgname); - LanItems::type = NetworkDevices::device_type(ifcfgname); + LanItems::device = NetworkInterfaces::device_num(ifcfgname); + LanItems::type = NetworkInterfaces::device_type(ifcfgname); } LanItems::bootproto = settings["BOOTPROTO"]:""; @@ -1044,7 +1043,7 @@ } if(ret == `routing) - Routing::SetDevices(NetworkDevices::List("")); + Routing::SetDevices(NetworkInterfaces::List("")); return ret; Modified: trunk/network/src/lan/cmdline.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/cmdline.ycp?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/src/lan/cmdline.ycp (original) +++ trunk/network/src/lan/cmdline.ycp Tue Jan 8 18:49:13 2008 @@ -14,7 +14,7 @@ import "CommandLine"; import "Label"; import "Lan"; -import "NetworkDevices"; +import "NetworkInterfaces"; import "RichText"; import "Report"; import "LanItems"; @@ -159,8 +159,8 @@ if(options["ipaddr"]:"" != "") Lan::ipaddr = options["ipaddr"]:""; if(options["netmask"]:"" != "") Lan::netmask = options["netmask"]:""; if(options["bootproto"]:"" != "") Lan::bootproto = options["bootproto"]:""; - Lan::type = NetworkDevices::device_type(dev); - Lan::device = NetworkDevices::device_num(dev); + Lan::type = NetworkInterfaces::device_type(dev); + Lan::device = NetworkInterfaces::device_num(dev); Lan::Commit(); CommandLine::Print(_("Success")); @@ -182,7 +182,7 @@ LanItems::SetItem(); if (!(size(LanItems::getCurrentItem()["ifcfg"]:"")>0)){ - NetworkDevices::Add(); + NetworkInterfaces::Add(); LanItems::operation = `edit; LanItems::interfacename=LanItems::getCurrentItem()["hwinfo", "dev_name"]:""; } Modified: trunk/network/src/lan/hardware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/hardware.ycp?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/src/lan/hardware.ycp (original) +++ trunk/network/src/lan/hardware.ycp Tue Jan 8 18:49:13 2008 @@ -14,7 +14,7 @@ import "Arch"; import "Label"; import "Lan"; -import "NetworkDevices"; +import "NetworkInterfaces"; import "Popup"; import "Wizard"; import "LanItems"; @@ -77,10 +77,10 @@ y2error("Shouldn't happen -- type is empty. Assuming eth."); hardware["type"] = "eth"; } - hardware["realtype"] = NetworkDevices::RealType(hardware["type"]:"", hardware["hotplug"]:""); - /*if (hasAnyValue(NetworkDevices::Name)) + hardware["realtype"] = NetworkInterfaces::RealType(hardware["type"]:"", hardware["hotplug"]:""); + /*if (hasAnyValue(NetworkInterfaces::Name)) { - hardware["device"] = NetworkDevices::device_num(NetworkDevices::Name); + hardware["device"] = NetworkInterfaces::device_num(NetworkInterfaces::Name); }*/ //Use rather LanItems::device, so that device number is initialized correctly at all times (#308763) @@ -98,7 +98,7 @@ if (!hasAnyValue(LanItems::nm_name) && hasAnyValue(LanItems::nm_name_old)) hardware["hwcfg"]=LanItems::nm_name_old; */ // FIXME duplicated in address.ycp - hardware["device_types"] = NetworkDevices::GetDeviceTypes(); + hardware["device_types"] = NetworkInterfaces::GetDeviceTypes(); if(issubstring(hardware["device"]:"", "bus-pcmcia")) hardware["hotplug"] = "pcmcia"; else if(issubstring(hardware["device"]:"", "bus-usb")) hardware["hotplug"] = "usb"; @@ -218,7 +218,7 @@ UI::ChangeWidget(`id(`device_name), `Value, LanItems::GetItemUdev()[1]:""); if (!hw_standalone) ChangeWidgetIfExists(`id(`dev), `Enabled,false); - ChangeWidgetIfExists(`id(`num), `ValidChars, NetworkDevices::ValidCharsIfcfg ()); + ChangeWidgetIfExists(`id(`num), `ValidChars, NetworkInterfaces::ValidCharsIfcfg ()); // ChangeWidgetIfExists(`id(`hwcfg), `ValidChars, NetworkModules::ValidCharsHwcfg ()); } @@ -340,7 +340,7 @@ if(UI::WidgetExists(`id(`dev))) { hardware["type"] = (string) UI::QueryWidget(`id(`dev), `Value); - hardware["realtype"] = NetworkDevices::RealType(hardware["type"]:"", hardware["hotplug"]:""); + hardware["realtype"] = NetworkInterfaces::RealType(hardware["type"]:"", hardware["hotplug"]:""); UI::ChangeWidget (`id (`num), `Items, LanItems::FreeDevices(hardware["realtype"]:"")); } y2debug("type=%1", hardware["type"]:""); @@ -443,10 +443,12 @@ UI::QueryWidget(`udev_type, `CurrentButton)==`mac ? sformat("ATTR{address}==\"%1\"", LanItems::getCurrentItem()["hwinfo", "mac"]:"") : sformat("KERNELS==\"%1\"", LanItems::getCurrentItem()["hwinfo", "busid"]:""), sformat("NAME==\"%1\"", ((boolean)UI::QueryWidget(`change_dev_name, `Value))?UI::QueryWidget(`dev_name, `Value):LanItems::GetItemUdev()[1]:"") ]; - // when dev_name changed, rename ifcfg (both in NetworkDevices and LanItems) + // when dev_name changed, rename ifcfg (both in NetworkInterfaces and LanItems) if (LanItems::GetItemUdev()[1]:""!=old_name){ - // NetworkDevices::Delete(old_name); + NetworkInterfaces::Delete2(old_name); +// NetworkInterfaces::Commit(); LanItems::Items[LanItems::current, "ifcfg"]=LanItems::GetItemUdev()[1]:""; +// LanItems::Items[LanItems::current, "hwinfo", "dev_name"]=LanItems::GetItemUdev()[1]:""; } } UI::CloseDialog(); @@ -463,14 +465,14 @@ //Remember current device number (#308763) LanItems::device = nm; - string name=NetworkDevices::device_name(LanItems::type, nm); - if(contains(NetworkDevices::List(""), name)) { + string name=NetworkInterfaces::device_name(LanItems::type, nm); + if(contains(NetworkInterfaces::List(""), name)) { Popup::Error(sformat(_("Configuration name %1 (%2) already exists. -Choose a different one."), nm, NetworkDevices::device_name(hardware["type"]:"", nm))); +Choose a different one."), nm, NetworkInterfaces::device_name(hardware["type"]:"", nm))); UI::SetFocus(`id(`num)); } - NetworkDevices::Name = name; + NetworkInterfaces::Name = name; LanItems::Items[LanItems::current, "ifcfg"]= name; //Initialize udev map, so that setDriver (see below) sets correct module LanItems::Items[LanItems::current, "udev"]= $[]; Modified: trunk/network/src/lan/virtual.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/virtual.ycp?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/src/lan/virtual.ycp (original) +++ trunk/network/src/lan/virtual.ycp Tue Jan 8 18:49:13 2008 @@ -15,7 +15,7 @@ import "Label"; import "Lan"; import "Netmask"; -import "NetworkDevices"; +import "NetworkInterfaces"; import "NetworkService"; import "Popup"; import "Report"; @@ -139,7 +139,7 @@ aliases_to_delete[e[1]:""] = nil; }); foreach (string a, any v, (map )aliases_to_delete, { - if (v != nil) { NetworkDevices::DeleteAlias (NetworkDevices::Name, a); } + if (v != nil) { NetworkInterfaces::DeleteAlias (NetworkInterfaces::Name, a); } }); } } Modified: trunk/network/src/modem/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modem/complex.ycp?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/src/modem/complex.ycp (original) +++ trunk/network/src/modem/complex.ycp Tue Jan 8 18:49:13 2008 @@ -16,7 +16,7 @@ import "Label"; import "Mode"; import "Modem"; -import "NetworkDevices"; +import "NetworkInterfaces"; import "NetworkService"; import "Popup"; import "Provider"; @@ -266,7 +266,7 @@ string dev = WizardHW::SelectedItem (); /* Check if the provider is not used (#17497) */ - if(NetworkDevices::LocateProvider(dev)) { + if(NetworkInterfaces::LocateProvider(dev)) { y2debug("Provider used: %1", dev); /* Popup text */ Modified: trunk/network/src/modules/DNS.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/DNS.ycp?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/src/modules/DNS.ycp (original) +++ trunk/network/src/modules/DNS.ycp Tue Jan 8 18:49:13 2008 @@ -20,7 +20,7 @@ import "Hostname"; import "IP"; import "NetworkConfig"; -import "NetworkDevices"; +import "NetworkInterfaces"; import "Progress"; import "Service"; @@ -381,7 +381,7 @@ import "Summary"; string summary = ""; - boolean has_dhcp = size (NetworkDevices::Locate ("BOOTPROTO", "dhcp")) > 0; + boolean has_dhcp = size (NetworkInterfaces::Locate ("BOOTPROTO", "dhcp")) > 0; if (has_dhcp && NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"]:false) /* Summary text */ @@ -426,10 +426,10 @@ */ global define boolean IsHostLocal (string check_host) { Read (); - NetworkDevices::Read (); + NetworkInterfaces::Read (); map dhcp_data = $[]; - if ( (size( NetworkDevices::Locate("BOOTPROTO", "dhcp") ) > 0) || + if ( (size( NetworkInterfaces::Locate("BOOTPROTO", "dhcp") ) > 0) || NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"]:false == true ) { dhcp_data = GetDHCPHostnameIP(); y2milestone("Got DHCP-configured data: %1", dhcp_data); @@ -450,7 +450,7 @@ // IPv4 address if (IP::Check4 (check_host)) { - if ( (size (NetworkDevices::Locate ("IPADDR", check_host)) > 0) + if ( (size (NetworkInterfaces::Locate ("IPADDR", check_host)) > 0) || dhcp_data["ip"]:"" == check_host) return true; } Modified: trunk/network/src/modules/DSL.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/DSL.ycp?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/src/modules/DSL.ycp (original) +++ trunk/network/src/modules/DSL.ycp Tue Jan 8 18:49:13 2008 @@ -18,7 +18,7 @@ import "Confirm"; import "NetHwDetection"; import "Lan"; -import "NetworkDevices"; +import "NetworkInterfaces"; import "NetworkService"; import "Provider"; import "Progress"; @@ -172,7 +172,7 @@ if(Abort()) return false; /* Progress step 2/5 */ ProgressNextStage(_("Reading current configuration...")); - NetworkDevices::Read(); + NetworkInterfaces::Read(); NetworkService::Read (); sleep(sl); @@ -261,7 +261,7 @@ if(Abort()) return false; /* Progress step 1/7 */ ProgressNextStage(_("Writing configuration...")); - NetworkDevices::Write("dsl"); + NetworkInterfaces::Write("dsl"); sleep(sl); if(Abort()) return false; @@ -339,15 +339,15 @@ /* dev=="" -> Add */ if(dev == "") { type = "dsl"; - device = NetworkDevices::GetFreeDevice(type); + device = NetworkInterfaces::GetFreeDevice(type); } /* dev!="" -> Edit */ else { - string typ = NetworkDevices::device_type(dev); - string num = NetworkDevices::device_num(dev); + string typ = NetworkInterfaces::device_type(dev); + string num = NetworkInterfaces::device_num(dev); - NetworkDevices::Edit(dev); - devmap = NetworkDevices::Current; + NetworkInterfaces::Edit(dev); + devmap = NetworkInterfaces::Current; type = typ; device = num; @@ -398,7 +398,7 @@ global define boolean Add() { operation = nil; if(Select("") != true) return false; - NetworkDevices::Add(); + NetworkInterfaces::Add(); operation = `add; return true; } @@ -411,7 +411,7 @@ global define boolean Edit(string name) { operation = nil; if(Select(name) != true) return false; - NetworkDevices::Edit(name); + NetworkInterfaces::Edit(name); operation = `edit; return true; } @@ -424,7 +424,7 @@ global define boolean Delete(string name) { operation = nil; if(Select(name) != true) return false; - NetworkDevices::Delete(name); + NetworkInterfaces::Delete(name); operation = `delete; return true; } @@ -452,12 +452,12 @@ newdev["VPIVCI"] = vpivci; newdev["MODEM_IP"] = modemip; - NetworkDevices::Name = NetworkDevices::device_name(type, device); - NetworkDevices::Current = newdev; - NetworkDevices::Commit(); + NetworkInterfaces::Name = NetworkInterfaces::device_name(type, device); + NetworkInterfaces::Current = newdev; + NetworkInterfaces::Commit(); } else if(operation == `delete) { - NetworkDevices::Commit(); + NetworkInterfaces::Commit(); } else { y2error("Unknown operation: %1", operation); @@ -498,7 +498,7 @@ * @return true on success */ global define boolean Import(map settings) { - NetworkDevices::Import("dsl", settings["devices"]:$[]); + NetworkInterfaces::Import("dsl", settings["devices"]:$[]); Provider::Import("dsl", settings["providers"]:$[]); return true; } @@ -509,7 +509,7 @@ */ global define map Export() { return $[ - "devices" : NetworkDevices::Export("dsl"), + "devices" : NetworkInterfaces::Export("dsl"), "providers" : Provider::Export("dsl"), ]; } @@ -576,7 +576,7 @@ } global list<string> Packages() { - if(size(NetworkDevices::List("dsl")) < 1) return []; + if(size(NetworkInterfaces::List("dsl")) < 1) return []; return ["smpppd", "ppp", "pptp", "linux-atm-lib"]; } @@ -586,7 +586,7 @@ * @return true if yes */ global define boolean UsesDevice(string device) { - return size(NetworkDevices::Locate("DEVICE", device)) > 0; + return size(NetworkInterfaces::Locate("DEVICE", device)) > 0; } /** Modified: trunk/network/src/modules/ISDN.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/ISDN.ycp?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/src/modules/ISDN.ycp (original) +++ trunk/network/src/modules/ISDN.ycp Tue Jan 8 18:49:13 2008 @@ -16,7 +16,7 @@ module "ISDN"; textdomain "network"; -import "NetworkDevices"; +import "NetworkInterfaces"; import "NetworkService"; import "Provider"; import "Progress"; @@ -743,8 +743,8 @@ * @return true if cfg-<dev> was found */ global define boolean Edit(string dev) ``{ - string typ = NetworkDevices::device_type(dev); - string num = NetworkDevices::device_num(dev); + string typ = NetworkInterfaces::device_type(dev); + string num = NetworkInterfaces::device_num(dev); map typemap = Devices[typ]:$[]; if(!haskey(typemap, num)) { @@ -770,8 +770,8 @@ */ global define boolean Delete(string item) ``{ operation = nil; - string typ = NetworkDevices::device_type(item); - string num = NetworkDevices::device_num(item); + string typ = NetworkInterfaces::device_type(item); + string num = NetworkInterfaces::device_num(item); map typemap = Devices[typ]:$[]; if(!haskey(typemap, num)) { @@ -810,8 +810,8 @@ * @return true if cfg-<item> was found */ global define boolean SelIf(string item) ``{ - string typ = NetworkDevices::device_type(item); - string num = NetworkDevices::device_num(item); + string typ = NetworkInterfaces::device_type(item); + string num = NetworkInterfaces::device_num(item); map typemap = Devices[typ]:$[]; if(!haskey(typemap, num)) { Modified: trunk/network/src/modules/InternetDevices.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/InternetDevices.ycp?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/src/modules/InternetDevices.ycp (original) +++ trunk/network/src/modules/InternetDevices.ycp Tue Jan 8 18:49:13 2008 @@ -13,7 +13,7 @@ module "InternetDevices"; import "Internet"; -import "NetworkDevices"; +import "NetworkInterfaces"; /** * Reset values. @@ -35,9 +35,9 @@ */ global define void SetDevice(string dev){ Internet::device=dev; - NetworkDevices::Select(Internet::device); - Internet::type = NetworkDevices::FastestType(Internet::device); - Internet::provider = NetworkDevices::Current["PROVIDER"]:""; + NetworkInterfaces::Select(Internet::device); + Internet::type = NetworkInterfaces::FastestType(Internet::device); + Internet::provider = NetworkInterfaces::Current["PROVIDER"]:""; if (Internet::provider != "") { import "Provider"; @@ -66,8 +66,8 @@ Reset(); - NetworkDevices::Read(); - Internet::device = NetworkDevices::Fastest(); + NetworkInterfaces::Read(); + Internet::device = NetworkInterfaces::Fastest(); if ((string)SCR::Read(.sysconfig.network.config.NETWORKMANAGER)=="yes" && Internet::device == "") { Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Tue Jan 8 18:49:13 2008 @@ -24,7 +24,7 @@ import "Map"; import "Mode"; import "NetworkConfig"; -import "NetworkDevices"; +import "NetworkInterfaces"; import "NetworkService"; import "NetworkStorage"; import "Package"; @@ -122,10 +122,10 @@ }); y2milestone("link_status %1", link_status); - map configurations = NetworkDevices::FilterDevices("netcard"); - foreach(string devtype, splitstring(NetworkDevices::CardRegex["netcard"]:"", "|"), { + map configurations = NetworkInterfaces::FilterDevices("netcard"); + foreach(string devtype, splitstring(NetworkInterfaces::CardRegex["netcard"]:"", "|"), { foreach(string devnum, (list<string>) Map::Keys(configurations[devtype]:$[]), { - string confname = NetworkDevices::device_name(devtype, devnum); + string confname = NetworkInterfaces::device_name(devtype, devnum); string mac = ((map)SCR::Execute(.target.bash_output, sformat("cat /sys/class/net/%1/address|tr -d '\n'", confname)))["stdout"]:""; y2milestone("confname %1", mac); if (!haskey(link_status, mac)) y2error("Mac address %1 not found in map %2!", mac, link_status); @@ -224,7 +224,7 @@ if(Abort()) return false; /* Progress step 2/9 */ ProgressNextStage(_("Detecting network devices...")); - // FIXME: MOD // ReadModules(NetworkDevices::CardRegex["netcard"]:""); + // FIXME: MOD // ReadModules(NetworkInterfaces::CardRegex["netcard"]:""); // Dont read hardware data in config mode if(!Mode::config ()) { if(!NetHwDetection::running) NetHwDetection::Start(); @@ -380,7 +380,7 @@ /* Progress step 3 - multiple devices may be present, really plural*/ ProgressNextStage(_("Writing device configuration...")); LanItems::WriteUdevRules(); - NetworkDevices::Write("netcard"); + NetworkInterfaces::Write("netcard"); // WriteDevices(); sleep(sl); @@ -485,11 +485,11 @@ if (!Mode::autoinst()) { // FIXME: MOD Modules = (map) eval(settings["modules"]:$[]); - NetworkDevices::Import("netcard", (map) settings["devices"]:$[]); + NetworkInterfaces::Import("netcard", (map) settings["devices"]:$[]); } else { - NetworkDevices::Import("netcard", (map) settings["devices"]:$[]); - foreach(string device, NetworkDevices::List(""), { + NetworkInterfaces::Import("netcard", (map) settings["devices"]:$[]); + foreach(string device, NetworkInterfaces::List(""), { LanItems::AddNew(); LanItems::Items[LanItems::current]=$["ifcfg":device]; }); @@ -516,7 +516,7 @@ "dns" : DNS::Export(), // FIXME: MOD "modules" : Modules, "config" : NetworkConfig::Export(), - "devices" : NetworkDevices::Export("netcard"), + "devices" : NetworkInterfaces::Export("netcard"), // "hwcfg" : NetworkModules::Export("netcard"), "routing" : Routing::Export(), "managed" : NetworkService::IsManaged (), @@ -610,7 +610,7 @@ global define boolean Add() { // LanItems::operation = nil; if(LanItems::Select("") != true) return false; - NetworkDevices::Add(); + NetworkInterfaces::Add(); // LanItems::AddNew(); return true; } @@ -623,9 +623,9 @@ global define boolean Edit(string name) { LanItems::operation = nil; if(LanItems::Select(name) != true) return false; - NetworkDevices::Edit(name); + NetworkInterfaces::Edit(name); LanItems::operation = `edit; - LanItems::interfacename = NetworkDevices::Name; + LanItems::interfacename = NetworkInterfaces::Name; return true; } /** @@ -638,7 +638,7 @@ /* operation = nil; if(Select(name) != true) return false; - NetworkDevices::Delete(name); + NetworkInterfaces::Delete(name); operation = `delete; */ return true; @@ -826,7 +826,7 @@ type = InstallInf["type"]:"eth"; - device = NetworkDevices::GetFreeDevice(type); + device = NetworkInterfaces::GetFreeDevice(type); } else { @@ -958,7 +958,7 @@ * @return true if something was proposed */ global define boolean Propose() { -NetworkDevices::CleanCacheRead(); +NetworkInterfaces::CleanCacheRead(); LanItems::Read(); return ProposeInterfaces () && @@ -980,7 +980,7 @@ foreach(map interface, LanItems::autoinstall_settings["interfaces"]:[], ``{ - list<string> devs = NetworkDevices::List("netcard"); + list<string> devs = NetworkInterfaces::List("netcard"); y2milestone("devs: %1", devs); tosel = nil; @@ -1016,7 +1016,7 @@ NetworkModules::Options = InstallInf["options"]:""; // type = InstallInf["type"]:"eth"; - device = NetworkDevices::GetFreeDevice(type); + device = NetworkInterfaces::GetFreeDevice(type); } */ else { @@ -1084,7 +1084,7 @@ * @return true if any DHCP device is configured */ global define boolean AnyDHCPDevice() { - return size(union(NetworkDevices::Locate("BOOTPROTO", "dhcp"), NetworkDevices::Locate("BOOTPROTO", "dhcp+autoip"))) > 0; + return size(union(NetworkInterfaces::Locate("BOOTPROTO", "dhcp"), NetworkInterfaces::Locate("BOOTPROTO", "dhcp+autoip"))) > 0; } @@ -1102,31 +1102,31 @@ list<string> pkgs = []; // #299033 - don't install smpppd now, do it later (with some tests) /* - if (NetworkDevices::Locate ("USERCONTROL", "yes") != []) + if (NetworkInterfaces::Locate ("USERCONTROL", "yes") != []) { if (!PackageSystem::Installed("smpppd")) pkgs = add (pkgs, "smpppd"); } */ - if (NetworkDevices::Locate ("STARTMODE", "ifplugd") != []) + if (NetworkInterfaces::Locate ("STARTMODE", "ifplugd") != []) { if (!PackageSystem::Installed("ifplugd")) pkgs = add (pkgs, "ifplugd"); } // #suse49880 - if (NetworkDevices::List ("wlan") != []) + if (NetworkInterfaces::List ("wlan") != []) { if (!PackageSystem::Installed("wireless-tools")) pkgs = add (pkgs, "wireless-tools"); } - if (NetworkDevices::List ("vlan") != []) + if (NetworkInterfaces::List ("vlan") != []) { if (!PackageSystem::Installed("vlan")) pkgs = add (pkgs, "vlan"); } - if (NetworkDevices::List ("br") != []) + if (NetworkInterfaces::List ("br") != []) { if (!PackageSystem::Installed("bridge-utils")) pkgs = add (pkgs, "bridge-utils"); } // #47809 - if (NetworkDevices::Locate ("WIRELESS_AUTH_MODE", "psk") != [] || - NetworkDevices::Locate ("WIRELESS_AUTH_MODE", "eap") != []) + if (NetworkInterfaces::Locate ("WIRELESS_AUTH_MODE", "psk") != [] || + NetworkInterfaces::Locate ("WIRELESS_AUTH_MODE", "eap") != []) { if (!PackageSystem::Installed("wpa_supplicant")) pkgs = add (pkgs, "wpa_supplicant"); } Modified: trunk/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/src/modules/LanItems.ycp (original) +++ trunk/network/src/modules/LanItems.ycp Tue Jan 8 18:49:13 2008 @@ -3,7 +3,7 @@ module "LanItems"; textdomain "network"; -import "NetworkDevices"; +import "NetworkInterfaces"; import "ProductFeatures"; import "NetworkConfig"; import "NetworkStorage"; @@ -68,7 +68,7 @@ global string wl_essid = ""; global string wl_nwid = ""; global string wl_auth_mode = ""; -// when adding another key, don't forget the chmod 600 in NetworkDevices +// when adding another key, don't forget the chmod 600 in NetworkInterfaces global string wl_wpa_psk = ""; global string wl_key_length = ""; global list<string> wl_key = []; @@ -278,15 +278,16 @@ return mods; } -// get list of all configurations for "netcard" macro in NetworkDevices module -list<string> getNetworkDevices(){ +// get list of all configurations for "netcard" macro in NetworkInterfaces module +list<string> getNetworkInterfaces(){ list<string> confs=[]; - map configurations = NetworkDevices::FilterDevices("netcard"); - foreach(string devtype, splitstring(NetworkDevices::CardRegex["netcard"]:"", "|"), { - foreach(string devnum, (list<string>) Map::Keys(configurations[devtype]:$[]), { - confs = add(confs, NetworkDevices::device_name(devtype, devnum)); - }); - }); + map configurations = NetworkInterfaces::FilterDevices("netcard"); + foreach(string devtype, splitstring(NetworkInterfaces::CardRegex["netcard"]:"", "|"), { + foreach(string file, (list<string>) Map::Keys(configurations[devtype]:$[]), { + confs = add(confs, file); + }); + }); +y2internal("confs %1", confs); return confs; } @@ -305,11 +306,11 @@ global void Read(){ ReadHw(); - NetworkDevices::Read(); - NetworkDevices::CleanHotplugSymlink(); + NetworkInterfaces::Read(); + NetworkInterfaces::CleanHotplugSymlink(); // match configurations to Items list with hwinfo - foreach(string confname, getNetworkDevices(), { + foreach(string confname, getNetworkInterfaces(), { integer pos = nil; map val = $[]; foreach(integer key, map value, (map >)Items, { @@ -326,7 +327,7 @@ }); // add to Items also virtual devices (configurations) without hwinfo - foreach(string confname, getNetworkDevices(), { + foreach(string confname, getNetworkInterfaces(), { boolean already = false; foreach(integer key, (list<integer>)Map::Keys(Items), { if (confname == Items[key, "ifcfg"]:""){ @@ -383,33 +384,33 @@ list <string> bullets = []; if (hasAnyValue(Items[key, "ifcfg"]:"") ){ - NetworkDevices::Select(Items[key, "ifcfg"]:""); - if (!hasAnyValue(type)) type = NetworkDevices::device_type(Items[key, "ifcfg"]:""); - descr = BuildDescription(type, NetworkDevices::device_type(Items[key, "ifcfg"]:""), NetworkDevices::Current, [Items[key, "hwinfo"]:$[]]); - string dev = NetworkDevices::Name; //NetworkDevices::device_name(type, NetworkDevices::Name); - ip = DeviceProtocol(NetworkDevices::Current); - string status = DeviceStatus(type, NetworkDevices::device_num(NetworkDevices::Name), NetworkDevices::Current); + NetworkInterfaces::Select(Items[key, "ifcfg"]:""); + if (!hasAnyValue(type)) type = NetworkInterfaces::GetType(Items[key, "ifcfg"]:""); + descr = BuildDescription(type, NetworkInterfaces::GetType(Items[key, "ifcfg"]:""), NetworkInterfaces::Current, [Items[key, "hwinfo"]:$[]]); + string dev = NetworkInterfaces::Name; //NetworkInterfaces::device_name(type, NetworkInterfaces::Name); + ip = DeviceProtocol(NetworkInterfaces::Current); + string status = DeviceStatus(type, NetworkInterfaces::device_num(NetworkInterfaces::Name), NetworkInterfaces::Current); - string startmode_descr = startmode_descrs[NetworkDevices::Current["STARTMODE"]:""]:_("Started manually"); + string startmode_descr = startmode_descrs[NetworkInterfaces::Current["STARTMODE"]:""]:_("Started manually"); bullets = [ sformat(_("Device Name: %1"), dev), startmode_descr, ]; - if (NetworkDevices::Current["STARTMODE"]:"" != "managed") + if (NetworkInterfaces::Current["STARTMODE"]:"" != "managed") { if (ip != "NONE") { bullets = bullets + [ ip == "DHCP" ? _("IP address assigned using DHCP") : sformat(_("IP address: %1, subnet mask %2") - , ip, NetworkDevices::Current["NETMASK"]:""), + , ip, NetworkInterfaces::Current["NETMASK"]:""), ]; } // build aliases overview - if (size(NetworkDevices::Current["_aliases"]:$[])>0 && !NetworkService::IsManaged()){ - foreach(string key, map desc, (map >) NetworkDevices::Current["_aliases"]:$[], { + if (size(NetworkInterfaces::Current["_aliases"]:$[])>0 && !NetworkService::IsManaged()){ + foreach(string key, map desc, (map >) NetworkInterfaces::Current["_aliases"]:$[], { string parameters = sformat(_("IP address: %1, subnet mask %2"), desc["IPADDR"]:"", desc["NETMASK"]:""); bullets = add(bullets, sformat("%1 (%2)", key, parameters) ); }); @@ -430,8 +431,8 @@ */ } if (type == "wlan" && - !(NetworkDevices::Current["WIRELESS_AUTH_MODE"]:"" != "open") && - !hasAnyValue(NetworkDevices::Current["WIRELESS_KEY_0"]:"")) + !(NetworkInterfaces::Current["WIRELESS_AUTH_MODE"]:"" != "open") && + !hasAnyValue(NetworkInterfaces::Current["WIRELESS_KEY_0"]:"")) { // avoid colons dev = mergestring (splitstring (dev, ":"), "/"); @@ -512,7 +513,7 @@ * @return true if there are some aliases */ global define boolean InterfaceHasAliases() { - return NetworkDevices::HasAliases(Items[current, "ifcfg"]:""); + return NetworkInterfaces::HasAliases(Items[current, "ifcfg"]:""); } /** @@ -603,7 +604,7 @@ * @return list of 10 free devices */ global define list FreeDevices(string type) { - return NetworkDevices::GetFreeDevices(type, 10); + return NetworkInterfaces::GetFreeDevices(type, 10); } /** @@ -616,7 +617,7 @@ // FIXME: NI y2debug("Devices=%1", Devices); map Devices_1 = $[]; // FIXME: NI Devices[type, sformat("%1",num)]:$[]; y2debug("Devices=%1", Devices_1); - return NetworkDevices::GetFreeDevices("_aliases", 10); + return NetworkInterfaces::GetFreeDevices("_aliases", 10); } @@ -847,16 +848,16 @@ type = Items[current, "hwinfo", "type"]:"eth"; // type = "eth0"; - device = NetworkDevices::GetFreeDevice(type); + device = NetworkInterfaces::GetFreeDevice(type); // FIXME: MOD AddModule(type); // NetworkModules::AddM(); // nm_name = NetworkModules::GetFreeName("static-"); // TODO: instead of udev use hwinfo dev_name - NetworkDevices::Name = GetItemUdev()[1]:""; - if (size(Items)0)) Items = remove(Items, current); else{ if (haskey(Items[current]:$[], "ifcfg")) - if (!contains(getNetworkDevices(), getCurrentItem()["ifcfg"]:"")) + if (!contains(getNetworkInterfaces(), getCurrentItem()["ifcfg"]:"")) Items[current]=remove(Items[current]:$[], "ifcfg"); } }; @@ -1196,7 +1197,7 @@ // device that got already matched boolean matched_by_module = false; - list<string> devs = NetworkDevices::List("netcard"); + list<string> devs = NetworkInterfaces::List("netcard"); y2milestone("Configured devices: %1", devs ); // this condition is always true for SLES9, HEAD uses $[] for proposal @@ -1264,9 +1265,9 @@ foreach (map h, LanItems::Hardware, { y2milestone("Checking for device=%1", h); SelectHWMap(h); - string _device_name = NetworkDevices::device_name(NetworkDevices::RealType(type, hotplug), device); - if (!NetworkDevices::Check(_device_name) && - type == NetworkDevices::device_type(interface["device"]:"") + string _device_name = NetworkInterfaces::device_name(NetworkInterfaces::RealType(type, hotplug), device); + if (!NetworkInterfaces::Check(_device_name) && + type == NetworkInterfaces::GetType(interface["device"]:"") ) { y2milestone("Selected: %1", h ); @@ -1347,8 +1348,8 @@ string hwcfg = Items[current, "hwcfg"]:""; if (hasAnyValue(ifcfg)) { - NetworkDevices::Delete(ifcfg); - NetworkDevices::Commit(); + NetworkInterfaces::Delete(ifcfg); + NetworkInterfaces::Commit(); Items[current, "ifcfg"] = ""; } /* @@ -1374,12 +1375,12 @@ global void SetItem(){ operation = `edit; interfacename = getCurrentItem()["ifcfg"]:""; - NetworkDevices::Edit(getCurrentItem()["ifcfg"]:""); - map devmap = NetworkDevices::Current; + NetworkInterfaces::Edit(getCurrentItem()["ifcfg"]:""); + map devmap = NetworkInterfaces::Current; type = Items[current, "hwinfo", "type"]:""; - if (!hasAnyValue(type)) type = NetworkDevices::device_type(getCurrentItem()["ifcfg"]:""); - device = NetworkDevices::device_num(getCurrentItem()["ifcfg"]:""); - alias = NetworkDevices::alias_num(getCurrentItem()["ifcfg"]:""); + if (!hasAnyValue(type)) type = NetworkInterfaces::GetType(getCurrentItem()["ifcfg"]:""); + device = NetworkInterfaces::device_num(getCurrentItem()["ifcfg"]:""); + alias = NetworkInterfaces::alias_num(getCurrentItem()["ifcfg"]:""); // nm_name = Items[current, "hwcfg"]:""; // if (nm_name=="") nm_name_old = createHwcfgName(Items[current, "hwinfo"]:$[], type); // NetworkModules::SelectM(nm_name); @@ -1446,7 +1447,7 @@ startmode = "nfsroot"; y2milestone ("startmode nfsroot"); } - NetworkDevices::Add(); + NetworkInterfaces::Add(); operation = `edit; // interfacename=getCurrentItem()["hwinfo", "dev_name"]:""; Items[current, "ifcfg"]=getCurrentItem()["hwinfo", "dev_name"]:""; Modified: trunk/network/src/modules/Modem.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Modem.ycp?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/src/modules/Modem.ycp (original) +++ trunk/network/src/modules/Modem.ycp Tue Jan 8 18:49:13 2008 @@ -15,7 +15,7 @@ module "Modem"; textdomain "network"; -import "NetworkDevices"; +import "NetworkInterfaces"; import "NetworkService"; import "Provider"; import "Progress"; @@ -141,7 +141,7 @@ if(Abort()) return false; /* Progress step 2/4 */ ProgressNextStage(_("Reading current configuration...")); - NetworkDevices::Read(); + NetworkInterfaces::Read(); NetworkService::Read (); sleep(sl); @@ -213,8 +213,8 @@ if(Abort()) return false; /* Progress step 1/6 */ ProgressNextStage(_("Writing configuration...")); - NetworkDevices::Write("modem"); - NetworkDevices::UpdateModemSymlink(); + NetworkInterfaces::Write("modem"); + NetworkInterfaces::UpdateModemSymlink(); sleep(sl); if(Abort()) return false; @@ -304,15 +304,15 @@ /* dev=="" -> Add */ if(dev == "") { type = "modem"; - device = NetworkDevices::GetFreeDevice(type); + device = NetworkInterfaces::GetFreeDevice(type); } /* dev!="" -> Edit */ else { - string typ = NetworkDevices::device_type(dev); - string num = NetworkDevices::device_num(dev); + string typ = NetworkInterfaces::device_type(dev); + string num = NetworkInterfaces::device_num(dev); - NetworkDevices::Edit(dev); - devmap = NetworkDevices::Current; + NetworkInterfaces::Edit(dev); + devmap = NetworkInterfaces::Current; type = typ; device = num; @@ -355,7 +355,7 @@ global define boolean Add() { operation = nil; if(Select("") != true) return false; - NetworkDevices::Add(); + NetworkInterfaces::Add(); operation = `add; return true; } @@ -368,7 +368,7 @@ global define boolean Edit(string name) { operation = nil; if(Select(name) != true) return false; - NetworkDevices::Edit(name); + NetworkInterfaces::Edit(name); operation = `edit; return true; } @@ -382,7 +382,7 @@ global define boolean Delete(string name) { operation = nil; if(Select(name) != true) return false; - NetworkDevices::Delete(name); + NetworkInterfaces::Delete(name); operation = `delete; return true; } @@ -415,12 +415,12 @@ "PPPD_OPTIONS" : PPPDoptions, ]; - NetworkDevices::Name = NetworkDevices::device_name(type, device); - NetworkDevices::Current = newdev; - NetworkDevices::Commit(); + NetworkInterfaces::Name = NetworkInterfaces::device_name(type, device); + NetworkInterfaces::Current = newdev; + NetworkInterfaces::Commit(); } else if(operation == `delete) { - NetworkDevices::Commit(); + NetworkInterfaces::Commit(); } else { y2error("Unknown operation: %1", operation); @@ -438,7 +438,7 @@ * @return true on success */ global define boolean Import(map settings) { - NetworkDevices::Import("modem", settings["devices"]:$[]); + NetworkInterfaces::Import("modem", settings["devices"]:$[]); Provider::Import("modem", settings["providers"]:$[]); return true; } @@ -449,7 +449,7 @@ */ global define map Export() { return $[ - "devices" : NetworkDevices::Export("modem"), + "devices" : NetworkInterfaces::Export("modem"), "providers" : Provider::Export("modem"), ]; } @@ -500,7 +500,7 @@ } global list<string> Packages() { - if(size(NetworkDevices::List("modem")) < 1) return []; + if(size(NetworkInterfaces::List("modem")) < 1) return []; return ["smpppd"]; } Modified: trunk/network/src/modules/Routing.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Routing.ycp?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/src/modules/Routing.ycp (original) +++ trunk/network/src/modules/Routing.ycp Tue Jan 8 18:49:13 2008 @@ -16,7 +16,7 @@ textdomain "network"; import "NetHwDetection"; -import "NetworkDevices"; +import "NetworkInterfaces"; import "Map"; include "network/runtime.ycp"; @@ -116,8 +116,8 @@ Orig_Forward = (boolean) eval(Forward); /* read available devices */ - NetworkDevices::Read(); - devices = NetworkDevices::List(""); + NetworkInterfaces::Read(); + devices = NetworkInterfaces::List(""); if(Routes == []) { ReadFromGateway (NetHwDetection::result["GATEWAY"]:""); Modified: trunk/network/src/provider/connection.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/provider/connection.ycp?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/src/provider/connection.ycp (original) +++ trunk/network/src/provider/connection.ycp Tue Jan 8 18:49:13 2008 @@ -15,7 +15,7 @@ import "IP"; import "ISDN"; import "Label"; -import "NetworkDevices"; +import "NetworkInterfaces"; import "Modem"; import "Popup"; import "Provider"; @@ -81,7 +81,7 @@ boolean FirewallChecked = false; if (dtype != "") { - device = NetworkDevices::device_name (dtype, did); + device = NetworkInterfaces::device_name (dtype, did); boolean adding = false; if (type == "modem") Modified: trunk/network/src/routines/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/complex.ycp?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/src/routines/complex.ycp (original) +++ trunk/network/src/routines/complex.ycp Tue Jan 8 18:49:13 2008 @@ -14,7 +14,7 @@ import "NetHwDetection"; import "HTML"; -import "NetworkDevices"; +import "NetworkInterfaces"; import "Popup"; import "String"; import "Summary"; @@ -60,7 +60,7 @@ * @return [ configured, unconfigured ] if split, [ summary, links ] otherwise */ define list<any> BuildSummaryDevs(map Devs, list<map> Hardware, boolean split, boolean link) { - y2milestone("Devs=%1", NetworkDevices::ConcealSecrets (Devs)); + y2milestone("Devs=%1", NetworkInterfaces::ConcealSecrets (Devs)); y2milestone("Hardware=%1", Hardware); y2debug("split=%1", split); @@ -84,7 +84,7 @@ devmap["WIRELESS_AUTH_MODE"]:"" == "open" && devmap["WIRELESS_KEY_0"]:"" == "") { - string dev = NetworkDevices::device_name(devtype, devnum); + string dev = NetworkInterfaces::device_name(devtype, devnum); // avoid colons dev = mergestring (splitstring (dev, ":"), "/"); string href = "lan--wifi-encryption-" + dev; @@ -180,7 +180,7 @@ * @return [ configured, unconfigured ] if split, [ summary, links ] otherwise */ define list<any> BuildSummary(string devregex, list<map> Hardware, boolean split, boolean link) { - map Devs = NetworkDevices::FilterDevices (devregex); + map Devs = NetworkInterfaces::FilterDevices (devregex); list <any> ret = BuildSummaryDevs (Devs, Hardware, split, link); return ret; } @@ -237,7 +237,7 @@ if(haskey(device_names, devtype)) return device_names[devtype]:""; else { - string descr = NetworkDevices::GetDevTypeDescription(devtype, true); + string descr = NetworkInterfaces::GetDevTypeDescription(devtype, true); if (hasAnyValue(descr)) return descr; } @@ -306,7 +306,7 @@ * @return text wth device status */ define string DeviceStatus(string devtype, string devnum, map devmap) { - string dev = NetworkDevices::device_name(devtype, devnum); + string dev = NetworkInterfaces::device_name(devtype, devnum); /* Modem and DSL */ if(devtype == "ppp" || devtype == "modem" || devtype == "dsl") { @@ -456,7 +456,7 @@ maplist(string type, map devmap, Devs, { maplist(string k, map v, (map)devmap, { term item = nil; - string dev = NetworkDevices::device_name(type, k); + string dev = NetworkInterfaces::device_name(type, k); string ip = DeviceProtocol(v); string descr = BuildDescription (type, k, v, Hardware); @@ -474,13 +474,13 @@ sformat(_("Mode: %1"), v["PPPMODE"]:_("Unknown")), startmode_descr, ]); - item = `item(`id(dev), dev, NetworkDevices::GetDevTypeDescription(type, false), ProviderName(v["PROVIDER"]:""), rich); + item = `item(`id(dev), dev, NetworkInterfaces::GetDevTypeDescription(type, false), ProviderName(v["PROVIDER"]:""), rich); } /* ISDN stuff */ else if (type == "contr") { // FIXME: richtext string cname = v["NAME"]:"unknown"; - item = `item(`id(dev), dev, NetworkDevices::GetDevTypeDescription(type, false), cname /*, "active?", ip, "?", "?"*/); + item = `item(`id(dev), dev, NetworkInterfaces::GetDevTypeDescription(type, false), cname /*, "active?", ip, "?", "?"*/); } /* ISDN stuff */ else if (type == "net") { @@ -559,7 +559,7 @@ * @return table items */ define list BuildOverview(string devregex, list<map> Hardware) { - map Devs = NetworkDevices::FilterDevices (devregex); + map Devs = NetworkInterfaces::FilterDevices (devregex); return BuildOverviewDevs (Devs, Hardware); } @@ -588,9 +588,9 @@ case "netcard" : desc = [name, nc]; break; case "modem" : - case "dsl" : desc = [name, NetworkDevices::GetDevTypeDescription (class, false), nc]; + case "dsl" : desc = [name, NetworkInterfaces::GetDevTypeDescription (class, false), nc]; break; - case "isdn" : desc = [nc, NetworkDevices::GetDevTypeDescription (class, false), name]; + case "isdn" : desc = [nc, NetworkInterfaces::GetDevTypeDescription (class, false), name]; break; default : y2warning (1, "invalid class %1", class); } @@ -619,7 +619,7 @@ /** * @param class netcard modem dsl. not isdn because it does not use - * NetworkDevices (#103073) + * NetworkInterfaces (#103073) * @param Hardware the detected hardware * @return [ $[id, table_descr, rich descr] ] */ Modified: trunk/network/src/routines/devices.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/devices.ycp?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/src/routines/devices.ycp (original) +++ trunk/network/src/routines/devices.ycp Tue Jan 8 18:49:13 2008 @@ -18,7 +18,7 @@ textdomain "network"; import "Map"; -import "NetworkDevices"; +import "NetworkInterfaces"; /** * Compute free devices @@ -40,7 +40,7 @@ list<string> ret = []; /* Hotpluggable devices */ - if(NetworkDevices::IsHotplug(type) && !contains(curdevs, "")) { + if(NetworkInterfaces::IsHotplug(type) && !contains(curdevs, "")) { y2debug("Added simple hotplug device"); count = count + 1; ret = add(ret, ""); Modified: trunk/network/src/routines/hardware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/hardware.ycp?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/src/routines/hardware.ycp (original) +++ trunk/network/src/routines/hardware.ycp Tue Jan 8 18:49:13 2008 @@ -109,7 +109,7 @@ y2debug("HOTPLUG(%1) -> ignoring modprobe.conf", hotplug); } - device = GetFreeDevice(NetworkDevices::RealType(type, hotplug)); + device = GetFreeDevice(NetworkInterfaces::RealType(type, hotplug)); } */ Modified: trunk/network/src/routines/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/routines.ycp?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/src/routines/routines.ycp (original) +++ trunk/network/src/routines/routines.ycp Tue Jan 8 18:49:13 2008 @@ -17,7 +17,7 @@ import "String"; import "NetworkService"; import "PackageSystem"; -import "NetworkDevices"; +import "NetworkInterfaces"; import "Arch"; import "Confirm"; import "Map"; @@ -387,7 +387,7 @@ string getIfcName(string devicename){ string ifcfg=""; - string interfacetype = NetworkDevices::device_type( devicename ); + string interfacetype = NetworkInterfaces::device_type( devicename ); // for special s390 interface types write static configuration if (contains(["qeth", "hsi", "ctc", "lcs", "iucv"], interfacetype)){ y2internal("special device type %1", interfacetype); Modified: trunk/network/src/routines/runtime.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/runtime.ycp?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/src/routines/runtime.ycp (original) +++ trunk/network/src/routines/runtime.ycp Tue Jan 8 18:49:13 2008 @@ -13,7 +13,7 @@ import "Desktop"; import "ISDN"; import "Mode"; -import "NetworkDevices"; +import "NetworkInterfaces"; import "Package"; import "Service"; import "PackageSystem"; @@ -66,7 +66,7 @@ * @return true/false */ boolean HaveDialupLikeInterfaces () { - list <string> devs = NetworkDevices::Locate ("USERCONTROL", "yes"); + list <string> devs = NetworkInterfaces::Locate ("USERCONTROL", "yes"); y2milestone ("user controlled interfaces: %1", devs); if (devs != []) { Modified: trunk/network/src/routines/summary.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/summary.ycp?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/src/routines/summary.ycp (original) +++ trunk/network/src/routines/summary.ycp Tue Jan 8 18:49:13 2008 @@ -16,7 +16,7 @@ textdomain "network"; import "String"; -import "NetworkDevices"; +import "NetworkInterfaces"; /** * Create list of Table items @@ -26,7 +26,7 @@ */ define list<term> BuildTypesList(list<string> types, string cur) { return maplist(string t, types, { - return `item(`id(t), NetworkDevices::GetDevTypeDescription(t, false), t == cur); + return `item(`id(t), NetworkInterfaces::GetDevTypeDescription(t, false), t == cur); }); } Modified: trunk/network/src/routines/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/widgets.ycp?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/src/routines/widgets.ycp (original) +++ trunk/network/src/routines/widgets.ycp Tue Jan 8 18:49:13 2008 @@ -17,7 +17,7 @@ import "IP"; import "NetworkPopup"; -import "NetworkDevices"; +import "NetworkInterfaces"; /** * Validator for IP adresses, no_popup @@ -90,7 +90,7 @@ */ map > startmode_items = $[ // onboot, on and boot are aliases for auto - // See NetworkDevices::CanonicalizeStartmode + // See NetworkInterfaces::CanonicalizeStartmode "auto": $[ // Combo box option for Device Activation "label": _("At Boot Time"), @@ -184,7 +184,7 @@ define string GetDeviceDescription(string device_id) { - string device_name = NetworkDevices::GetValue(device_id,"NAME"); + string device_name = NetworkInterfaces::GetValue(device_id,"NAME"); if ( (device_name == nil) || (device_name == "") ) { //TRANSLATORS: Informs that device name is not known device_name = _("Unknown device"); @@ -194,37 +194,37 @@ //if (size(device_name) > 30) { // device_name = substring (device_name, 0, 27) + "..."; //} - string ip_addr = (NetworkDevices::GetValue(device_id, "BOOTPROTO") == "dhcp" ? + string ip_addr = (NetworkInterfaces::GetValue(device_id, "BOOTPROTO") == "dhcp" ? // TRANSLATORS: Part of label, device with IP address assigned by DHCP _("DHCP address") : // TRANSLATORS: Part of label, device with static IP address - NetworkDevices::GetValue(device_id, "IPADDR")); + NetworkInterfaces::GetValue(device_id, "IPADDR")); if ( (ip_addr == nil) || (ip_addr == "")) { //TRANSLATORS: Informs that no IP has been assigned to the device ip_addr = _("No IP address assigned"); } string output = sformat(_("%1 \n%2 - %3"), - device_name, NetworkDevices::GetDeviceType(device_id), ip_addr); + device_name, NetworkInterfaces::GetDeviceType(device_id), ip_addr); return output; } list<string> getEthernetItems(){ - NetworkDevices::Read(); - list<string> items = NetworkDevices::List("eth"); + NetworkInterfaces::Read(); + list<string> items = NetworkInterfaces::List("eth"); items = filter (string i, items, ``( i != "lo" )); return items; } list<string> getNetDeviceItems(){ - NetworkDevices::Read(); - list<string> ifaces = NetworkDevices::List("eth"); + NetworkInterfaces::Read(); + list<string> ifaces = NetworkInterfaces::List("eth"); y2debug("ifaces=%1", ifaces); - ifaces = (list<string>)union((list)ifaces, (NetworkDevices::List("eth-pcmcia"))); + ifaces = (list<string>)union((list)ifaces, (NetworkInterfaces::List("eth-pcmcia"))); y2debug("ifaces=%1", ifaces); - ifaces = (list<string>)union((list)ifaces, NetworkDevices::List("eth-usb")); - ifaces = (list<string>)union((list)ifaces, NetworkDevices::List("wlan")); // #186102 + ifaces = (list<string>)union((list)ifaces, NetworkInterfaces::List("eth-usb")); + ifaces = (list<string>)union((list)ifaces, NetworkInterfaces::List("wlan")); // #186102 y2debug("ifaces=%1", ifaces); return ifaces; } Modified: trunk/network/yast2-network.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/yast2-network.spec.in?rev=43483&r1=43482&r2=43483&view=diff ============================================================================== --- trunk/network/yast2-network.spec.in (original) +++ trunk/network/yast2-network.spec.in Tue Jan 8 18:49:13 2008 @@ -13,7 +13,7 @@ # Linuxrc::display_ip # SuSEFirewall::IsInstalled # NetworkDevices::GetDevTypeDescription -Requires: yast2 >= 2.16.18 +Requires: yast2 >= 2.16.20 Requires: sysconfig yast2-packager #GetLanguageCountry -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org