Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SNMP][IPv6]: Fix SNMP IPv6 reachability issue in certain scenarios #15487

Merged
merged 12 commits into from
Jul 12, 2023
Merged

[SNMP][IPv6]: Fix SNMP IPv6 reachability issue in certain scenarios #15487

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8e7aa23
[SNMP][IPv6]: Fix SNMP IPv6 reachability issue in certain scenario
SuvarnaMeenakshi Jun 15, 2023
cf2f69d
snmpd to listen on loopback0 ip only if interface exists.
SuvarnaMeenakshi Jun 15, 2023
8b1359f
Update minigraph parser to update SNMP_AGENT_ADDRESS_CONFIG
SuvarnaMeenakshi Jun 21, 2023
6d0c64f
Add unit-test for minigraph change.
SuvarnaMeenakshi Jun 27, 2023
27ed71e
Update minigraph parser and add unit-test.
SuvarnaMeenakshi Jun 27, 2023
da40251
Moved logic to minigraph parser to add right IP addresses.
SuvarnaMeenakshi Jun 27, 2023
6859d0d
Remove logic to get docker0 ip.
SuvarnaMeenakshi Jun 27, 2023
e9cdf0a
Modify function name
SuvarnaMeenakshi Jun 27, 2023
40ba8f1
Modify to simpler change to easily backport to
SuvarnaMeenakshi Jun 29, 2023
15bf353
Merge remote-tracking branch 'origin/master' into HEAD
SuvarnaMeenakshi Jun 29, 2023
d1e4de4
Merge remote-tracking branch 'origin/master' into HEAD
SuvarnaMeenakshi Jul 10, 2023
817396c
Modify as per review comment
SuvarnaMeenakshi Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions dockers/docker-snmp/snmpd.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,36 @@
# AGENT BEHAVIOUR
#

# Listen for connections on all ip addresses, including eth0, ipv4 lo
# Listen for connections on all ip addresses, including eth0, ipv4 lo for multi-asic platform
# Listen on managment and loopback0 ips for single asic platform
#
{% macro protocol(ip_addr) %}
{%- if ':' in ip_addr -%}
SuvarnaMeenakshi marked this conversation as resolved.
Show resolved Hide resolved
{{ 'udp6' }}
{%- else -%}
{{ 'udp' }}
{%- endif -%}
{% endmacro %}

{% if SNMP_AGENT_ADDRESS_CONFIG %}
{% for (agentip, port, vrf) in SNMP_AGENT_ADDRESS_CONFIG %}
agentAddress {{ agentip }}{% if port %}:{{ port }}{% endif %}{% if vrf %}%{{ vrf }}{% endif %}{{ "" }}
agentAddress {{ protocol(agentip) }}:[{{ agentip }}]{% if port %}:{{ port }}{% endif %}{% if vrf %}%{{ vrf }}{% endif %}{{ "" }}
{% endfor %}
{% elif NAMESPACE_COUNT is not defined or NAMESPACE_COUNT|int <= 1 %}
{% if MGMT_INTERFACE is defined %}
{% for if, ip in MGMT_INTERFACE %}
{% set agentip = ip.split('/')[0] %}
agentAddress {{ protocol(agentip) }}:[{{ agentip }}]:161
{% endfor %}
{% endif %}
{% if LOOPBACK_INTERFACE is defined %}
{% for lo in LOOPBACK_INTERFACE %}
{% if lo | length == 2 %}
{% set agentip = lo[1].split('/')[0] %}
agentAddress {{ protocol(agentip) }}:[{{ agentip }}]:161
{% endif %}
{% endfor %}
{% endif %}
{% else %}
agentAddress udp:161
agentAddress udp6:161
Expand Down
3 changes: 3 additions & 0 deletions dockers/docker-snmp/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,14 @@ mkdir -p /etc/ssw /etc/snmp
# Parse snmp.yml and insert the data in Config DB
/usr/bin/snmp_yml_to_configdb.py

ADD_PARAM=$(printf '%s {"NAMESPACE_COUNT":"%s"}' "-a" "$NAMESPACE_COUNT")

SONIC_CFGGEN_ARGS=" \
-d \
-y /etc/sonic/sonic_version.yml \
-t /usr/share/sonic/templates/sysDescription.j2,/etc/ssw/sysDescription \
-t /usr/share/sonic/templates/snmpd.conf.j2,/etc/snmp/snmpd.conf \
$ADD_PARAM \
"

sonic-cfggen $SONIC_CFGGEN_ARGS
Expand Down