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

[updategraph]: Support a special value to use empty configuration (#1086)

Browse Source 
When updategraph service is enabled, a special value 'default'
from DHCP response will now initialize the system with an empty
configuration instead of existing minigraph.

A DHCP response without option 224 will remain the current behavior
of skipping graph update and use existing default minigraph.
This commit is contained in:
Taoyu Li 2017-10-27 18:01:02 -07:00 committed by Shuotian Cheng
parent c92b95383a
commit a7ea0556c8
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/dhcp/graphserviceurl
View File

@ -3,7 +3,7 @@ case $reason in
if [ -n "$new_minigraph_url" ]; then if [ -n "$new_minigraph_url" ]; then
echo $new_minigraph_url > /tmp/dhcp_graph_url echo $new_minigraph_url > /tmp/dhcp_graph_url
else else
echo "N/A" > /tmp/dhcp_graph_url echo "default" > /tmp/dhcp_graph_url
fi fi
if [ -n "$new_acl_url" ]; then if [ -n "$new_acl_url" ]; then
echo $new_acl_url > /tmp/dhcp_acl_url echo $new_acl_url > /tmp/dhcp_acl_url

22
files/image_config/updategraph/updategraph
View File

@ -20,14 +20,32 @@ if [ "$src" = "dhcp" ]; then
sleep 1 sleep 1
done done
if [ "`cat /tmp/dhcp_graph_url`" = "N/A" ]; then if [ "`cat /tmp/dhcp_graph_url`" = "default" ]; then
echo "No graph_url option in DHCP response. Skipping graph update." echo "No graph_url option in DHCP response. Skipping graph update and using existing minigraph."
if [ "$dhcp_as_static" = "true" ]; then if [ "$dhcp_as_static" = "true" ]; then
sed -i "/enabled=/d" /etc/sonic/updategraph.conf sed -i "/enabled=/d" /etc/sonic/updategraph.conf
echo "enabled=false" >> /etc/sonic/updategraph.conf echo "enabled=false" >> /etc/sonic/updategraph.conf
fi fi
exit 0 exit 0
fi fi
if [ "`cat /tmp/dhcp_graph_url`" = "N/A" ]; then
echo "'N/A' found in DHCP response. Skipping graph update and generating an empty configuration."
echo '{"DEVICE_METADATA":' > /tmp/device_meta.json
sonic-cfggen -m /etc/sonic/minigraph.xml --var-json DEVICE_METADATA >> /tmp/device_meta.json
echo '}' >> /tmp/device_meta.json
if [ -f /etc/sonic/init_cfg.json ]; then
sonic-cfggen -j /tmp/device_meta.json -j /etc/sonic/init_cfg.json --print-data > /etc/sonic/config_db.json
else
cp -f /tmp/device_meta.json /etc/sonic/config_db.json
fi
if [ "$dhcp_as_static" = "true" ]; then
sed -i "/enabled=/d" /etc/sonic/updategraph.conf
echo "enabled=false" >> /etc/sonic/updategraph.conf
fi
exit 0
fi
HOSTNAME=`hostname -s` HOSTNAME=`hostname -s`
GRAPH_URL=`sonic-cfggen -t /tmp/dhcp_graph_url -a "{\"hostname\": \"$HOSTNAME\"}"` GRAPH_URL=`sonic-cfggen -t /tmp/dhcp_graph_url -a "{\"hostname\": \"$HOSTNAME\"}"`