fb_networkd: Validate given IP addresses - 100%

Differential Revision: D57674868 fbshipit-source-id: d0c82ffbedb9908684f7a7a26916ef773e833a40
facebook · May 22, 2024 · 46ccd8a · 46ccd8a
1 parent 61bcc51
commit 46ccd8a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/cookbooks/fb_networkd/resources/default.rb b/cookbooks/fb_networkd/resources/default.rb
@@ -25,7 +25,6 @@
   # resources for the different networkd units and move this validation to those
   # custom resources
   def validate_network_addresses(conf)
-    return if !node.in_shard?(0)
     conf.dig('config', 'Network', 'Address')&.each do |ip|
       ::IPAddr.new(ip)
     rescue ::IPAddr::Error

diff --git a/cookbooks/fb_networkd/spec/default_spec.rb b/cookbooks/fb_networkd/spec/default_spec.rb
@@ -103,7 +103,6 @@
           :step_into => ['fb_networkd', 'fb_helpers_gated_template'],
         ) do |node|
           allow(node).to receive(:systemd?).and_return(true)
-          allow(node).to receive(:in_shard?).and_return(true)
 
           # These enable the fb_helpers_gated_template resources
           allow(node).to receive(:interface_change_allowed?).and_return(true)
@@ -131,7 +130,6 @@
           :step_into => ['fb_networkd', 'fb_helpers_gated_template'],
         ) do |node|
           allow(node).to receive(:systemd?).and_return(true)
-          allow(node).to receive(:in_shard?).and_return(true)
 
           # These enable the fb_helpers_gated_template resources
           allow(node).to receive(:interface_change_allowed?).and_return(true)
@@ -162,7 +160,6 @@
           :step_into => ['fb_networkd', 'fb_helpers_gated_template'],
         ) do |node|
           allow(node).to receive(:systemd?).and_return(true)
-          allow(node).to receive(:in_shard?).and_return(true)
 
           # These enable the fb_helpers_gated_template resources
           allow(node).to receive(:interface_change_allowed?).and_return(true)
@@ -191,7 +188,6 @@
           :step_into => ['fb_networkd', 'fb_helpers_gated_template'],
         ) do |node|
           allow(node).to receive(:systemd?).and_return(true)
-          allow(node).to receive(:in_shard?).and_return(true)
 
           # These enable the fb_helpers_gated_template resources
           allow(node).to receive(:interface_change_allowed?).and_return(true)
@@ -220,7 +216,6 @@
           :step_into => ['fb_networkd', 'fb_helpers_gated_template'],
         ) do |node|
           allow(node).to receive(:systemd?).and_return(true)
-          allow(node).to receive(:in_shard?).and_return(true)
 
           # These enable the fb_helpers_gated_template resources
           allow(node).to receive(:interface_change_allowed?).and_return(true)