Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
18 changes: 17 additions & 1 deletion dockers/docker-sonic-gnmi/gnmi-native.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

EXIT_TELEMETRY_VARS_FILE_NOT_FOUND=1
INCORRECT_TELEMETRY_VALUE=2
MIDPLANE_ADDRESS_NOT_FOUND=3
TELEMETRY_VARS_FILE=/usr/share/sonic/templates/telemetry_vars.j2
ESCAPE_QUOTE="'\''"

Expand Down Expand Up @@ -57,7 +58,22 @@ elif [ -n "$X509" ]; then
TELEMETRY_ARGS+=" --ca_crt $CA_CRT"
fi
else
TELEMETRY_ARGS+=" --noTLS --bind_address 127.0.0.1"
DEVICE_TYPE=$(sonic-db-cli CONFIG_DB hget "DEVICE_METADATA|localhost" "type")
SWITCH_TYPE=$(sonic-db-cli CONFIG_DB hget "DEVICE_METADATA|localhost" "switch_type")
if [[ x"${DEVICE_TYPE}" == x"SmartSwitchDPU" || x"${SWITCH_TYPE}" == x"dpu" ]]; then
for _ in {1..30}; do
MIDPLANE_ADDRESS=$(ip -4 -o addr show dev eth0-midplane 2>/dev/null | awk '{sub(/\/.*/, "", $4); print $4; exit}')
[[ -n "${MIDPLANE_ADDRESS}" ]] && break
sleep 1
done
if [[ -z "${MIDPLANE_ADDRESS}" ]]; then
echo "SmartSwitch DPU midplane IPv4 address not found" >&2
exit $MIDPLANE_ADDRESS_NOT_FOUND
fi
TELEMETRY_ARGS+=" --noTLS --bind_address ${MIDPLANE_ADDRESS} --allow_no_tls_link_local"
else
TELEMETRY_ARGS+=" --noTLS --bind_address 127.0.0.1"
fi
fi

# If no configuration entry exists for TELEMETRY, create one default port
Expand Down
18 changes: 17 additions & 1 deletion dockers/docker-sonic-telemetry/telemetry.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ fi

EXIT_TELEMETRY_VARS_FILE_NOT_FOUND=1
INCORRECT_TELEMETRY_VALUE=2
MIDPLANE_ADDRESS_NOT_FOUND=3
TELEMETRY_VARS_FILE=/usr/share/sonic/templates/telemetry_vars.j2
ESCAPE_QUOTE="'\''"

Expand Down Expand Up @@ -77,7 +78,22 @@ elif [ -n "$X509" ]; then
TELEMETRY_ARGS+=" --ca_crt $CA_CRT"
fi
else
TELEMETRY_ARGS+=" --noTLS --bind_address 127.0.0.1"
DEVICE_TYPE=$(sonic-db-cli CONFIG_DB hget "DEVICE_METADATA|localhost" "type")
SWITCH_TYPE=$(sonic-db-cli CONFIG_DB hget "DEVICE_METADATA|localhost" "switch_type")
if [[ x"${DEVICE_TYPE}" == x"SmartSwitchDPU" || x"${SWITCH_TYPE}" == x"dpu" ]]; then
for _ in {1..30}; do
MIDPLANE_ADDRESS=$(ip -4 -o addr show dev eth0-midplane 2>/dev/null | awk '{sub(/\/.*/, "", $4); print $4; exit}')
[[ -n "${MIDPLANE_ADDRESS}" ]] && break
sleep 1
done
if [[ -z "${MIDPLANE_ADDRESS}" ]]; then
echo "SmartSwitch DPU midplane IPv4 address not found" >&2
exit $MIDPLANE_ADDRESS_NOT_FOUND
fi
TELEMETRY_ARGS+=" --noTLS --bind_address ${MIDPLANE_ADDRESS} --allow_no_tls_link_local"
else
TELEMETRY_ARGS+=" --noTLS --bind_address 127.0.0.1"
fi
fi

# If no configuration entry exists for TELEMETRY, create one default port
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-gnmi
Loading