mirror of
https://github.com/genodelabs/genode.git
synced 2024-12-19 05:37:54 +00:00
f8953de7ac
BREAKS CONFIG COMPATIBILITY: This commit changes the configuration interface of the NIC router in a way that may break systems that use the component without proper adjustment! HOW TO ADJUST: At each occurrence of the '<uplink ...>' tag in a NIC router configuration replace the tag name 'uplink' with 'nic-client'. The rest of the tag stays the same. The term "uplink" for network interfaces in the router that have a NIC session client as back end was introduced in a time when Uplink sessions didn't yet exist. Now, they do and, although both an uplink and an Uplink session normally describe a network session between router and network device driver, they are based on two different service types (NIC and Uplink). This can easily cause confusion when integrating the router (the <uplink> is not related to Uplink sessions) or trying to understand its functioning (an 'Uplink' object has nothing to do with the Uplink service). Therefore, this commit introduces the more specific term "NIC client" for an interface that is based on a NIC session requested by the router. This doesn't imply any semantic changes at the NIC router. However, the commit also brings a broader update of the router's README and removes the term "downlink" that was used only in documentation to refer to interfaces backed by a NIC session provided by the router. The term was only associated with this meaning because it is the natural counterpart to an uplink. This isn't appropriate anymore as the terms for interface types have moved to a more technical level. The commit adjusts all scenarios in the basic Genode repositories properly. Fixes #4238
312 lines
7.2 KiB
PHP
312 lines
7.2 KiB
PHP
#
|
|
# See os/src/test/nic_router_dhcp/README for a documentation.
|
|
#
|
|
|
|
create_boot_directory
|
|
|
|
import_from_depot [depot_user]/src/[base_src]
|
|
|
|
set build_components {
|
|
|
|
init
|
|
server/dynamic_rom
|
|
test/nic_router_dhcp/client
|
|
server/nic_router
|
|
}
|
|
|
|
lappend_if [nic_router_2_managed] build_components test/nic_router_dhcp/manager
|
|
lappend_if [nic_router_2_managed] build_components server/report_rom
|
|
|
|
build $build_components
|
|
|
|
append config {
|
|
|
|
<config>
|
|
|
|
<parent-provides>
|
|
<service name="ROM"/>
|
|
<service name="IRQ"/>
|
|
<service name="IO_MEM"/>
|
|
<service name="IO_PORT"/>
|
|
<service name="PD"/>
|
|
<service name="RM"/>
|
|
<service name="CPU"/>
|
|
<service name="LOG"/>
|
|
</parent-provides>
|
|
|
|
<default-route>
|
|
<any-service> <parent/> <any-child/> </any-service>
|
|
</default-route>
|
|
<default caps="200"/>
|
|
|
|
<start name="timer">
|
|
<resource name="RAM" quantum="1M"/>
|
|
<provides><service name="Timer"/></provides>
|
|
</start>
|
|
|
|
<start name="dynamic_rom">
|
|
<resource name="RAM" quantum="4M"/>
|
|
<provides><service name="ROM"/> </provides>
|
|
<config verbose="yes">
|
|
<rom name="nic_router_1.config">
|
|
<inline>
|
|
|
|
<config>
|
|
|
|
<policy label="nic_router_2 -> " domain="downlink"/>
|
|
|
|
<domain name="downlink" interface="10.2.3.1/24">
|
|
|
|
<dhcp-server ip_first="10.2.3.2"
|
|
ip_last="10.2.3.2">
|
|
|
|
<dns-server ip="1.2.3.4"/>
|
|
<dns-server ip="2.3.4.5"/>
|
|
<dns-server ip="3.4.5.6"/>
|
|
|
|
</dhcp-server>
|
|
|
|
</domain>
|
|
|
|
</config>
|
|
|
|
</inline>
|
|
<sleep milliseconds="2000"/>
|
|
<inline>
|
|
|
|
<config>
|
|
|
|
<policy label="nic_router_2 -> " domain="downlink"/>
|
|
|
|
<domain name="downlink" interface="10.2.3.1/24">
|
|
|
|
<dhcp-server ip_first="10.2.3.2"
|
|
ip_last="10.2.3.2">
|
|
|
|
<dns-server ip="4.5.6.7"/>
|
|
<dns-server ip="5.6.7.8"/>
|
|
|
|
</dhcp-server>
|
|
|
|
</domain>
|
|
|
|
</config>
|
|
|
|
</inline>
|
|
<sleep milliseconds="2000"/>
|
|
<inline>
|
|
|
|
<config>
|
|
|
|
<policy label="nic_router_2 -> " domain="downlink"/>
|
|
|
|
<domain name="downlink" interface="10.2.4.1/24">
|
|
|
|
<dhcp-server ip_first="10.2.4.2"
|
|
ip_last="10.2.4.2">
|
|
|
|
<dns-server ip="6.7.8.9"/>
|
|
|
|
</dhcp-server>
|
|
|
|
</domain>
|
|
|
|
</config>
|
|
|
|
</inline>
|
|
<sleep milliseconds="2000"/>
|
|
<inline>
|
|
|
|
<config>
|
|
|
|
<policy label="nic_router_2 -> " domain="downlink"/>
|
|
|
|
<domain name="downlink" interface="10.2.4.1/24">
|
|
|
|
<dhcp-server ip_first="10.2.4.200"
|
|
ip_last="10.2.4.200">
|
|
|
|
</dhcp-server>
|
|
|
|
</domain>
|
|
|
|
</config>
|
|
|
|
</inline>
|
|
<sleep milliseconds="2000"/>
|
|
<inline>
|
|
|
|
<config>
|
|
|
|
<policy label="nic_router_2 -> " domain="downlink"/>
|
|
|
|
<domain name="downlink" interface="10.2.3.1/24">
|
|
|
|
<dhcp-server ip_first="10.2.3.2"
|
|
ip_last="10.2.3.2">
|
|
|
|
</dhcp-server>
|
|
|
|
</domain>
|
|
|
|
</config>
|
|
|
|
</inline>
|
|
<sleep milliseconds="2000"/>
|
|
|
|
</rom>
|
|
</config>
|
|
</start>
|
|
|
|
<start name="nic_router_1">
|
|
<binary name="nic_router"/>
|
|
<resource name="RAM" quantum="10M"/>
|
|
<provides>
|
|
<service name="Nic"/>
|
|
<service name="Uplink"/>
|
|
</provides>
|
|
<route>
|
|
<service name="ROM" label="config">
|
|
<child name="dynamic_rom" label="nic_router_1.config"/>
|
|
</service>
|
|
<any-service> <parent/> <any-child/> </any-service>
|
|
</route>
|
|
</start>
|
|
|
|
<start name="nic_router_2">
|
|
<binary name="nic_router"/>
|
|
<resource name="RAM" quantum="10M"/>
|
|
<provides>
|
|
<service name="Nic"/>
|
|
<service name="Uplink"/>
|
|
</provides>}
|
|
|
|
append_if [expr ![nic_router_2_managed]] config {
|
|
|
|
<config verbose_packets="no">
|
|
|
|
<policy label="test_client -> " domain="downlink"/>
|
|
<nic-client domain="uplink"/>
|
|
|
|
<domain name="uplink"/>
|
|
<domain name="downlink" interface="10.0.3.1/24">
|
|
|
|
<dhcp-server ip_first="10.0.3.2"
|
|
ip_last="10.0.3.2"
|
|
dns_server_from="uplink"/>
|
|
|
|
</domain>
|
|
|
|
</config>}
|
|
|
|
append config {
|
|
|
|
<route>
|
|
<service name="Nic"> <child name="nic_router_1"/> </service>}
|
|
|
|
append_if [nic_router_2_managed] config {
|
|
|
|
<service name="ROM" label="config">
|
|
<child name="report_rom"/>
|
|
</service>}
|
|
|
|
append config {
|
|
|
|
<any-service> <parent/> <any-child/> </any-service>
|
|
</route>
|
|
</start>
|
|
|
|
<start name="test_client">
|
|
<binary name="test-nic_router_dhcp-client"/>
|
|
<resource name="RAM" quantum="10M"/>
|
|
<config verbose="no"/>
|
|
<route>
|
|
<service name="Nic"> <child name="nic_router_2"/> </service>
|
|
<any-service> <parent/> <any-child/> </any-service>
|
|
</route>
|
|
</start>}
|
|
|
|
append_if [nic_router_2_managed] config {
|
|
|
|
<start name="report_rom">
|
|
<resource name="RAM" quantum="1M"/>
|
|
<provides> <service name="Report"/> <service name="ROM"/> </provides>
|
|
<config verbose="no">
|
|
<policy label="test_manager -> router_state"
|
|
report="nic_router_2 -> state"/>
|
|
|
|
<policy label="nic_router_2 -> config"
|
|
report="test_manager -> router_config"/>
|
|
</config>
|
|
</start>
|
|
|
|
<start name="test_manager">
|
|
<binary name="test-nic_router_dhcp-manager"/>
|
|
<resource name="RAM" quantum="1M"/>
|
|
<route>
|
|
<service name="ROM" label="router_state">
|
|
<child name="report_rom"/>
|
|
</service>
|
|
<service name="Report"> <child name="report_rom"/> </service>
|
|
<any-service> <parent/> <any-child/> </any-service>
|
|
</route>
|
|
</start>}
|
|
|
|
append config {
|
|
|
|
</config>}
|
|
|
|
install_config $config
|
|
|
|
set boot_modules {
|
|
|
|
init
|
|
dynamic_rom
|
|
nic_router
|
|
test-nic_router_dhcp-client
|
|
}
|
|
|
|
lappend_if [nic_router_2_managed] boot_modules test-nic_router_dhcp-manager
|
|
lappend_if [nic_router_2_managed] boot_modules report_rom
|
|
|
|
build_boot_image $boot_modules
|
|
|
|
append qemu_args " -nographic "
|
|
append_qemu_nic_args
|
|
|
|
append done_string ".*DHCP request completed:.*\n"
|
|
append done_string ".* IP lease time: 3600 seconds.*\n"
|
|
append done_string ".* Interface: 10.0.3.2/24.*\n"
|
|
append done_string ".* Router: 10.0.3.1.*\n"
|
|
append done_string ".* DNS server #1: 1.2.3.4.*\n"
|
|
append done_string ".* DNS server #2: 2.3.4.5.*\n"
|
|
append done_string ".* DNS server #3: 3.4.5.6.*\n"
|
|
append done_string ".*DHCP request completed:.*\n"
|
|
append done_string ".* IP lease time: 3600 seconds.*\n"
|
|
append done_string ".* Interface: 10.0.3.2/24.*\n"
|
|
append done_string ".* Router: 10.0.3.1.*\n"
|
|
append done_string ".* DNS server #1: 4.5.6.7.*\n"
|
|
append done_string ".* DNS server #2: 5.6.7.8.*\n"
|
|
append done_string ".*DHCP request completed:.*\n"
|
|
append done_string ".* IP lease time: 3600 seconds.*\n"
|
|
append done_string ".* Interface: 10.0.3.2/24.*\n"
|
|
append done_string ".* Router: 10.0.3.1.*\n"
|
|
append done_string ".* DNS server #1: 6.7.8.9.*\n"
|
|
append done_string ".*DHCP request completed:.*\n"
|
|
append done_string ".* IP lease time: 3600 seconds.*\n"
|
|
append done_string ".* Interface: 10.0.3.2/24.*\n"
|
|
append done_string ".* Router: 10.0.3.1.*\n"
|
|
append done_string ".*DHCP request completed:.*\n"
|
|
append done_string ".* IP lease time: 3600 seconds.*\n"
|
|
append done_string ".* Interface: 10.0.3.2/24.*\n"
|
|
append done_string ".* Router: 10.0.3.1.*\n"
|
|
append done_string ".*DHCP request completed:.*\n"
|
|
append done_string ".* IP lease time: 3600 seconds.*\n"
|
|
append done_string ".* Interface: 10.0.3.2/24.*\n"
|
|
append done_string ".* Router: 10.0.3.1.*\n"
|
|
append done_string ".* DNS server #1: 1.2.3.4.*\n"
|
|
append done_string ".* DNS server #2: 2.3.4.5.*\n"
|
|
append done_string ".* DNS server #3: 3.4.5.6.*\n"
|
|
|
|
run_genode_until $done_string 30
|