summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-07-09 11:40:41 +0200
committerChristian Poessinger <christian@poessinger.com>2022-07-09 11:40:41 +0200
commit2fcbd6315077d0a9d8c5d261e768282485d31ce6 (patch)
tree5fe859c7f2b2e843380ec9d898fa63f261599836
parent07a4920b17c3741b50ffcb596d4433b54f7e529e (diff)
downloadvyos-1x-2fcbd6315077d0a9d8c5d261e768282485d31ce6.tar.gz
vyos-1x-2fcbd6315077d0a9d8c5d261e768282485d31ce6.zip
ip: T4517: drop forwarding from CLI "system ip disable-directed-broadcast-forwarding"
-rw-r--r--interface-definitions/system-ip.xml.in2
-rwxr-xr-xsmoketest/scripts/cli/test_system_ip.py6
-rwxr-xr-xsrc/conf_mode/system-ip.py2
3 files changed, 5 insertions, 5 deletions
diff --git a/interface-definitions/system-ip.xml.in b/interface-definitions/system-ip.xml.in
index 75fe1c20a..e00dbf252 100644
--- a/interface-definitions/system-ip.xml.in
+++ b/interface-definitions/system-ip.xml.in
@@ -23,7 +23,7 @@
<valueless/>
</properties>
</leafNode>
- <leafNode name="disable-directed-broadcast-forwarding">
+ <leafNode name="disable-directed-broadcast">
<properties>
<help>Disable IPv4 directed broadcast forwarding on all interfaces</help>
<valueless/>
diff --git a/smoketest/scripts/cli/test_system_ip.py b/smoketest/scripts/cli/test_system_ip.py
index 00fce654c..f71ef5b3f 100755
--- a/smoketest/scripts/cli/test_system_ip.py
+++ b/smoketest/scripts/cli/test_system_ip.py
@@ -38,12 +38,12 @@ class TestSystemIP(VyOSUnitTestSHIM.TestCase):
self.assertEqual(read_file(all_forwarding), '0')
def test_system_ip_directed_broadcast_forwarding(self):
- # Test if IPv4 directed broadcast forwarding can be disabled globally, default is '1'
- # which means forwarding enabled
+ # Test if IPv4 directed broadcast forwarding can be disabled globally,
+ # default is '1' which means forwarding enabled
bc_forwarding = '/proc/sys/net/ipv4/conf/all/bc_forwarding'
self.assertEqual(read_file(bc_forwarding), '1')
- self.cli_set(base_path + ['disable-directed-broadcast-forwarding'])
+ self.cli_set(base_path + ['disable-directed-broadcast'])
self.cli_commit()
self.assertEqual(read_file(bc_forwarding), '0')
diff --git a/src/conf_mode/system-ip.py b/src/conf_mode/system-ip.py
index a0e1e0e50..0c5063ed3 100755
--- a/src/conf_mode/system-ip.py
+++ b/src/conf_mode/system-ip.py
@@ -65,7 +65,7 @@ def apply(opt):
write_file('/proc/sys/net/ipv4/conf/all/forwarding', value)
# enable/disable IPv4 directed broadcast forwarding
- tmp = dict_search('disable_directed_broadcast_forwarding', opt)
+ tmp = dict_search('disable_directed_broadcast', opt)
value = '0' if (tmp != None) else '1'
write_file('/proc/sys/net/ipv4/conf/all/bc_forwarding', value)