Skip to content

Commit

Permalink
treewide: update links to RIOT examples (#319)
Browse files Browse the repository at this point in the history
  • Loading branch information
mguetschow authored Feb 28, 2025
1 parent 7050968 commit 857e5d8
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion 04-single-hop-6lowpan-icmp/test_spec04.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from testutils.shell import ping6, lladdr, check_pktbuf


APP = 'examples/gnrc_networking'
APP = 'examples/networking/gnrc/gnrc_networking'
TASK10_APP = 'tests/net/gnrc_udp'
pytestmark = pytest.mark.rc_only()

Expand Down
2 changes: 1 addition & 1 deletion 05-single-hop-route/test_spec05.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from testutils.shell import ping6, lladdr, check_pktbuf


APP = 'examples/gnrc_networking'
APP = 'examples/networking/gnrc/gnrc_networking'
pytestmark = pytest.mark.rc_only()


Expand Down
6 changes: 3 additions & 3 deletions 08-interop/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ ip-addr
2023-04-14 15:23:36,735 # -- fe80::f6ce:36c6:d8d1:e340
```

8. For the RIOT side just use [gnrc_networking](https://github.com/RIOT-OS/RIOT/tree/master/examples/gnrc_networking). Get the link-local IP address with `ifconfig`:
8. For the RIOT side just use [gnrc_networking](https://github.com/RIOT-OS/RIOT/tree/master/examples/networking/gnrc/gnrc_networking). Get the link-local IP address with `ifconfig`:

```
2023-04-14 15:11:12,614 # ifconfig
Expand Down Expand Up @@ -344,7 +344,7 @@ The credentials for the WiFi network will be passed on the command line.
Replace `esp8266-esp-12x` with the esp* board of your choice, adjust `PORT` if needed.

```
USEMODULE="sock_dns gnrc_ipv6_nib_dns" make -C examples/gnrc_border_router BOARD=esp<...> UPLINK=wifi WIFI_SSID=<your_ssd> WIFI_PASS=<your_password> PORT=<port> flash term
USEMODULE="sock_dns gnrc_ipv6_nib_dns" make -C examples/networking/gnrc/gnrc_border_router BOARD=esp<...> UPLINK=wifi WIFI_SSID=<your_ssd> WIFI_PASS=<your_password> PORT=<port> flash term
```

### Result
Expand Down Expand Up @@ -413,7 +413,7 @@ Use the `sock_dns` and `gnrc_ipv6_nib_dns` modules to enable name resolution.
Replace `esp8266-esp-12x` with the esp* board of your choice, adjust `PORT` if needed.

```
USEMODULE="sock_dns gnrc_ipv6_nib_dns" make -C examples/gnrc_networking BOARD=esp<…> PORT=<port> flash term
USEMODULE="sock_dns gnrc_ipv6_nib_dns" make -C examples/networking/gnrc/gnrc_networking BOARD=esp<…> PORT=<port> flash term
```

### Result
Expand Down
2 changes: 1 addition & 1 deletion 08-interop/test_spec08.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from testutils.shell import lladdr, ping6, GNRCUDP


GNRC_APP = 'examples/gnrc_networking'
GNRC_APP = 'examples/networking/gnrc/gnrc_networking'
LWIP_APP = 'tests/pkg/lwip'
pytestmark = pytest.mark.rc_only()

Expand Down
10 changes: 5 additions & 5 deletions 09-coap/test_spec09.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def teardown_function(function):
@pytest.mark.skipif(not interface_exists("tap0"), reason="tap0 does not exist")
@pytest.mark.parametrize('nodes', [pytest.param(['native'])], indirect=['nodes'])
def test_task01(riot_ctrl, log_nodes):
node = riot_ctrl(0, 'examples/cord_ep', Shell, port=TAP)
node = riot_ctrl(0, 'examples/networking/cord/cord_ep', Shell, port=TAP)

node_netif, _ = lladdr(node.ifconfig_list())
node.ifconfig_add(node_netif, NODE_ULA)
Expand Down Expand Up @@ -116,7 +116,7 @@ def test_task01(riot_ctrl, log_nodes):
indirect=['nodes'],
)
def test_task02(riot_ctrl, start_server, expected):
node = riot_ctrl(0, 'examples/gcoap', Shell, port=TAP)
node = riot_ctrl(0, 'examples/networking/coap/gcoap', Shell, port=TAP)

node_netif, _ = lladdr(node.ifconfig_list())
node.ifconfig_add(node_netif, NODE_ULA)
Expand Down Expand Up @@ -145,7 +145,7 @@ async def run_task02_server():
@pytest.mark.skipif(not interface_exists("tap0"), reason="tap0 does not exist")
@pytest.mark.parametrize('nodes', [pytest.param(['native'])], indirect=['nodes'])
def test_task03(riot_ctrl):
node = riot_ctrl(0, 'examples/nanocoap_server', Shell, port=TAP)
node = riot_ctrl(0, 'examples/networking/coap/nanocoap_server', Shell, port=TAP)
host_netif = bridge(TAP)

# can't use shell interactions here, as there is no shell
Expand Down Expand Up @@ -192,7 +192,7 @@ async def client(host, block_size):
@pytest.mark.skipif(not interface_exists("tap0"), reason="tap0 does not exist")
@pytest.mark.parametrize('nodes', [pytest.param(['native'])], indirect=['nodes'])
def test_task04(riot_ctrl):
node = riot_ctrl(0, 'examples/nanocoap_server', Shell, port=TAP)
node = riot_ctrl(0, 'examples/networking/coap/nanocoap_server', Shell, port=TAP)
host_netif = bridge(TAP)

# can't use shell interactions here, as there is no shell
Expand Down Expand Up @@ -237,7 +237,7 @@ async def client(host, block_size):
@pytest.mark.skipif(not interface_exists("tap0"), reason="tap0 does not exist")
@pytest.mark.parametrize('nodes', [pytest.param(['native'])], indirect=['nodes'])
def test_task05(riot_ctrl):
node = riot_ctrl(0, 'examples/gcoap', Shell, port=TAP)
node = riot_ctrl(0, 'examples/networking/coap/gcoap', Shell, port=TAP)

node_netif, _ = lladdr(node.ifconfig_list())
node.ifconfig_add(node_netif, NODE_ULA)
Expand Down
2 changes: 1 addition & 1 deletion 10-icmpv6-error/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ hop link but not the second hop link via a native node from a Linux host.

$ GNRC_NETIF_NUMOF=2 USEMODULE="socket_zep netdev_tap" \
CFLAGS=-DGNRC_IPV6_NIB_CONF_SLAAC=1 TERMFLAGS="-z [::]:17755 tap0" \
make -C examples/gnrc_networking clean all term
make -C examples/networking/gnrc/gnrc_networking clean all term

4. Add `beef::/64` route via TAP interface on RIOT side:

Expand Down
2 changes: 1 addition & 1 deletion 10-icmpv6-error/test_spec10.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
)


APP = 'examples/gnrc_networking'
APP = 'examples/networking/gnrc/gnrc_networking'
TAP = 'tap0'
NETIF_PARSER = IfconfigListParser()

Expand Down
8 changes: 4 additions & 4 deletions 11-lorawan/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ LoRaWAN example is fully functional

### Testing procedure

Build and flash the `examples/lorawan` application with the following command
Build and flash the `examples/networking/misc/lorawan` application with the following command

$ make BOARD=<board> DEVEUI=<device eui> APPEUI=<application eui> APPKEY=<application key> -C examples/lorawan flash term
$ make BOARD=<board> DEVEUI=<device eui> APPEUI=<application eui> APPKEY=<application key> -C examples/networking/misc/lorawan flash term

_Note:_ The application can be tested on IoT-LAB with a device register on
TheThingsNetwork backend: start an experiment with one of the st-lrwan1 boards
Expand Down Expand Up @@ -199,9 +199,9 @@ send/receive LoRaWAN frames.

### Testing procedure

- Build and flash the `examples/gnrc_lorawan`
- Build and flash the `examples/networking/gnrc/gnrc_lorawan`

$ make BOARD=<board> -C examples/gnrc_lorawan flash term
$ make BOARD=<board> -C examples/networking/gnrc/gnrc_lorawan flash term

- Configure the device EUI, application EUI, application the `ifconfig` command

Expand Down
4 changes: 2 additions & 2 deletions 11-lorawan/test_spec11.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
from testutils.shell import check_pktbuf


GNRC_LORAWAN_APP = "examples/gnrc_lorawan"
LORAWAN_APP = "examples/lorawan"
GNRC_LORAWAN_APP = "examples/networking/gnrc/gnrc_lorawan"
LORAWAN_APP = "examples/networking/misc/lorawan"
SEMTECH_LORAMAC_APP = "tests/pkg/semtech-loramac"
pytestmark = pytest.mark.rc_only()

Expand Down
6 changes: 3 additions & 3 deletions testutils/shell.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class GNRCUDPClientSendParser(ShellInteractionParser):
"""
Shell interaction parser for
- $RIOTBASE/examples/gnrc_networking
- $RIOTBASE/examples/networking/gnrc/gnrc_networking
- $RIOTBASE/tests/net/gnrc_udp.
As the `udp` shell command is application specific, a central
Expand Down Expand Up @@ -78,7 +78,7 @@ class GNRCLoRaWANSend(ShellInteraction):
"""
Shell interaction for
- $RIOTBASE/examples/gnrc_lorawan
- $RIOTBASE/examples/networking/gnrc/gnrc_lorawan
As the `send` shell command is application specific, a central
ShellInteraction in `riotctrl_shell` does not make much sense
Expand All @@ -99,7 +99,7 @@ class GNRCUDP(ShellInteraction):
"""
Shell interaction for
- $RIOTBASE/examples/gnrc_networking
- $RIOTBASE/examples/networking/gnrc/gnrc_networking
- $RIOTBASE/tests/net/gnrc_udp.
As the `udp` shell command is application specific, a central
Expand Down

0 comments on commit 857e5d8

Please sign in to comment.