matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[dns] Do not apply dynamic DNS configuration when MGMT interface has static IP address. (#17769)

Browse Source 
### Why I did it
Fix the issue detected by[ TestStaticMgmtPortIP::test_dynamic_dns_not_working_when_static_ip_configured ](https://github.com/sonic-net/sonic-mgmt/blob/master/tests/dns/static_dns/test_static_dns.py#L105C9-L105C63) test.

### How I did it
Query MGMT interface configuration. Do not apply dynamic DNS configuration when MGMT interface has static IP address.

#### How to verify it
Run `tests/dns/static_dns/test_static_dns.py` sonic-mgmt tests.
This commit is contained in:
Oleksandr Ivantsiv 2024-01-23 16:29:55 -08:00 committed by GitHub
parent ff7c993060
commit c693e75f0f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
files/image_config/resolv-config/resolv-config.sh
View File

@ -14,13 +14,24 @@ start()
{ {
update_symlink update_symlink
redis-dump -d 4 -k "DNS_NAMESERVER*" -y > /tmp/dns.json has_static_mgmt_ip=false
if [[ $? -eq 0 && "$(cat /tmp/dns.json)" != "{}" ]]; then mgmt_ip_cfg=$(redis-dump -d 4 -k "MGMT_INTERFACE|eth0|*" -y)
if [[ $? -eq 0 && ${mgmt_ip_cfg} != "{}" ]]; then
has_static_mgmt_ip=true
fi
has_static_dns=false
dns_cfg=$(redis-dump -d 4 -k "DNS_NAMESERVER*" -y)
if [[ $? -eq 0 && ${dns_cfg} != "{}" ]]; then
has_static_dns=true
fi
if [[ ${has_static_mgmt_ip} == true || ${has_static_dns} == true ]]; then
# Apply static DNS configuration and disable updates # Apply static DNS configuration and disable updates
/sbin/resolvconf --disable-updates /sbin/resolvconf --disable-updates
pushd ${CONFIG_DIR} pushd ${CONFIG_DIR}
# Backup dynamic configuration to restore it when the static configuration is removed # Backup dynamic configuration to restore it when the static configuration is removed
mv ${DYNAMIC_CONFIG_FILE_TEMPLATE} ${WD} || true mv ${DYNAMIC_CONFIG_FILE_TEMPLATE} ${WD} 2>/dev/null || true
sonic-cfggen -d -t /usr/share/sonic/templates/resolv.conf.j2,${STATIC_CONFIG_FILE} sonic-cfggen -d -t /usr/share/sonic/templates/resolv.conf.j2,${STATIC_CONFIG_FILE}
@ -34,7 +45,7 @@ start()
pushd ${CONFIG_DIR} pushd ${CONFIG_DIR}
rm -f ${STATIC_CONFIG_FILE} rm -f ${STATIC_CONFIG_FILE}
# Restore dynamic configuration if it exists # Restore dynamic configuration if it exists
mv ${WD}/${DYNAMIC_CONFIG_FILE_TEMPLATE} ${CONFIG_DIR} || true mv ${WD}/${DYNAMIC_CONFIG_FILE_TEMPLATE} ${CONFIG_DIR} 2>/dev/null || true
/sbin/resolvconf --enable-updates /sbin/resolvconf --enable-updates
/sbin/resolvconf -u /sbin/resolvconf -u