Merge pull request #914 from yast/firewalld_fixes

Do not consider Zone's name as a normal attribute (bsc#1130354)

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

@@ -53,7 +53,10 @@ class Zone
       has_many :services, :interfaces, :protocols, :ports, cache: true
 
       # @see Y2Firewall::Firewalld::Relations
-      has_attributes :name, :masquerade, :short, :description, :target, cache: true
+      has_attributes :masquerade, :short, :description, :target, cache: true
+
+      # @return [String] Zone name
+      attr_accessor :name
 
       alias_method :masquerade?, :masquerade
 

library/network/test/network_service_test.rb

@@ -23,13 +23,6 @@
         expect { Yast::NetworkService.is_netconfig }.not_to raise_error
       end
     end
-
-    describe "#EnableDisableNow" do
-      it "does not crash when current / cached service is nil" do
-        allow(Yast::NetworkService).to receive(:Modified).and_return(true)
-        expect { Yast::NetworkService.EnableDisableNow }.not_to raise_error ArgumentError
-      end
-    end
   end
 
   describe "#RunSystemCtl" do

package/yast2.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Mar 26 22:46:58 UTC 2019 - kanderssen@suse.com
+
+- Firewall: Zone name has been removed from the common attributes
+  declaration as it cannot be modified through the firewalld API.
+  (bsc#1130354)
+- 4.1.67
+
 -------------------------------------------------------------------
 Tue Mar 19 09:02:12 UTC 2019 - David Díaz <dgonzalez@suse.com>
 

package/yast2.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        4.1.66
+Version:        4.1.67
 Release:        0
 Summary:        YaST2 - Main Package
 License:        GPL-2.0-only