summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-04-11 20:57:43 +0200
committerChristian Poessinger <christian@poessinger.com>2022-04-11 20:57:45 +0200
commit7c493522417b99d6937715408f1d6821c5a04918 (patch)
tree49a1a9a1bfc9df3ddd534361218d99c6db64747f
parent7e946dc26f628ac716a1d6a75664781e5685cb66 (diff)
downloadvyos-1x-7c493522417b99d6937715408f1d6821c5a04918.tar.gz
vyos-1x-7c493522417b99d6937715408f1d6821c5a04918.zip
snmp: T4346: remove IPv6 disabled code-path
-rwxr-xr-xsrc/conf_mode/snmp.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/conf_mode/snmp.py b/src/conf_mode/snmp.py
index 8ce48780b..4fc6a4517 100755
--- a/src/conf_mode/snmp.py
+++ b/src/conf_mode/snmp.py
@@ -57,9 +57,6 @@ def get_config(config=None):
if conf.exists(['service', 'lldp', 'snmp', 'enable']):
snmp.update({'lldp_snmp' : ''})
- if conf.exists(['system', 'ipv6', 'disable']):
- snmp.update({'ipv6_disabled' : ''})
-
if 'deleted' in snmp:
return snmp
@@ -100,9 +97,8 @@ def get_config(config=None):
snmp['listen_address'] = dict_merge(tmp, snmp['listen_address'])
if '::1' not in snmp['listen_address']:
- if 'ipv6_disabled' not in snmp:
- tmp = {'::1': {'port': '161'}}
- snmp['listen_address'] = dict_merge(tmp, snmp['listen_address'])
+ tmp = {'::1': {'port': '161'}}
+ snmp['listen_address'] = dict_merge(tmp, snmp['listen_address'])
if 'community' in snmp:
default_values = defaults(base + ['community'])