Merge pull request #1159 from yast/really_memoize_hardware

Cache the netcards 'hwinfo' speeding up the access to it (bsc#1180702)
yast · Feb 4, 2021 · 267cb63 · 267cb63
2 parents 6c47fe6 + 45243d5
commit 267cb63
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 1 deletion.
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Feb  4 15:05:25 UTC 2021 - Knut Anderssen <kanderssen@suse.com>
+
+- Cache the hardware netcards information in order to speed up the
+  access (bsc#1180702)
+- 4.3.44
+
 -------------------------------------------------------------------
 Mon Feb  1 20:05:05 UTC 2021 - Knut Anderssen <kanderssen@suse.com>
 

diff --git a/package/yast2-network.spec b/package/yast2-network.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        4.3.43
+Version:        4.3.44
 Release:        0
 Summary:        YaST2 - Network Configuration
 License:        GPL-2.0-only

diff --git a/src/lib/y2network/hwinfo.rb b/src/lib/y2network/hwinfo.rb
@@ -113,6 +113,8 @@ def hwinfo_from_hardware(name)
       #
       # @return [HardWrapper]
       def hardware_wrapper
+        return @hardware_wrapper if @hardware_wrapper
+
         @hardware_wrapper = HardwareWrapper.new
       end
 

diff --git a/src/lib/y2network/wicked/interfaces_reader.rb b/src/lib/y2network/wicked/interfaces_reader.rb
@@ -51,6 +51,7 @@ class InterfacesReader
       def config
         return @config if @config
 
+        Hwinfo.reset
         find_s390_devices
         find_physical_interfaces
         find_connections

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -72,6 +72,7 @@
 
   c.before do
     Yast::Lan.clear_configs
+    Y2Network::Hwinfo.reset
     allow(Yast::NetworkInterfaces).to receive(:Write)
     allow(Y2Network::Hwinfo).to receive(:hwinfo_from_hardware)
     Y2Storage::StorageManager.create_test_instance