YaPI: drop caches when reading network interfaces

make it stateless (bnc#790219#c33) Conflicts: package/yast2-network.changes Conflicts: package/yast2-network.changes
yast · Apr 9, 2013 · 12b4a5b · 12b4a5b
1 parent 9898809
commit 12b4a5b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -7,6 +7,8 @@ Fri Mar 22 10:08:35 UTC 2013 - mfilka@suse.com
 - bnc#790219
     - fixed writting ifcfg for bonding through YaPI.
     More than two interfaces can be added into bond device.
+    - YaPI: drop caches when reading network interfaces, make it
+    stateless (bnc#790219#c33) - lslezak@suse.cz
 - 2.24.17
 
 -------------------------------------------------------------------

diff --git a/src/lan/YaPI/NETWORK.pm b/src/lan/YaPI/NETWORK.pm
@@ -11,6 +11,7 @@ YaST::YCP::Import ("Hostname");
 YaST::YCP::Import ("Host");
 YaST::YCP::Import ("DNS");
 YaST::YCP::Import ("Routing");
+YaST::YCP::Import ("NetworkInterfaces");
 # -------------------------------------
 
 our $VERSION            = '1.0.0';
@@ -26,6 +27,9 @@ sub Read {
 
     DNS->Read();
     Routing->Read();
+    # force cleaning the cache to make it stateless
+    # NetworkInterfaces are read in LanItems
+    NetworkInterfaces->CleanCacheRead();
     LanItems->Read();
 
     my %interfaces = ();
@@ -174,8 +178,8 @@ sub writeInterfaces {
     y2milestone("interface", Dumper(\$args->{'interface'}));
 
     while (my ($dev, $ifc) = each %{$args->{'interface'}}) {
-        YaST::YCP::Import ("NetworkInterfaces");
-        NetworkInterfaces->Read();
+        # force cleaning the cache to make it stateless
+        NetworkInterfaces->CleanCacheRead();
         NetworkInterfaces->Add() unless NetworkInterfaces->Edit($dev);
         NetworkInterfaces->Name($dev);