From: Martin Winter Date: Sat, 8 Apr 2017 10:39:47 +0000 (-0700) Subject: Update FreeRangeRouting -> FRRouting name X-Git-Tag: frr-7.1-dev~151^2~341 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=598d845766cbda09b25ea8b23415a8bc07392168;p=matthieu%2Ffrr.git Update FreeRangeRouting -> FRRouting name Signed-off-by: Martin Winter --- diff --git a/tests/topotests/README.md b/tests/topotests/README.md index 7e82a3fa4e..ce494d49eb 100644 --- a/tests/topotests/README.md +++ b/tests/topotests/README.md @@ -1,4 +1,4 @@ -# FreeRangeRouting Topology Tests with Mininet +# FRRouting Topology Tests with Mininet ## Installation of Mininet for running tests Only tested with Ubuntu 16.04 (which uses Mininet 2.2.0) @@ -36,7 +36,7 @@ Optional, will give better output 4. reboot (for options to take effect) -## FreeRangeRouting (FRR) Installation +## FRRouting (FRR) Installation FRR needs to be installed separatly. It is assume to be configured like the standard Ubuntu Packages: @@ -50,7 +50,7 @@ like the standard Ubuntu Packages: No FRR config needs to be done and no FRR daemons should be run ahead of the test. They are all started as part of the test -#### Manual FreeRangeRouting (FRR) build +#### Manual FRRouting (FRR) build If you prefer to manually build FRR, then use the following suggested config: @@ -72,7 +72,7 @@ And create frr User and frrvty group as follows: addgroup --system --gid 92 frr addgroup --system --gid 85 frrvty adduser --system --ingroup frr --home /var/run/frr/ \ - --gecos "FreeRangeRouting suite" --shell /bin/false frr + --gecos "FRRouting suite" --shell /bin/false frr usermod -G frrvty frr ## Executing Tests diff --git a/tests/topotests/ospf6-topo1/README.md b/tests/topotests/ospf6-topo1/README.md index e638550f4d..2369ab22f7 100644 --- a/tests/topotests/ospf6-topo1/README.md +++ b/tests/topotests/ospf6-topo1/README.md @@ -10,7 +10,7 @@ | ::1 | ::2 | +---------+---------+ +---------+---------+ | | R1 | | R2 | | - | FreeRangeRouting | | FreeRangeRouting | | + | FRRouting | | FRRouting | | | Rtr-ID: 10.0.0.1 | | Rtr-ID: 10.0.0.2 | | +---------+---------+ +---------+---------+ | | ::1 | ::2 \ @@ -26,7 +26,7 @@ | ::3 | SW3 - Stub Net 3 | +---------+---------+ /-+ fc00:3:3:3::/64 | | R3 | / | / - | FreeRangeRouting +--/ \---- / + | FRRouting +--/ \---- / | Rtr-ID: 10.0.0.3 | ::3 ___________/ +---------+---------+ \ | ::3 \ @@ -40,7 +40,7 @@ | ::4 / +---------+---------+ /---- | | R4 | | SW4 - Stub Net 4 | - | FreeRangeRouting +------+ fc00:4:4:4::/64 | + | FRRouting +------+ fc00:4:4:4::/64 | | Rtr-ID: 10.0.0.4 | ::4 | / +-------------------+ \---- / -----/ diff --git a/tests/topotests/ospf6-topo1/test_ospf6_topo1.py b/tests/topotests/ospf6-topo1/test_ospf6_topo1.py index 6da2e89780..963e49e719 100755 --- a/tests/topotests/ospf6-topo1/test_ospf6_topo1.py +++ b/tests/topotests/ospf6-topo1/test_ospf6_topo1.py @@ -34,7 +34,7 @@ test_ospf6_topo1.py: | ::1 | ::2 | +---------+---------+ +---------+---------+ | | R1 | | R2 | | -| FreeRangeRouting | | FreeRangeRouting | | +| FRRouting | | FRRouting | | | Rtr-ID: 10.0.0.1 | | Rtr-ID: 10.0.0.2 | | +---------+---------+ +---------+---------+ | | ::1 | ::2 \ @@ -50,7 +50,7 @@ test_ospf6_topo1.py: | ::3 | SW3 - Stub Net 3 | +---------+---------+ /-+ fc00:3:3:3::/64 | | R3 | / | / - | FreeRangeRouting +--/ \---- / + | FRRouting +--/ \---- / | Rtr-ID: 10.0.0.3 | ::3 ___________/ +---------+---------+ \ | ::3 \ @@ -64,7 +64,7 @@ test_ospf6_topo1.py: | ::4 / +---------+---------+ /---- | | R4 | | SW4 - Stub Net 4 | - | FreeRangeRouting +------+ fc00:4:4:4::/64 | + | FRRouting +------+ fc00:4:4:4::/64 | | Rtr-ID: 10.0.0.4 | ::4 | / +-------------------+ \---- / -----/