Skip to content

Commit

Permalink
Update Readme to reflect FreeRangeRouting name
Browse files Browse the repository at this point in the history
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
  • Loading branch information
mwinter-osr committed Feb 1, 2017
1 parent 38c77cf commit deaaf98
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 34 deletions.
46 changes: 23 additions & 23 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions bgp_multiview_topo1/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Simple Quagga Route-Server Test
# Simple FreeRangeRouting Route-Server Test

## Topology
+----------+ +----------+ +----------+ +----------+ +----------+
Expand All @@ -23,7 +23,7 @@
|
| .254
+---------+---------+
| Quagga R1 |
| FRR R1 |
| BGP Multi-View |
| Peer 1-3 > View 1 |
| Peer 4-5 > View 2 |
Expand All @@ -37,7 +37,7 @@
~~ Stub Switch ~~
~~~~~~~~~~~~~

## Quagga Configuration
## FRR Configuration

Full config as used is in r1 subdirectory

Expand Down Expand Up @@ -92,7 +92,7 @@ Simplified `R1` config:

## Tests executed

### Check if Quagga is running
### Check if FRR is running

Test is executed by running

Expand Down
14 changes: 7 additions & 7 deletions ospf6-topo1/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand All @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down

0 comments on commit deaaf98

Please sign in to comment.