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

Initial changes for dhcp to support eth0 in a mgmt vrf #2348

Merged
merged 9 commits into from
Jan 16, 2019
Merged

Initial changes for dhcp to support eth0 in a mgmt vrf #2348

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a6a7a73
Initial changes to support eth0 in a mgmt vrf
Dec 5, 2018
e3bbf9c
Initial changes to support eth0 in a mgmt vrf
Dec 5, 2018
d0d3514
Initial changes for dhcp to support eth0 in a mgmt vrf
Dec 7, 2018
04b5f64
Initial changes for dhcp to support eth0 in a mgmt vrf
Dec 7, 2018
21d13cc
Remove aboot check as it's not needed anymore with ifupdown2
Dec 7, 2018
0719225
Add dhclient exit hook description and license info.
Dec 7, 2018
5970ed9
Merge branch 'mgmt-vrf' of https://github.com/nikos-github/sonic-buil…
Jan 14, 2019
60044ee
Merge branch 'mgmt-vrf' of https://github.com/nikos-github/sonic-buil…
Jan 14, 2019
56aef27
Merge branch 'mgmt-vrf' of https://github.com/nikos-github/sonic-buil…
Jan 14, 2019
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
6 changes: 5 additions & 1 deletion build_debian.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install \
## Note: don't install python-apt by pip, older than Debian repo one
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install \
file \
ifupdown \
ifupdown2 \
iproute2 \
bridge-utils \
isc-dhcp-client \
Expand Down Expand Up @@ -220,6 +220,7 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
unzip \
gdisk \
sysfsutils \
squashfs-tools \
nikos-github marked this conversation as resolved.
Show resolved Hide resolved
grub2-common \
rsyslog \
ethtool \
Expand Down Expand Up @@ -328,6 +329,8 @@ set /files/etc/sysctl.conf/net.ipv6.conf.eth0.keep_addr_on_down 1

set /files/etc/sysctl.conf/net.ipv6.conf.eth0.accept_ra_defrtr 0

set /files/etc/sysctl.conf/net.ipv4.tcp_l3mdev_accept 1

set /files/etc/sysctl.conf/net.core.rmem_max 2097152
set /files/etc/sysctl.conf/net.core.wmem_max 2097152
" -r $FILESYSTEM_ROOT
Expand All @@ -352,6 +355,7 @@ sudo cp files/dhcp/rfc3442-classless-routes $FILESYSTEM_ROOT/etc/dhcp/dhclient-e
sudo cp files/dhcp/sethostname $FILESYSTEM_ROOT/etc/dhcp/dhclient-exit-hooks.d/
sudo cp files/dhcp/graphserviceurl $FILESYSTEM_ROOT/etc/dhcp/dhclient-exit-hooks.d/
sudo cp files/dhcp/snmpcommunity $FILESYSTEM_ROOT/etc/dhcp/dhclient-exit-hooks.d/
sudo cp files/dhcp/vrf $FILESYSTEM_ROOT/etc/dhcp/dhclient-exit-hooks.d/
nikos-github marked this conversation as resolved.
Show resolved Hide resolved
sudo cp files/dhcp/dhclient.conf $FILESYSTEM_ROOT/etc/dhcp/

## Version file
Expand Down
178 changes: 178 additions & 0 deletions files/dhcp/vrf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
get_vrf_arg()
nikos-github marked this conversation as resolved.
Show resolved Hide resolved
{
local vrf

vrf=$(echo $1 | tr -cd [:alnum:])
if [ "$vrf" != "$1" ]; then
echo "Invalid VRF" >&2
return 1
fi

echo $vrf
}

vrf_table()
{
local table_id
local vrf

vrf=$(get_vrf_arg ${1})
[ $? -ne 0 ] && return 1

vrf_exists $vrf
if [ $? -eq 0 ]; then
vrf_get_table $vrf
return 0
fi

# Maybe this is a device, not a vrf.
table_id=$(vrf_get_table_dev $vrf)
if [ $? -eq 0 ]; then
echo ${table_id}
return 0
fi

return 1
}

table_id=$(vrf_table ${interface})

if [ -n "${table_id}" ]; then

case "$reason" in
nikos-github marked this conversation as resolved.
Show resolved Hide resolved
BOUND|RENEW|REBIND|REBOOT)
if [ -z "$old_ip_address" ] ||
[ "$old_ip_address" != "$new_ip_address" ] ||
[ "$reason" = "BOUND" ] || [ "$reason" = "REBOOT" ]; then
# If we have $new_rfc3442_classless_static_routes then we have to
# ignore $new_routers entirely.
if [ ! "$new_rfc3442_classless_static_routes" ]; then
# Set if_metric if IF_METRIC is set or there's more than one router.
if_metric="$IF_METRIC"
if [ "${new_routers%% *}" != "${new_routers}" ]; then
if_metric=${if_metric:-1}
fi

for router in $new_routers; do
if [ "$new_subnet_mask" = "255.255.255.255" ]; then
# Set explicit route for p2p connection.
ip -4 route add table ${table_id} ${router} dev $interface >/dev/null 2>&1
fi

# Remove old default route should it remain from dhclient-script.
ip -4 route del default via ${router} dev ${interface} \
${if_metric:+metric $if_metric} >/dev/null 2>&1

# Set default route.
ip -4 route add table ${table_id} default via ${router} dev ${interface} \
${if_metric:+metric $if_metric} >/dev/null 2>&1

if [ -n "$if_metric" ]; then
if_metric=$((if_metric+1))
fi
done
else
set -- $new_rfc3442_classless_static_routes

while [ $# -gt 0 ]; do
net_length=$1
via_arg=''

case $net_length in
32|31|30|29|28|27|26|25)
if [ $# -lt 9 ]; then
return 1
fi
net_address="${2}.${3}.${4}.${5}"
gateway="${6}.${7}.${8}.${9}"
shift 9
;;
24|23|22|21|20|19|18|17)
if [ $# -lt 8 ]; then
return 1
fi
net_address="${2}.${3}.${4}.0"
gateway="${5}.${6}.${7}.${8}"
shift 8
;;
16|15|14|13|12|11|10|9)
if [ $# -lt 7 ]; then
return 1
fi
net_address="${2}.${3}.0.0"
gateway="${4}.${5}.${6}.${7}"
shift 7
;;
8|7|6|5|4|3|2|1)
if [ $# -lt 6 ]; then
return 1
fi
net_address="${2}.0.0.0"
gateway="${3}.${4}.${5}.${6}"
shift 6
;;
0) # default route
if [ $# -lt 5 ]; then
return 1
fi
net_address="0.0.0.0"
gateway="${2}.${3}.${4}.${5}"
shift 5
;;
*) # error
return 1
;;
esac

# Take care of link-local routes.
if [ "${gateway}" != '0.0.0.0' ]; then
via_arg="via ${gateway}"
fi

# Set route (ip detects host routes automatically).
ip -4 route add table ${table_id} "${net_address}/${net_length}" \
${via_arg} dev "${interface}" >/dev/null 2>&1
done
fi
fi

if [ -n "$alias_ip_address" ] &&
[ "$new_ip_address" != "$alias_ip_address" ]; then
ip -4 route add table ${table_id} ${alias_ip_address} dev ${interface} >/dev/null 2>&1
fi
;;

EXPIRE|FAIL|RELEASE|STOP)
if [ -n "$alias_ip_address" ]; then
ip -4 route add table ${table_id} ${alias_ip_address} dev ${interface} >/dev/null 2>&1
fi

;;

TIMEOUT)
nikos-github marked this conversation as resolved.
Show resolved Hide resolved
# If there is no router recorded in the lease or the 1st router answers pings.
if [ -z "$new_routers" ] || ping -q -c 1 "${new_routers%% *}"; then
# If we have $new_rfc3442_classless_static_routes then we have to
# ignore $new_routers entirely.
if [ ! "$new_rfc3442_classless_static_routes" ]; then
if [ -n "$alias_ip_address" ] &&
[ "$new_ip_address" != "$alias_ip_address" ]; then
ip -4 route add table ${table_id} ${alias_ip_address} dev ${interface} >/dev/null 2>&1
fi

# Set default route.
for router in $new_routers; do
ip -4 route add table ${table_id} default via ${router} dev ${interface} \
${if_metric:+metric $if_metric} >/dev/null 2>&1

if [ -n "$if_metric" ]; then
if_metric=$((if_metric+1))
fi
done
fi
fi

;;
esac

fi