eigrp-topo1: Correct eigrp test results.

The values saved for the route table and eigrp topo
were a bit off because they have been corrected
in the eigrp daemon

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/tests/topotests/eigrp-topo1/r1/eigrpd.conf b/tests/topotests/eigrp-topo1/r1/eigrpd.conf
index 6fd361afa6cc46a250b8d3cdc42142605f4762ce..9994a634e472e6676ba54b49c984c56ff8918175 100644 (file)
--- a/tests/topotests/eigrp-topo1/r1/eigrpd.conf
+++ b/tests/topotests/eigrp-topo1/r1/eigrpd.conf
@@ -1,7 +1,7 @@
 log file /tmp/r1-eigrpd.log
 !
 router eigrp 1
- network 193.1.1.0/26
+ network 0.0.0.0/0
 !
 line vty
 !

diff --git a/tests/topotests/eigrp-topo1/r1/show_ip_eigrp.ref b/tests/topotests/eigrp-topo1/r1/show_ip_eigrp.ref
index 190a570df162c85c4f57c631cc26bf590857ab79..a2d7b3307d74c49319b7dc2668c2f7bf1e4548c6 100644 (file)
--- a/tests/topotests/eigrp-topo1/r1/show_ip_eigrp.ref
+++ b/tests/topotests/eigrp-topo1/r1/show_ip_eigrp.ref
@@ -6,5 +6,9 @@ Codes: P - Passive, A - Active, U - Update, Q - Query, R - Reply
 
 P  193.1.1.0/26, 1 successors, FD is 28160, serno: 0 
        via Connected, r1-eth1
+P  192.168.1.0/24, 1 successors, FD is 28160, serno: 0 
+       via Connected, r1-eth0
 P  193.1.2.0/24, 1 successors, FD is 30720, serno: 0 
        via 193.1.1.2 (30720/28160), r1-eth1
+P  192.168.3.0/24, 1 successors, FD is 33280, serno: 0 
+       via 193.1.1.2 (33280/30720), r1-eth1

diff --git a/tests/topotests/eigrp-topo1/r1/show_ip_route.ref b/tests/topotests/eigrp-topo1/r1/show_ip_route.ref
index 2e81211667b9cc0b543976b6276e100de0973baa..7f7a2fff95717a5d6a283737b7c5fa1b90bb7905 100644 (file)
--- a/tests/topotests/eigrp-topo1/r1/show_ip_route.ref
+++ b/tests/topotests/eigrp-topo1/r1/show_ip_route.ref
@@ -3,7 +3,9 @@ Codes: K - kernel route, C - connected, S - static, R - RIP,
        T - Table, v - VNC, V - VNC-Direct, A - Babel,
        > - selected route, * - FIB route
 
+E   192.168.1.0/24 [0/0] is directly connected, r1-eth0
 C>* 192.168.1.0/24 is directly connected, r1-eth0
+E>* 192.168.3.0/24 [0/0] via 193.1.1.2, r1-eth1
 E   193.1.1.0/26 [0/0] is directly connected, r1-eth1
 C>* 193.1.1.0/26 is directly connected, r1-eth1
 E>* 193.1.2.0/24 [0/0] via 193.1.1.2, r1-eth1

diff --git a/tests/topotests/eigrp-topo1/r2/show_ip_eigrp.ref b/tests/topotests/eigrp-topo1/r2/show_ip_eigrp.ref
new file mode 100644 (file)
index 0000000..cce49cd
--- /dev/null
+++ b/tests/topotests/eigrp-topo1/r2/show_ip_eigrp.ref
@@ -0,0 +1,14 @@
+
+EIGRP Topology Table for AS(1)/ID(193.1.2.1)
+
+Codes: P - Passive, A - Active, U - Update, Q - Query, R - Reply
+       r - reply Status, s - sia Status
+
+P  193.1.1.0/26, 1 successors, FD is 28160, serno: 0 
+       via Connected, r2-eth0
+P  192.168.1.0/24, 1 successors, FD is 30720, serno: 0 
+       via 193.1.1.1 (30720/28160), r2-eth0
+P  193.1.2.0/24, 1 successors, FD is 28160, serno: 0 
+       via Connected, r2-eth1
+P  192.168.3.0/24, 1 successors, FD is 30720, serno: 0 
+       via 193.1.2.2 (30720/28160), r2-eth1

diff --git a/tests/topotests/eigrp-topo1/r2/show_ip_route.ref b/tests/topotests/eigrp-topo1/r2/show_ip_route.ref
index c82247fb1e4c9902ef8bd2e6dc2e4ed616923c58..13ef7c61821b725628c1af68dbfcea141119a101 100644 (file)
--- a/tests/topotests/eigrp-topo1/r2/show_ip_route.ref
+++ b/tests/topotests/eigrp-topo1/r2/show_ip_route.ref
@@ -3,6 +3,8 @@ Codes: K - kernel route, C - connected, S - static, R - RIP,
        T - Table, v - VNC, V - VNC-Direct, A - Babel,
        > - selected route, * - FIB route
 
+E>* 192.168.1.0/24 [0/0] via 193.1.1.1, r2-eth0
+E>* 192.168.3.0/24 [0/0] via 193.1.2.2, r2-eth1
 E   193.1.1.0/26 [0/0] is directly connected, r2-eth0
 C>* 193.1.1.0/26 is directly connected, r2-eth0
 E   193.1.2.0/24 [0/0] is directly connected, r2-eth1

diff --git a/tests/topotests/eigrp-topo1/r3/eigrpd.conf b/tests/topotests/eigrp-topo1/r3/eigrpd.conf
index 10f939fa5bd4654930cbc9005476e5d8cfb36278..460b9f0133c3fd7df52b1000b436f02fd093951d 100644 (file)
--- a/tests/topotests/eigrp-topo1/r3/eigrpd.conf
+++ b/tests/topotests/eigrp-topo1/r3/eigrpd.conf
@@ -2,5 +2,5 @@ log file /tmp/r3-eigrpd.log
 !
 !
 router eigrp 1 
- network 193.1.2.0/24
+ network 0.0.0.0/0
 

diff --git a/tests/topotests/eigrp-topo1/r3/show_ip_eigrp.ref b/tests/topotests/eigrp-topo1/r3/show_ip_eigrp.ref
new file mode 100644 (file)
index 0000000..70f3d3f
--- /dev/null
+++ b/tests/topotests/eigrp-topo1/r3/show_ip_eigrp.ref
@@ -0,0 +1,14 @@
+
+EIGRP Topology Table for AS(1)/ID(193.1.2.2)
+
+Codes: P - Passive, A - Active, U - Update, Q - Query, R - Reply
+       r - reply Status, s - sia Status
+
+P  193.1.1.0/26, 1 successors, FD is 30720, serno: 0 
+       via 193.1.2.1 (30720/28160), r3-eth1
+P  192.168.1.0/24, 1 successors, FD is 33280, serno: 0 
+       via 193.1.2.1 (33280/30720), r3-eth1
+P  193.1.2.0/24, 1 successors, FD is 28160, serno: 0 
+       via Connected, r3-eth1
+P  192.168.3.0/24, 1 successors, FD is 28160, serno: 0 
+       via Connected, r3-eth0

diff --git a/tests/topotests/eigrp-topo1/r3/show_ip_route.ref b/tests/topotests/eigrp-topo1/r3/show_ip_route.ref
index ce1fcf71369c8e4a9e45d04af8deac191ec8060b..c12965c1a755dce90d932394e619785a72fd8a71 100644 (file)
--- a/tests/topotests/eigrp-topo1/r3/show_ip_route.ref
+++ b/tests/topotests/eigrp-topo1/r3/show_ip_route.ref
@@ -3,7 +3,9 @@ Codes: K - kernel route, C - connected, S - static, R - RIP,
        T - Table, v - VNC, V - VNC-Direct, A - Babel,
        > - selected route, * - FIB route
 
+E>* 192.168.1.0/24 [0/0] via 193.1.2.1, r3-eth1
 S>* 192.168.2.0/24 [1/0] via 192.168.3.10, r3-eth0
+E   192.168.3.0/24 [0/0] is directly connected, r3-eth0
 C>* 192.168.3.0/24 is directly connected, r3-eth0
 E>* 193.1.1.0/26 [0/0] via 193.1.2.1, r3-eth1
 E   193.1.2.0/24 [0/0] is directly connected, r3-eth1