Author: mvidner
Date: Fri Jul 22 16:51:53 2011
New Revision: 64960
URL: http://svn.opensuse.org/viewcvs/yast?rev=64960&view=rev
Log:
Merged fixes from SLE11-SP2:
- FCoE detection in NetworkStorage::isDiskOnNetwork (bnc#677251,
FATE#306855).
- Added NetworkInterfaces::GetTypeFromIfcfg which knows
ETHERDEVICE=>vlan (FATE#311380).
They are these SVN changes:
-c-63066
-c63841 (a reverting one)
-c64230
-r64451:64456
Added:
trunk/yast2/library/network/testsuite/tests/NetworkStorage.err
- copied unchanged from r64456, branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkStorage.err
trunk/yast2/library/network/testsuite/tests/NetworkStorage.out
- copied unchanged from r64456, branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkStorage.out
trunk/yast2/library/network/testsuite/tests/NetworkStorage.ycp
- copied unchanged from r64456, branches/SuSE-Code-11-SP2-Branch/yast2/library/network/testsuite/tests/NetworkStorage.ycp
Modified:
trunk/yast2/ (props changed)
trunk/yast2/VERSION
trunk/yast2/library/network/src/NetworkInterfaces.ycp
trunk/yast2/library/network/src/NetworkStorage.ycp
trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.out
trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.ycp
trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.out
trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.ycp
trunk/yast2/package/yast2.changes
Modified: trunk/yast2/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=64960&r1=64959&r2=64960&view=diff
==============================================================================
--- trunk/yast2/VERSION (original)
+++ trunk/yast2/VERSION Fri Jul 22 16:51:53 2011
@@ -1 +1 @@
-2.21.5
+2.21.6
Modified: trunk/yast2/library/network/src/NetworkInterfaces.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/NetworkInterfaces.ycp?rev=64960&r1=64959&r2=64960&view=diff
==============================================================================
--- trunk/yast2/library/network/src/NetworkInterfaces.ycp (original)
+++ trunk/yast2/library/network/src/NetworkInterfaces.ycp Fri Jul 22 16:51:53 2011
@@ -180,18 +180,46 @@
return ifcfg_part (dev, "1");
}
+list<string> TypeByKeyValue = [
+ "INTERFACETYPE",
+ "TUNNEL",
+ ];
+list TypeByKeyExistence = [
+ ["ETHERDEVICE", "vlan"],
+ ];
+
+/**
+ *
+ */
+global string GetTypeFromIfcfg(ifcfg_t ifcfg) {
+ string type = nil; // unknown
+ foreach(list<string> key_type, TypeByKeyExistence, {
+ string rule_key = key_type[0]:"";
+ string rule_type = key_type[1]:"";
+ if (ifcfg[rule_key]:"" != "") {
+ type = rule_type;
+ }
+ });
+ foreach(string rule_key, TypeByKeyValue, {
+ string rule_type = ifcfg[rule_key]:"";
+ if (rule_type != "") {
+ type = rule_type;
+ }
+ });
+//y2internal("from ifcfg: %1", type);
+ return type;
+}
+
global string GetType(string dev) {
- string type = ifcfg_part (dev, "1");
- // test if this is VLAN (ethX.vlanid)
- if (type=="eth" && regexpmatch(dev, "^eth[[:digit:]]+\\.[[:digit:]]+$")) return "vlan";
- foreach(string dev_type,map confs, Devices, {
- if (haskey(confs, dev)){
- string int_type = confs[dev, "INTERFACETYPE"]:"";
- if (size(confs[dev, "TUNNEL"]:"")>0) int_type = confs[dev, "TUNNEL"]:"";
- if(size(int_type)>0) type = int_type;
- }
- });
- return type;
+ string type = device_type (dev);
+ foreach(string dev_type,map confs, Devices, {
+ ifcfg_t ifcfg = confs[dev]:$[];
+ string ifcfg_type = GetTypeFromIfcfg(ifcfg);
+ if (ifcfg_type != nil)
+ type = ifcfg_type;
+ });
+//y2internal("original %1: %2", dev, type);
+ return type;
}
/**
@@ -507,14 +535,6 @@
/* Read devices */
maplist(string d, devices, {
- string devtype = GetType(d);
-
-// string devnum = "";
- // if(regexpmatch(d, "[a-z][a-z-]*[0-9]+"))
-// devnum = sformat("%1", device_num(d));
-// y2debug("devnum=%1", devnum);
-
- map dev = Devices[devtype]:$[];
string pth = ".network.value.\"" + d + "\"";
y2debug("pth=%1", pth);
list<string> values = SCR::Dir(topath(pth));
@@ -561,17 +581,12 @@
config = CanonicalizeIP (config);
config = CanonicalizeStartmode (config);
- if (size(config["INTERFACETYPE"]:"")>0) {
- y2milestone("option INTERFACETYPE changes devtype from %1 to %2", devtype, config["INTERFACETYPE"]:"");
- devtype=config["INTERFACETYPE"]:"";
- dev = Devices[devtype]:$[];
- }
-/*
- if(haskey(dev, devnum)) {
- y2error("device already present: %1", devnum);
- return;
+ string devtype = GetTypeFromIfcfg(config);
+ if (devtype == nil) {
+ devtype = GetType(d);
}
-*/
+
+ map dev = Devices[devtype]:$[];
dev[d] = config;
Devices[devtype] = dev;
});
Modified: trunk/yast2/library/network/src/NetworkStorage.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/NetworkStorage.ycp?rev=64960&r1=64959&r2=64960&view=diff
==============================================================================
--- trunk/yast2/library/network/src/NetworkStorage.ycp (original)
+++ trunk/yast2/library/network/src/NetworkStorage.ycp Fri Jul 22 16:51:53 2011
@@ -15,122 +15,141 @@
import "FileUtils";
-global string getDevice(string mount_point){
- map out = (map)SCR::Execute(.target.bash_output, sformat("grep ' %1 ' /proc/mounts|grep -v rootfs|tr -d '\n'", mount_point));
- y2milestone("mountpoint found %1", out);
- list<string> rows = splitstring(out["stdout"]:"", " ");
- string device="";
- if (rows[2]:""=="nfs") device="nfs";
- else device=rows[0]:"";
- y2milestone("%1 is on device: %2", mount_point, device);
- return device;
+/**
+ * Ask /proc/mounts what device a mount point is using.
+ * @return e.g. /dev/sda2 (or just "nfs")
+ */
+global string getDevice(string mount_point) {
+ string cmd = sformat("grep ' %1 ' /proc/mounts|grep -v rootfs|tr -d '\n'", mount_point);
+ map out = (map)SCR::Execute(.target.bash_output, cmd);
+ y2milestone("mountpoint found %1", out);
+ list<string> fields = splitstring(out["stdout"]:"", " ");
+ string vfstype = fields[2]:"";
+ string device = (vfstype == "nfs" || vfstype == "nfs4")? "nfs": fields[0]:"";
+ y2milestone("%1 is on device: %2", mount_point, device);
+ return device;
}
/**
* If the disk is on a networked device (NFS, ISCSI),
* the main NIC needs STARTMODE nfsroot instead of auto.
- * @return root dev over network
+ * @return root dev over network: 1 iSCSI, 2 NFS
*/
-global integer isDiskOnNetwork(string device){
- y2milestone("begin isDiskOnNetwork(%1) function", device);
- if (device=="nfs") return 2;
- if (size(device)==0) {
- y2error("Empty parameter for isDiskOnNetwork() function");
- return -1;
- }
- integer network_based=0;
-
- // test for multipath
- if (network_based==0 && issubstring(device, "/dev/dm-")) {
- y2warning("multipath detected!");
- string dev_name = splitstring(device, "/")[2]:"";
- y2milestone("Multipath device name %1", dev_name);
- map cmd = (map)SCR::Execute(.target.bash_output, sformat("ls /sys/block/%1/slaves/", dev_name));
- y2milestone("Show slaves command:%1", cmd);
- if (cmd["exit"]:-1==0){
- // FIXME: what about more slaves?
- list<string> slaves = splitstring(cmd["stdout"]:"", "\n");
- integer nb = isDiskOnNetwork(sformat("/dev/%1", slaves[0]:""));
- if (nb>0) network_based=nb;
- } else y2error("Error while executed show slaves commad:%1", cmd["stderr"]:"");
- }
-
- // test for LVM
- if (network_based==0 && issubstring(device, "/dev/mapper/")) {
- y2warning("LVM detected!");
- string group_name = splitstring(splitstring(device, "/")[3]:"", "-")[0]:"";
- y2milestone("LVM group name %1", group_name);
- map command = (map)SCR::Execute(.target.bash_output, sformat("pvs 2>/dev/null|grep %1", group_name));
- foreach(string row, filter(string s, splitstring(command["stdout"]:"", "\n"), { return (size(s)>0);}), {
- string lvm_device = filter(string s, splitstring(row, " "), { return (size(s)>0);})[0]:"";
- y2milestone("LVM physical device: %1", lvm_device);
- integer nb = isDiskOnNetwork(lvm_device);
- if (nb>0) network_based=nb;
- });
- }
-
- // test for RAID
- if (network_based==0 && issubstring(device, "/dev/md")){
- y2warning("RAID detected!");
- string raid = splitstring(device, "/")[2]:"";
- y2milestone("RAID %1 detected", raid);
- map command = (map)SCR::Execute(.target.bash_output, sformat("cat /proc/mdstat |grep %1|tr -d '\\n'", raid));
- list<string> raid_devices = sublist(splitstring(command["stdout"]:"", " "), 4);
- foreach(string dev, raid_devices, {
- if (!issubstring(dev, "/dev/")) dev = sformat("/dev/%1", dev);
- string raid_device = substring(dev, 0, findfirstof(dev, "["));
- integer nb = isDiskOnNetwork(raid_device);
- if (nb>0) network_based=nb;
- }
- );
- }
-
- //test for iSCSI
- if (network_based==0){
- if (issubstring(device, "/dev/")){
- device = splitstring(device, "/")[2]:"";
- }
- string sys=sformat("/sys/class/block/%1", device);
- if (FileUtils::Exists(sys)){
- if ((integer)SCR::Execute(.target.bash, sformat("ls -la %1 | grep -q session", sys))==0){
- y2warning("iSCSI detected!");
- network_based=1;
- }
- }
- }
-
- // test for nfs (bnc#384420)
- if (network_based==0) {
- string space="[[:space:]]";
- if (SCR::Execute(.target.bash, sformat("grep '%1%2%3*nfs%4' /proc/mounts ", space, device, space, space))==0){
- y2milestone("device %1 is network based : %2", device, network_based);
- network_based=2;
- }
- }
-
- //test for FCoE
- if (network_based==0){
- if (issubstring(device, "/dev/")){
- device = splitstring(device, "/")[2]:"";
- }
- string sys=sformat("/sys/class/block/%1", device);
- if (FileUtils::Exists(sys)){
- if ((integer)SCR::Execute(.target.bash, sformat("ls -la %1 | grep -q target", sys))==0){
- y2warning("FCoE detected!");
- network_based=3;
- }
- }
- }
-
- return network_based;
+global integer isDiskOnNetwork(string device) {
+ y2milestone("begin isDiskOnNetwork(%1) function", device);
+ if (device=="nfs") {
+ return 2;
+ }
+ if (size(device)==0) {
+ y2error("Empty parameter for isDiskOnNetwork() function");
+ return -1;
+ }
+ integer network_based=0;
+
+ // test for multipath
+ if (network_based==0 && issubstring(device, "/dev/dm-")) {
+ y2warning("multipath detected!");
+ string dev_name = splitstring(device, "/")[2]:"";
+ y2milestone("Multipath device name %1", dev_name);
+ map cmd = (map)SCR::Execute(.target.bash_output, sformat("ls /sys/block/%1/slaves/", dev_name));
+ y2milestone("Show slaves command:%1", cmd);
+ if (cmd["exit"]:-1==0){
+ // FIXME: what about more slaves?
+ list<string> slaves = splitstring(cmd["stdout"]:"", "\n");
+ integer nb = isDiskOnNetwork(sformat("/dev/%1", slaves[0]:""));
+ if (nb > 0) {
+ network_based = nb;
+ }
+ }
+ else {
+ y2error("Error while executed show slaves commad:%1", cmd["stderr"]:"");
+ }
+ }
+
+ // test for LVM
+ if (network_based==0 && issubstring(device, "/dev/mapper/")) {
+ y2warning("LVM detected!");
+ string group_name = splitstring(splitstring(device, "/")[3]:"", "-")[0]:"";
+ y2milestone("LVM group name %1", group_name);
+ map command = (map)SCR::Execute(.target.bash_output, sformat("pvs 2>/dev/null|grep %1", group_name));
+ foreach(string row, filter(string s, splitstring(command["stdout"]:"", "\n"), { return (size(s) > 0);}), {
+ string lvm_device = filter(string s, splitstring(row, " "), { return (size(s)>0);})[0]:"";
+ y2milestone("LVM physical device: %1", lvm_device);
+ integer nb = isDiskOnNetwork(lvm_device);
+ if (nb > 0) {
+ network_based = nb;
+ }
+ });
+ }
+
+ // test for RAID
+ if (network_based==0 && issubstring(device, "/dev/md")){
+ y2warning("RAID detected!");
+ string raid = splitstring(device, "/")[2]:"";
+ y2milestone("RAID %1 detected", raid);
+ map command = (map)SCR::Execute(.target.bash_output, sformat("cat /proc/mdstat |grep %1|tr -d '\\n'", raid));
+ list<string> raid_devices = sublist(splitstring(command["stdout"]:"", " "), 4);
+ foreach(string dev, raid_devices, {
+ if (!issubstring(dev, "/dev/")) {
+ dev = sformat("/dev/%1", dev);
+ }
+ string raid_device = substring(dev, 0, findfirstof(dev, "["));
+ integer nb = isDiskOnNetwork(raid_device);
+ if (nb > 0) {
+ network_based = nb;
+ }
+ });
+ }
+
+ //test for iSCSI
+ if (network_based==0){
+ if (issubstring(device, "/dev/")){
+ device = splitstring(device, "/")[2]:"";
+ }
+ string sys=sformat("/sys/class/block/%1", device);
+ if (FileUtils::Exists(sys)){
+ if ((integer)SCR::Execute(.target.bash, sformat("ls -la %1 | grep -q session", sys))==0){
+ y2warning("iSCSI detected!");
+ network_based = 1;
+ }
+ }
+ }
+
+ //test for FCoE
+ if (network_based==0){
+ if (issubstring(device, "/dev/")){
+ device = splitstring(device, "/")[2]:"";
+ }
+
+ string sys=sformat("/sys/class/block/%1/device", device);
+ if (FileUtils::Exists(sys) && FileUtils::IsDirectory(sys)){
+ if ((integer)SCR::Execute(.target.bash, sformat("cd %1; pwd -P | grep -q target", sys))==0){
+ y2warning("FCoE detected!");
+ network_based = 3;
+ }
+ }
+ }
+
+ // test for nfs (bnc#384420)
+ if (network_based==0) {
+ string space="[[:space:]]";
+ if (SCR::Execute(.target.bash, sformat("grep '%1%2%3*nfs%4' /proc/mounts ", space, device, space, space))==0){
+ y2milestone("device %1 is network based : %2", device, network_based);
+ network_based = 2;
+ }
+ }
+ return network_based;
}
-global list<string> getiBFTDevices(){
- if (SCR::Execute(.target.bash, "ls /sys/firmware/ibft")==0){
- map output = (map)SCR::Execute(.target.bash_output, "ls /sys/firmware/ibft/ethernet*/device/net/");
- list<string> ifaces = filter(string row, splitstring(output["stdout"]:"", "\n"), { return (size(row)>0);});
- return ifaces;
- } else return [];
+global list<string> getiBFTDevices() {
+ if (SCR::Execute(.target.bash, "ls /sys/firmware/ibft")==0){
+ map output = (map)SCR::Execute(.target.bash_output, "ls /sys/firmware/ibft/ethernet*/device/net/");
+ list<string> ifaces = filter(string row, splitstring(output["stdout"]:"", "\n"), { return (size(row)>0);});
+ return ifaces;
+ }
+ else {
+ return [];
+ }
}
/* EOF */
Modified: trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.out?rev=64960&r1=64959&r2=64960&view=diff
==============================================================================
--- trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.out (original)
+++ trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.out Fri Jul 22 16:51:53 2011
@@ -9,8 +9,6 @@
Dump ifcfg-lo, type: lo
Dump ifcfg-eth0#1, type: eth
Dump ifcfg-eth1#20, type: eth
-Dump ifcfg-eth0.1, type: vlan
-Dump ifcfg-eth1.20, type: vlan
Dump ifcfg-eth-pcmcia-0#3, type: eth
Dump ifcfg-eth-usb-1#0, type: eth
Dump ifcfg-tr-pcmcia-2#432, type: tr
Modified: trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.ycp?rev=64960&r1=64959&r2=64960&view=diff
==============================================================================
--- trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.ycp (original)
+++ trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.ycp Fri Jul 22 16:51:53 2011
@@ -20,8 +20,6 @@
"lo",
"eth0#1",
"eth1#20",
- "eth0.1",
- "eth1.20",
"eth-pcmcia-0#3",
"eth-usb-1#0",
"tr-pcmcia-2#432",
Modified: trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.out?rev=64960&r1=64959&r2=64960&view=diff
==============================================================================
--- trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.out (original)
+++ trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.out Fri Jul 22 16:51:53 2011
@@ -1,5 +1,5 @@
Dump NetworkInterfaces::Read
-Dir .network.section: ["arc5", "atm5", "ci5", "ctc5", "dummy5", "escon5", "eth5", "eth6", "eth7", "eth8", "eth9", "fddi5", "hippi5", "hsi5", "ippp5", "iucv5", "lo", "mynet0", "myri5", "ppp5", "tr5", "tr~"]
+Dir .network.section: ["arc5", "atm5", "ci5", "ctc5", "dummy5", "escon5", "eth0.3", "eth5", "eth6", "eth7", "eth8", "eth9", "fddi5", "hippi5", "hsi5", "ippp5", "iucv5", "lo", "mynet0", "myri5", "myvlantoo", "ppp5", "tr5", "tr~", "virtlan4", "vlan3"]
Dir .network.value."arc5": ["BOOTPROTO", "STARTMODE"]
Read .network.value."arc5".BOOTPROTO "dhcp"
Read .network.value."arc5".STARTMODE "manual"
@@ -20,6 +20,10 @@
Dir .network.value."escon5": ["BOOTPROTO", "STARTMODE"]
Read .network.value."escon5".BOOTPROTO "dhcp"
Read .network.value."escon5".STARTMODE "manual"
+Dir .network.value."eth0.3": ["BOOTPROTO", "ETHERDEVICE", "STARTMODE"]
+Read .network.value."eth0.3".BOOTPROTO "dhcp"
+Read .network.value."eth0.3".ETHERDEVICE "eth0"
+Read .network.value."eth0.3".STARTMODE "manual"
Dir .network.value."eth5": ["BOOTPROTO", "STARTMODE"]
Read .network.value."eth5".BOOTPROTO "dhcp"
Read .network.value."eth5".STARTMODE "manual"
@@ -64,14 +68,27 @@
Dir .network.value."myri5": ["BOOTPROTO", "STARTMODE"]
Read .network.value."myri5".BOOTPROTO "dhcp"
Read .network.value."myri5".STARTMODE "manual"
+Dir .network.value."myvlantoo": ["BOOTPROTO", "ETHERDEVICE", "STARTMODE", "VLAN_ID"]
+Read .network.value."myvlantoo".BOOTPROTO "dhcp"
+Read .network.value."myvlantoo".ETHERDEVICE "eth0"
+Read .network.value."myvlantoo".STARTMODE "manual"
+Read .network.value."myvlantoo".VLAN_ID "2"
Dir .network.value."ppp5": ["BOOTPROTO", "STARTMODE"]
Read .network.value."ppp5".BOOTPROTO "dhcp"
Read .network.value."ppp5".STARTMODE "manual"
Dir .network.value."tr5": ["BOOTPROTO", "STARTMODE"]
Read .network.value."tr5".BOOTPROTO "dhcp"
Read .network.value."tr5".STARTMODE "manual"
+Dir .network.value."virtlan4": ["BOOTPROTO", "ETHERDEVICE", "STARTMODE"]
+Read .network.value."virtlan4".BOOTPROTO "dhcp"
+Read .network.value."virtlan4".ETHERDEVICE "eth0"
+Read .network.value."virtlan4".STARTMODE "manual"
+Dir .network.value."vlan3": ["BOOTPROTO", "ETHERDEVICE", "STARTMODE"]
+Read .network.value."vlan3".BOOTPROTO "dhcp"
+Read .network.value."vlan3".ETHERDEVICE "eth0"
+Read .network.value."vlan3".STARTMODE "manual"
Return true
-Dump all=$["arc":$["arc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "atm":$["atm5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ci":$["ci5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ctc":$["ctc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "dummy":$["dummy5":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"]], "escon":$["escon5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "eth":$["eth5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"], "eth6":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.255.255.255", "PREFIXLEN":"32", "STARTMODE":"manual"], "eth7":$["STARTMODE":"manual"], "eth8":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "eth9":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "mynet0":$["BOOTPROTO":"dhcp", "INTERFACETYPE":"eth", "STARTMODE":"auto"]], "fddi":$["fddi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hippi":
$["hippi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hsi":$["hsi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ippp":$["ippp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "iucv":$["iucv5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "lo":$["lo":$["BROADCAST":"127.255.255.255", "IPADDR":"127.0.0.1", "NETMASK":"255.0.0.0", "NETWORK":"127.0.0.0", "PREFIXLEN":"8", "STARTMODE":"auto"]], "myri":$["myri5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ppp":$["ppp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "tr":$["tr5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]]]
+Dump all=$["arc":$["arc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "atm":$["atm5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ci":$["ci5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ctc":$["ctc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "dummy":$["dummy5":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"]], "escon":$["escon5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "eth":$["eth5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"], "eth6":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.255.255.255", "PREFIXLEN":"32", "STARTMODE":"manual"], "eth7":$["STARTMODE":"manual"], "eth8":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "eth9":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "mynet0":$["BOOTPROTO":"dhcp", "INTERFACETYPE":"eth", "STARTMODE":"auto"]], "fddi":$["fddi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hippi":
$["hippi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hsi":$["hsi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ippp":$["ippp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "iucv":$["iucv5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "lo":$["lo":$["BROADCAST":"127.255.255.255", "IPADDR":"127.0.0.1", "NETMASK":"255.0.0.0", "NETWORK":"127.0.0.0", "PREFIXLEN":"8", "STARTMODE":"auto"]], "myri":$["myri5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ppp":$["ppp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "tr":$["tr5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "vlan":$["eth0.3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "myvlantoo":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual", "VLAN_ID":"2"], "virtlan4":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "vlan3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"]]]
Dump NetworkInterfaces::Write
Write .network.value."arc5".BOOTPROTO "dhcp" true
Write .network.value."arc5".STARTMODE "manual" true
@@ -124,6 +141,19 @@
Write .network.value."ppp5".STARTMODE "manual" true
Write .network.value."tr5".BOOTPROTO "dhcp" true
Write .network.value."tr5".STARTMODE "manual" true
+Write .network.value."eth0.3".BOOTPROTO "dhcp" true
+Write .network.value."eth0.3".ETHERDEVICE "eth0" true
+Write .network.value."eth0.3".STARTMODE "manual" true
+Write .network.value."myvlantoo".BOOTPROTO "dhcp" true
+Write .network.value."myvlantoo".ETHERDEVICE "eth0" true
+Write .network.value."myvlantoo".STARTMODE "manual" true
+Write .network.value."myvlantoo".VLAN_ID "2" true
+Write .network.value."virtlan4".BOOTPROTO "dhcp" true
+Write .network.value."virtlan4".ETHERDEVICE "eth0" true
+Write .network.value."virtlan4".STARTMODE "manual" true
+Write .network.value."vlan3".BOOTPROTO "dhcp" true
+Write .network.value."vlan3".ETHERDEVICE "eth0" true
+Write .network.value."vlan3".STARTMODE "manual" true
Write .network nil true
Return true
Write .network.value."eth5".BOOTPROTO "dhcp" true
@@ -161,9 +191,9 @@
Write .network nil true
Return true
Dump NetworkInterfaces::Export
-Dump exported=$["arc":$["arc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "atm":$["atm5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ci":$["ci5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ctc":$["ctc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "dummy":$["dummy5":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"]], "escon":$["escon5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "eth":$["eth5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"], "eth6":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.255.255.255", "PREFIXLEN":"32", "STARTMODE":"manual"], "eth7":$["STARTMODE":"manual"], "eth8":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "eth9":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "mynet0":$["BOOTPROTO":"dhcp", "INTERFACETYPE":"eth", "STARTMODE":"auto"]], "fddi":$["fddi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hi
ppi":$["hippi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hsi":$["hsi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ippp":$["ippp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "iucv":$["iucv5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "lo":$["lo":$["BROADCAST":"127.255.255.255", "IPADDR":"127.0.0.1", "NETMASK":"255.0.0.0", "NETWORK":"127.0.0.0", "PREFIXLEN":"8", "STARTMODE":"auto"]], "myri":$["myri5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ppp":$["ppp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "tr":$["tr5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]]]
+Dump exported=$["arc":$["arc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "atm":$["atm5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ci":$["ci5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ctc":$["ctc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "dummy":$["dummy5":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"]], "escon":$["escon5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "eth":$["eth5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"], "eth6":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.255.255.255", "PREFIXLEN":"32", "STARTMODE":"manual"], "eth7":$["STARTMODE":"manual"], "eth8":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "eth9":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "mynet0":$["BOOTPROTO":"dhcp", "INTERFACETYPE":"eth", "STARTMODE":"auto"]], "fddi":$["fddi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hi
ppi":$["hippi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hsi":$["hsi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ippp":$["ippp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "iucv":$["iucv5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "lo":$["lo":$["BROADCAST":"127.255.255.255", "IPADDR":"127.0.0.1", "NETMASK":"255.0.0.0", "NETWORK":"127.0.0.0", "PREFIXLEN":"8", "STARTMODE":"auto"]], "myri":$["myri5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ppp":$["ppp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "tr":$["tr5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "vlan":$["eth0.3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "myvlantoo":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual", "VLAN_ID":"2"], "virtlan4":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "vlan3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"]]]
Dump NetworkInterfaces::Import
-Dump all =$["arc":$["arc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "atm":$["atm5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ci":$["ci5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ctc":$["ctc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "dummy":$["dummy5":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"]], "escon":$["escon5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "eth":$["eth5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"], "eth6":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "eth7":$["STARTMODE":"manual"], "eth8":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "eth9":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "mynet0":$["BOOTPROTO":"dhcp", "INTERFACETYPE":"eth", "STARTMODE":"auto"]], "fddi":$["fddi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hippi":$[
"hippi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hsi":$["hsi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ippp":$["ippp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "iucv":$["iucv5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "lo":$["lo":$["BROADCAST":"127.255.255.255", "IPADDR":"127.0.0.1", "NETMASK":"255.0.0.0", "NETWORK":"127.0.0.0", "PREFIXLEN":"8", "STARTMODE":"auto"]], "myri":$["myri5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ppp":$["ppp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "tr":$["tr5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]]]
+Dump all =$["arc":$["arc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "atm":$["atm5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ci":$["ci5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ctc":$["ctc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "dummy":$["dummy5":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"]], "escon":$["escon5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "eth":$["eth5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"], "eth6":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "eth7":$["STARTMODE":"manual"], "eth8":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "eth9":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "mynet0":$["BOOTPROTO":"dhcp", "INTERFACETYPE":"eth", "STARTMODE":"auto"]], "fddi":$["fddi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hippi":$[
"hippi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hsi":$["hsi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ippp":$["ippp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "iucv":$["iucv5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "lo":$["lo":$["BROADCAST":"127.255.255.255", "IPADDR":"127.0.0.1", "NETMASK":"255.0.0.0", "NETWORK":"127.0.0.0", "PREFIXLEN":"8", "STARTMODE":"auto"]], "myri":$["myri5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ppp":$["ppp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "tr":$["tr5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "vlan":$["eth0.3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "myvlantoo":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual", "VLAN_ID":"2"], "virtlan4":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "vlan3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"]]]
Dump NetworkInterfaces::GetFreeDevices
Return ["1", "2"]
Return ["0", "2"]
Modified: trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.ycp?rev=64960&r1=64959&r2=64960&view=diff
==============================================================================
--- trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.ycp (original)
+++ trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.ycp Fri Jul 22 16:51:53 2011
@@ -29,6 +29,10 @@
"ppp5" : nil,
"tr5" : nil,
"tr~" : nil,
+ "vlan3" : nil,
+ "eth0.3" : nil,
+ "virtlan4" : nil,
+ "myvlantoo" : nil,
],
"value" : $[
"arc5" : $["BOOTPROTO":"dhcp", "STARTMODE":"manual"],
@@ -55,6 +59,10 @@
"myri5" : $["BOOTPROTO":"dhcp", "STARTMODE":"manual"],
"ppp5" : $["BOOTPROTO":"dhcp", "STARTMODE":"manual"],
"tr5" : $["BOOTPROTO":"dhcp", "STARTMODE":"manual"],
+ "vlan3" : $["BOOTPROTO":"dhcp", "STARTMODE":"manual", "ETHERDEVICE": "eth0"],
+ "eth0.3" : $["BOOTPROTO":"dhcp", "STARTMODE":"manual", "ETHERDEVICE": "eth0"],
+ "virtlan4" : $["BOOTPROTO":"dhcp", "STARTMODE":"manual", "ETHERDEVICE": "eth0"],
+ "myvlantoo" : $["BOOTPROTO":"dhcp", "STARTMODE":"manual", "ETHERDEVICE": "eth0", "VLAN_ID": "2"],
]
],
"probe" : $[
Modified: trunk/yast2/package/yast2.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=64960&r1=64959&r2=64960&view=diff
==============================================================================
--- trunk/yast2/package/yast2.changes (original)
+++ trunk/yast2/package/yast2.changes Fri Jul 22 16:51:53 2011
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Fri Jul 22 16:18:30 CEST 2011 - mvidner@suse.cz
+
+- FCoE detection in NetworkStorage::isDiskOnNetwork (bnc#677251, FATE#306855).
+- Added NetworkInterfaces::GetTypeFromIfcfg which knows
+ ETHERDEVICE=>vlan (FATE#311380).
+- 2.21.6
+
+-------------------------------------------------------------------
Fri Jul 22 16:10:07 CEST 2011 - locilka@suse.cz
- Removed obsoleted X-KDE-SubstituteUID from desktop files
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
mvidner＠svn2.opensuse.org