fixes #8685 - include netmask in ENC output

theforeman · Dec 15, 2014 · 99dc10e · 99dc10e
1 parent 287d974
commit 99dc10e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/app/models/subnet.rb b/app/models/subnet.rb
@@ -234,7 +234,7 @@ def ensure_ip_addr_new
   private
 
   def enc_attributes
-    @enc_attributes ||= %w(name network netmask gateway dns_primary dns_secondary from to boot_mode ipam)
+    @enc_attributes ||= %w(name network mask gateway dns_primary dns_secondary from to boot_mode ipam)
   end
 
 

diff --git a/test/unit/host_test.rb b/test/unit/host_test.rb
@@ -506,6 +506,7 @@ def teardown
           [{"network"=>"2.3.4.0",
             "name"=>"one",
             "gateway"=>nil,
+            "mask"=>"255.255.255.0",
             "dns_primary"=>nil,
             "dns_secondary"=>nil,
             "from"=>nil,
@@ -523,6 +524,7 @@ def teardown
             "identifier"=>nil,
             "managed"=>true,
             "subnet"=> {"network"=>"2.3.4.0",
+                        "mask"=>"255.255.255.0",
                         "name"=>"one",
                         "gateway"=>nil,
                         "dns_primary"=>nil,