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

support DHCP{v4,v6} for UE IP assigment #262

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

support DHCP{v4,v6} for UE IP assigment #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0dea502
pass the requested IP protocol options into IP assigment
RoadRunnr Nov 16, 2020
427d1cb
add DHCPv4 pool support
RoadRunnr Nov 16, 2020
5c6721c
run travis tests with sudo
RoadRunnr Aug 7, 2020
9f6528c
implement IP lease expiry logic for DHCPv4
RoadRunnr Nov 17, 2020
2bb4d66
DHCP v6 pool
RoadRunnr Nov 17, 2020
7da09ff
basic DHCPv6 client
RoadRunnr Nov 17, 2020
53a23ab
implement DHCPv6 renew and rebind
RoadRunnr Nov 17, 2020
c9782c6
CI: add local IPv6 multicast route for DHCPv6 tests
RoadRunnr Nov 17, 2020
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
1 change: 1 addition & 0 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ build:otp-23.1:
- ip addr add fd96:dcd2:efdb:41c3::30/64 dev lo
- ip addr add fd96:dcd2:efdb:41c3::40/64 dev lo
- ip addr add fd96:dcd2:efdb:41c3::50/64 dev lo
- ip -6 route add ff01::/16 dev lo table local
- ./rebar3 do xref
- ./rebar3 do ct

Expand Down
5 changes: 4 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ env:
- secure: "JpJScMSO4Sqj4odjSFEpshqFk93ZyVkhMNNc9xh2yfRpkHFNXXnhLYhKLA/nr1gcd1f9jnWz++1cqa4MQXRGanDT3+iGNO12R/M3ZVT26ywV0QEmj6z/acsv5wC34hje8/zWAgKWBsIxswFVT+RRPzNOQNVq6JPLZSp014qX5P+ChwmPeCG2kY/od9fsftp7ZjqyhqOOlXGJeEInvF5SD1RqnVMYP2OEQnGQyAHg9aoczO1cZnpZSRQFTqtDzwG1lp21oqsk2IVSCTqXdD1+GNSZCV4oHddXwGJICN9klSHUnxKb7/rFwbVh090+wP7PA+4eqCOOCGIIePFRMDiux6wX07p4wFhtt6/ZGmOs+1kV9ZR4W9FP+rv/0LUlMpmd52WoWkn1kGA/fEr/Jff3n+PjcXd25W/ASeKciahhvXLudeoauP3/wB/3gfFBSnaVR1FvU10rAdL9X+W13z+UiL5C+1qDRjs/6OFpq0T4KfWkxxy1+9eG5J5u8gsKQ+1THvSerddGX77ZvnHu1m1A8z8fGF6toMUvR7EJvr/wpeVwRO/SOB03JYUYdeRnGYXYbOt4UE2ovh/g34mnxQptKW3Pk9aqT2x/Uamsn661tRJL7kVCGOnIUohh4Ynf2tniLbWsRorZlltcIxK4kaKuNfsV/gpvAaguDkeY0ul5AqM="

before_script:
- sudo sed -i '/^Defaults\tsecure_path.*$/ d' /etc/sudoers
- wget https://s3.amazonaws.com/rebar3/rebar3
- chmod u+x ./rebar3
# Add an IPv6 config - see the corresponding Travis issue
Expand All @@ -43,13 +44,15 @@ before_script:
sudo ip addr add fd96:dcd2:efdb:41c3::40/64 dev lo;
sudo ip addr add fd96:dcd2:efdb:41c3::50/64 dev lo;
sudo sh -c 'echo "::1 localhost ip6-localhost ip6-loopback" >> /etc/hosts';
sudo ip -6 route add ff01::/16 dev lo table local;
fi

script:
- ip -br addr
- source test/env.sh
- ./rebar3 compile
- ./rebar3 do xref, ct
- ./rebar3 xref
- sudo -E ./rebar3 ct
- (./rebar3 as test do coveralls send || /bin/true)
- (cd _build/test/logs/; zip -1r ../../../ct-logs.zip . )

Expand Down
2 changes: 2 additions & 0 deletions rebar.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
{prometheus_cowboy, "0.1.8"},
{erlando, {git, "https://github.com/travelping/erlando.git", {tag, "1.0.3"}}},
{netdata, {git, "https://github.com/RoadRunnr/erl_netdata.git", {ref, "cbd6eaf"}}},
{dhcp, {git, "https://github.com/RoadRunnr/dhcp.git", {branch, "feature/modernize"}}},
{dhcpv6, {git, "https://github.com/travelping/dhcpv6.git", {branch, "master"}}},
{gtplib, {git, "https://github.com/travelping/gtplib.git", {branch, "master"}}},
{pfcplib, {git, "https://github.com/travelping/pfcplib.git", {branch, "master"}}},
{ergw_aaa, {git, "git://github.com/travelping/ergw_aaa", {tag, "3.6.2"}}},
Expand Down
8 changes: 8 additions & 0 deletions rebar.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
[{<<"accept">>,{pkg,<<"accept">>,<<"0.3.5">>},2},
{<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.8.0">>},0},
{<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.9.1">>},1},
{<<"dhcp">>,
{git,"https://github.com/RoadRunnr/dhcp.git",
{ref,"31c51ec0014d363f435055e58574e6f725703940"}},
0},
{<<"dhcpv6">>,
{git,"https://github.com/travelping/dhcpv6.git",
{ref,"7733e242ffec329576e931acf500f53ecc418679"}},
0},
{<<"eradius">>,
{git,"https://github.com/travelping/eradius.git",
{ref,"7147d879177f3a9ad88f909a12e41e1c565269b0"}},
Expand Down
1 change: 1 addition & 0 deletions src/ergw.app.src
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
prometheus, cowboy, prometheus_cowboy,
prometheus_diameter_collector,
jsx, compiler, os_mon, jobs]},
{included_applications, [dhcp, dhcpv6]},
{mod, {ergw_app, []}},
{registered, []}
]}.
1 change: 1 addition & 0 deletions src/ergw_config.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
validate_options/4,
validate_apn_name/1,
check_unique_keys/2,
check_unique_elements/2,
validate_ip_cfg_opt/2,
opts_fold/3,
get_opt/3
Expand Down
Loading