From 622389f3a4c48f72aa7909e720a2324a80848e21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Fri, 16 Feb 2018 11:22:47 +0000 Subject: [PATCH 1/6] Use full detection when reading ifcfgs --- library/network/src/modules/NetworkInterfaces.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/library/network/src/modules/NetworkInterfaces.rb b/library/network/src/modules/NetworkInterfaces.rb index c6b226a1c..8215033dc 100644 --- a/library/network/src/modules/NetworkInterfaces.rb +++ b/library/network/src/modules/NetworkInterfaces.rb @@ -765,8 +765,7 @@ def Read config = CanonicalizeStartmode(config) config = filter_interfacetype(config) - devtype = GetTypeFromIfcfg(config) - devtype = GetType(d) if devtype.nil? + devtype = GetTypeFromIfcfgOrName(d, config) dev = @Devices[devtype] || {} dev[d] = config From 53efc0e9b8b9ba3c71078812459084c9c70d0335 Mon Sep 17 00:00:00 2001 From: Michal Filka Date: Tue, 28 Nov 2017 10:14:21 +0100 Subject: [PATCH 2/6] Fixed (old) testsuite --- library/network/testsuite/tests/NetworkInterfaces2.out | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/library/network/testsuite/tests/NetworkInterfaces2.out b/library/network/testsuite/tests/NetworkInterfaces2.out index 914ab8455..a9815a2a9 100644 --- a/library/network/testsuite/tests/NetworkInterfaces2.out +++ b/library/network/testsuite/tests/NetworkInterfaces2.out @@ -37,6 +37,8 @@ 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" +Read .target.stat "/sys/class/net/eth0.3/type" nil +Read .target.string "/sys/class/net/eth0.3/type" nil Dir .network.value."eth5": ["BOOTPROTO", "STARTMODE"] Read .network.value."eth5".BOOTPROTO "dhcp" Read .network.value."eth5".STARTMODE "manual" @@ -112,6 +114,8 @@ 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" +Read .target.stat "/sys/class/net/myvlantoo/type" nil +Read .target.string "/sys/class/net/myvlantoo/type" nil Dir .network.value."ppp5": ["BOOTPROTO", "STARTMODE"] Read .network.value."ppp5".BOOTPROTO "dhcp" Read .network.value."ppp5".STARTMODE "manual" @@ -126,10 +130,14 @@ 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" +Read .target.stat "/sys/class/net/virtlan4/type" nil +Read .target.string "/sys/class/net/virtlan4/type" nil 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" +Read .target.stat "/sys/class/net/vlan3/type" nil +Read .target.string "/sys/class/net/vlan3/type" nil 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"]], "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"]], "mynet":$["mynet0":$["BOOTPROTO":"dhcp", "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 From 5a9161b10dffc805a76f938f4bde56c71176dfd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Fri, 16 Feb 2018 11:57:01 +0000 Subject: [PATCH 3/6] Use docker for travis with a sle-12-sp3 image --- .travis.yml | 29 ++++++++++++----------------- Dockerfile | 5 +++++ 2 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 Dockerfile diff --git a/.travis.yml b/.travis.yml index 9632f6089..8a75ba453 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,14 @@ -language: cpp -compiler: - - gcc +sudo: required +language: ruby +services: + - docker + before_install: - # disable rvm, use system Ruby - - rvm reset - - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh - - sh ./travis_setup.sh -p "rake yast2-core yast2-devtools yast2-testsuite yast2-ruby-bindings yast2 yast2-pkg-bindings gettext" -g "rspec:3.3.0 yast-rake gettext coveralls rubocop:0.29.1" -script: - - rake check:pot - - rubocop - - make -s -f Makefile.cvs - - make -s - - sudo make -s install - # English messages, UTF-8, "C" locale for numeric formatting tests - - LC_ALL= LANG=en_US.UTF-8 LC_NUMERIC=C make -s check - # English messages, UTF-8, "C" locale for numeric formatting tests, enable test coverage report - - LC_ALL= LANG=en_US.UTF-8 LC_NUMERIC=C COVERAGE=1 rake test:unit + - docker build -t yast-yast2-image . + # list the installed packages (just for easier debugging) + - docker run --rm -it yast-yast2-image rpm -qa | sort +script: + # the "yast-travis-ruby" script is included in the base yastdevel/ruby image + # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby + - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-yast2-image yast-travis-ruby diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..f8b6b96b1 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,5 @@ +FROM yastdevel/ruby:sle12-sp3 +COPY . /usr/src/app +# English messages, UTF-8, "C" locale for numeric formatting tests +ENV LC_ALL= LANG=en_US.UTF-8 LC_NUMERIC=C + From 56fa91d029694b4d637c2bffe30bed63932c18a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Fri, 16 Feb 2018 12:10:28 +0000 Subject: [PATCH 4/6] Do not run rubocop --- .rubocop.yml | 77 ---------------------------------------------------- 1 file changed, 77 deletions(-) delete mode 100644 .rubocop.yml diff --git a/.rubocop.yml b/.rubocop.yml deleted file mode 100644 index aa7dc8438..000000000 --- a/.rubocop.yml +++ /dev/null @@ -1,77 +0,0 @@ -# use the shared Yast defaults -inherit_from: - /usr/share/YaST2/data/devtools/data/rubocop_yast_style.yml - -Metrics/AbcSize: - Max: 446 - -Metrics/BlockNesting: - Max: 5 - -Metrics/ClassLength: - Max: 2711 - -Metrics/CyclomaticComplexity: - Max: 59 - -Metrics/LineLength: - Max: 274 - -Metrics/MethodLength: - Max: 931 - -Metrics/ParameterLists: - Max: 11 - -Metrics/PerceivedComplexity: - Max: 65 - -# Configuration parameters: EnforcedStyle, SupportedStyles. -# JR: I personally think that having this variable on class level is much more readable -# and easier to recognize that access visibility changed -Style/AccessModifierIndentation: - EnforcedStyle: outdent - -Style/AccessorMethodName: - # keep backward compatibility, but do not allow new code to be non-ruby style - Exclude: - - library/systemd/src/modules/systemd_target.rb - -# Keep non-ascii comments as it contains e.g. examples for Punycode -Style/AsciiComments: - Enabled: false - -# UI_ID module is not camel case -Style/ClassAndModuleCamelCase: - Enabled: false - -# ensure new code is properly documented -Style/Documentation: - Include: - - "library/*/src/lib/**/*.rb" - -# keep double negation as conversion to boolean -Style/DoubleNegation: - Enabled: false - -Style/FileName: - Include: - - "library/*/src/lib/**/*.rb" - -Style/MethodName: - Include: - - "library/*/src/lib/**/*.rb" - -# keep it as it is part of API for old code -Style/PredicateName: - Include: - - "library/*/src/lib/**/*.rb" - -# for old code keep it as often methods names are wrong and part of API -Style/TrivialAccessors: - Include: - - "library/*/src/lib/**/*.rb" - -Style/VariableName: - Include: - - "library/*/src/lib/**/*.rb" From 74e84aeda88bdaa8afd8577a45fa3e58236fafd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Fri, 16 Feb 2018 12:19:15 +0000 Subject: [PATCH 5/6] Update gitignore --- .gitignore | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 8839019d0..30d471be0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +*.pot +*.log +*.trs Makefile /Makefile.am Makefile.am.common @@ -12,14 +15,12 @@ config.* configure configure.in configure.ac +coverage/ install-sh pluglib-bindings.ami */.dep -library/*/.dep -library/*/*/.dep -library/*/*.ybc -library/*/*/*.ybc -library/*/*/*/*.ybc +library/**/.dep +library/**/*.ybc doc/autodocs library/*/doc/autodocs library/*/testsuite/config/ @@ -31,9 +32,10 @@ library/*/testsuite/*.log library/*/testsuite/*.sum library/*/testsuite/*.exp library/*/testsuite/*.bak -library/*/test/*.log -library/*/test/*.trs +library/*/test/**/*.log +library/*/test/**/*.trs /test-driver +coverage doc/yast.8 @@ -44,10 +46,12 @@ library/network/src/scrconf/network.scr missing library/packages/src/packages /.yardoc +/*.pot +*.log +*.trs # Package package/yast2-*.tar.bz2 -package/yast2.spec # other home:*:* From 1d6c29476ade8a587d9b5e4a22672445e89f80c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Fri, 16 Feb 2018 12:35:06 +0000 Subject: [PATCH 6/6] Bump version & changelog. --- package/yast2.changes | 7 +++++++ package/yast2.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package/yast2.changes b/package/yast2.changes index 8bf96ae1a..a66149f81 100644 --- a/package/yast2.changes +++ b/package/yast2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Feb 16 12:30:38 UTC 2018 - knut.anderssen@suse.com + +- Fixed interface type detection when read (bsc#1080805) + - This fix is a backport from SP2 (bnc#956755, bnc#1061306) +- 3.1.155.9 + ------------------------------------------------------------------- Mon May 29 08:19:46 UTC 2017 - gsouza@suse.com diff --git a/package/yast2.spec b/package/yast2.spec index 5c2ae9d97..4144266b0 100644 --- a/package/yast2.spec +++ b/package/yast2.spec @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.155.8 +Version: 3.1.155.9 Release: 0 Url: https://github.com/yast/yast-yast2