From deaaf9808683013b7fe0f7627efcd7f1032c5dc4 Mon Sep 17 00:00:00 2001 From: Martin Winter Date: Wed, 1 Feb 2017 08:07:53 -0800 Subject: [PATCH] Update Readme to reflect FreeRangeRouting name Signed-off-by: Martin Winter --- README.md | 46 +++++++++++++++++------------------ bgp_multiview_topo1/README.md | 8 +++--- ospf6-topo1/README.md | 14 +++++------ 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 69548f557715..321a04bfa8e9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Quagga Topology Tests with Mininet +# FreeRangeRouting Topology Tests with Mininet ## Installation of Mininet for running tests Only tested with Ubuntu 16.04 (which uses Mininet 2.2.0) @@ -36,44 +36,44 @@ Optional, will give better output 4. reboot (for options to take effect) -## Quagga Installation +## FreeRangeRouting (FRR) Installation Quagga needs to be installed separatly. It is assume to be configured like the standard Ubuntu Packages: -- Binaries in /usr/lib/quagga -- State Directory /var/run/quagga -- Running under user quagga, group quagga -- vtygroup: quaggavty -- config directory: /etc/quagga -- For Quagga Packages, install the dbg package as well for coredump decoding +- Binaries in /usr/lib/frr +- State Directory /var/run/frr +- Running under user frr, group frr +- vtygroup: frrvty +- config directory: /etc/frr +- For FRR Packages, install the dbg package as well for coredump decoding -No Quagga config needs to be done and no Quagga daemons should be run ahead +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 Quagga build +#### Manual FreeRangeRouting (FRR) build -If you prefer to manually build Quagga, then use the following suggested config: +If you prefer to manually build FRR, then use the following suggested config: ./configure \ --prefix=/usr \ - --localstatedir=/var/run/quagga \ - --sbindir=/usr/lib/quagga \ - --sysconfdir=/etc/quagga \ + --localstatedir=/var/run/frr \ + --sbindir=/usr/lib/frr \ + --sysconfdir=/etc/frr \ --enable-vtysh \ --enable-pimd \ --enable-multipath=64 \ - --enable-user=quagga \ - --enable-group=quagga \ - --enable-vty-group=quaggavty \ + --enable-user=frr \ + --enable-group=frr \ + --enable-vty-group=frrvty \ --with-pkg-extra-version=-my-manual-build -And create Quagga User and Quaggavty group as follows: +And create frr User and frrvty group as follows: - addgroup --system --gid 92 quagga - addgroup --system --gid 85 quaggavty - usermod -G quaggavty quagga - adduser --system --ingroup quagga --home /var/run/quagga/ \ - --gecos "Quagga routing suite" --shell /bin/false quagga + addgroup --system --gid 92 frr + addgroup --system --gid 85 frrvty + usermod -G frrvty frr + adduser --system --ingroup frr --home /var/run/frr/ \ + --gecos "FreeRangeRouting suite" --shell /bin/false frr ## Executing Tests diff --git a/bgp_multiview_topo1/README.md b/bgp_multiview_topo1/README.md index 79bbb36b6b3d..4ae6c1e699c3 100644 --- a/bgp_multiview_topo1/README.md +++ b/bgp_multiview_topo1/README.md @@ -1,4 +1,4 @@ -# Simple Quagga Route-Server Test +# Simple FreeRangeRouting Route-Server Test ## Topology +----------+ +----------+ +----------+ +----------+ +----------+ @@ -23,7 +23,7 @@ | | .254 +---------+---------+ - | Quagga R1 | + | FRR R1 | | BGP Multi-View | | Peer 1-3 > View 1 | | Peer 4-5 > View 2 | @@ -37,7 +37,7 @@ ~~ Stub Switch ~~ ~~~~~~~~~~~~~ -## Quagga Configuration +## FRR Configuration Full config as used is in r1 subdirectory @@ -92,7 +92,7 @@ Simplified `R1` config: ## Tests executed -### Check if Quagga is running +### Check if FRR is running Test is executed by running diff --git a/ospf6-topo1/README.md b/ospf6-topo1/README.md index 864c8e9ede21..e638550f4db4 100644 --- a/ospf6-topo1/README.md +++ b/ospf6-topo1/README.md @@ -10,7 +10,7 @@ | ::1 | ::2 | +---------+---------+ +---------+---------+ | | R1 | | R2 | | - | Quagga | | Quagga | | + | FreeRangeRouting | | FreeRangeRouting | | | 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 | / | / - | Quagga +--/ \---- / + | FreeRangeRouting +--/ \---- / | Rtr-ID: 10.0.0.3 | ::3 ___________/ +---------+---------+ \ | ::3 \ @@ -40,12 +40,12 @@ | ::4 / +---------+---------+ /---- | | R4 | | SW4 - Stub Net 4 | - | Quagga +------+ fc00:4:4:4::/64 | + | FreeRangeRouting +------+ fc00:4:4:4::/64 | | Rtr-ID: 10.0.0.4 | ::4 | / +-------------------+ \---- / -----/ -## Quagga Configuration +## FRR Configuration Full config as used is in r1 / r2 / r3 / r4 / r5 subdirectories @@ -98,13 +98,13 @@ Simplified `R3` config ## Tests executed -### Check if Quagga is running +### Check if FRR is running Test is executed by running vtysh -c "show log" | grep "Logging configuration for" -on each quagga router. This should return the logging information for all daemons registered +on each FRR router. This should return the logging information for all daemons registered to Zebra and the list of running daemons is compared to the daemons started for this test (`zebra` and `ospf6d`) ### Verify for OSPFv3 to converge @@ -125,7 +125,7 @@ on each node and comparing the result to the stored example config (see `show_ip ### Verifying Linux Kernel Routing Table -Linux Kernel IPv6 Routing table is verified on each Quagga node with +Linux Kernel IPv6 Routing table is verified on each FRR node with ip -6 route