bgp-ecmp-topo1: Check number of routes received for convergence

Add check for number of routes to convergence. InQ=0, OutQ=0
together with correct number of routes received shows that
BGP has converged

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>

diff --git a/tests/topotests/bgp-ecmp-topo1/r1/summary.txt b/tests/topotests/bgp-ecmp-topo1/r1/summary.txt
index a39431ec79c2db1da363eb4615bfbd7d33463637..bccc483d5270269c3ffb0bb8d9fb732f6660b7cd 100644 (file)
--- a/tests/topotests/bgp-ecmp-topo1/r1/summary.txt
+++ b/tests/topotests/bgp-ecmp-topo1/r1/summary.txt
@@ -9,101 +9,121 @@
     "10.0.1.101":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.1.102":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.1.103":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.1.104":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.1.105":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.2.106":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.2.107":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.2.108":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.2.109":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.2.110":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.3.111":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.3.112":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.3.113":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.3.114":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.3.115":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.4.116":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.4.117":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.4.118":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.4.119":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.4.120":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     }
   },

diff --git a/tests/topotests/bgp-ecmp-topo1/r1/summary20.txt b/tests/topotests/bgp-ecmp-topo1/r1/summary20.txt
index 3486bc5c00c02fac20ac57f7a169ca740c5a4edc..73ae256abe765791fb4a9fbf3a7b4b28488d1ad5 100644 (file)
--- a/tests/topotests/bgp-ecmp-topo1/r1/summary20.txt
+++ b/tests/topotests/bgp-ecmp-topo1/r1/summary20.txt
@@ -8,101 +8,121 @@
     "10.0.1.101":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.1.102":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.1.103":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.1.104":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.1.105":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.2.106":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.2.107":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.2.108":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.2.109":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.2.110":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.3.111":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.3.112":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.3.113":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.3.114":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.3.115":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.4.116":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.4.117":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.4.118":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.4.119":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     },
     "10.0.4.120":{
       "outq":0,
       "inq":0,
+      "prefixReceivedCount":42,
       "state":"Established"
     }
   },