Force the reset of the firewalld api.

library/network/src/lib/y2firewall/firewalld.rb

@@ -91,6 +91,9 @@ def initialize
     def read(minimal: false)
       return false unless installed?
 
+      # Force a reset of the API instance when reading the first time (bsc#1166698)
+      @api = nil
+
       @current_zone_names = api.zones
       @current_service_names = api.services
       if minimal
@@ -266,6 +269,7 @@ def system_service
     def reset
       load_defaults
       untouched!
+      @api = nil
       @read = false
     end
 

library/network/test/y2firewall/firewalld_test.rb

@@ -244,7 +244,7 @@
     end
 
     before do
-      allow(firewalld).to receive("api").and_return api
+      allow(Y2Firewall::Firewalld::Api).to receive(:new).and_return(api)
     end
 
     it "returns false if firewalld is not installed" do
@@ -253,6 +253,13 @@
       expect(firewalld.read).to eq(false)
     end
 
+    it "resets the firewalld api instance" do
+      expect(Y2Firewall::Firewalld::Api).to receive(:new).twice.and_return(:first, api)
+      api = firewalld.api
+      firewalld.read
+      expect(firewalld.api).to_not eq(api)
+    end
+
     it "stores the list of available zone names" do
       expect { firewalld.read }.to change { firewalld.current_zone_names }.from([]).to(known_zones)
     end