tests: Make ospf convergence predictable by setting if priority

Added OSPF priorities to force a predictable DR/Backup router selection

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

32 files changed, 85 insertions, 69 deletions

diff --git a/tests/topotests/bgp_features/r1/ospf6d.conf b/tests/topotests/bgp_features/r1/ospf6d.conf
index 532da39fb..a38e4b862 100644
--- a/tests/topotests/bgp_features/r1/ospf6d.conf
+++ b/tests/topotests/bgp_features/r1/ospf6d.conf
@@ -4,17 +4,16 @@ debug ospf6 neighbor
 !
 interface r1-lo
 !
-interface r1-eth0
-!
 interface r1-eth1
+ ipv6 ospf6 priority 10
 !
 interface r1-eth2
+ ipv6 ospf6 priority 10
 !
 router ospf6
  ospf6 router-id 192.168.0.1
  log-adjacency-changes
  interface r1-lo area 0.0.0.0
- interface r1-eth0 area 0.0.0.0
  interface r1-eth1 area 0.0.0.0
  interface r1-eth2 area 0.0.0.0
 !
diff --git a/tests/topotests/bgp_features/r1/ospf_neighbor.json b/tests/topotests/bgp_features/r1/ospf_neighbor.json
index ecb97d8d7..e742c119d 100644
--- a/tests/topotests/bgp_features/r1/ospf_neighbor.json
+++ b/tests/topotests/bgp_features/r1/ospf_neighbor.json
@@ -2,14 +2,14 @@
   "neighbors":{
     "192.168.0.2":[
       {
-        "priority":1,
-        "state":"Full\/DR"
+        "priority":5,
+        "state":"Full\/Backup"
       }
     ],
     "192.168.0.3":[
       {
-        "priority":1,
-        "state":"Full\/DR"
+        "priority":5,
+        "state":"Full\/Backup"
       }
     ]
   }
diff --git a/tests/topotests/bgp_features/r1/ospfd.conf b/tests/topotests/bgp_features/r1/ospfd.conf
index 8f1711db7..68a1bb5c7 100644
--- a/tests/topotests/bgp_features/r1/ospfd.conf
+++ b/tests/topotests/bgp_features/r1/ospfd.conf
@@ -3,6 +3,16 @@ log file ospfd.log
 debug ospf event
 debug ospf zebra
 !
+interface r1-eth1
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
+ ip ospf priority 10
+!
+interface r1-eth2
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
+ ip ospf priority 10
+!
 router ospf
  ospf router-id 192.168.0.1
  log-adjacency-changes
@@ -13,11 +23,4 @@ router ospf
  refresh timer 10
 !
 line vty
-interface r1-eth1
- ip ospf hello-interval 2
- ip ospf dead-interval 10
-!
-interface r1-eth2
- ip ospf hello-interval 2
- ip ospf dead-interval 10
 !
diff --git a/tests/topotests/bgp_features/r2/ospf6d.conf b/tests/topotests/bgp_features/r2/ospf6d.conf
index 283d20548..47bd5a99c 100644
--- a/tests/topotests/bgp_features/r2/ospf6d.conf
+++ b/tests/topotests/bgp_features/r2/ospf6d.conf
@@ -4,17 +4,16 @@ debug ospf6 neighbor
 !
 interface r2-lo
 !
-interface r2-eth0
-!
 interface r2-eth1
+ ipv6 ospf6 priority 5
 !
 interface r2-eth2
+ ipv6 ospf6 priority 10
 !
 router ospf6
  ospf6 router-id 192.168.0.2
  log-adjacency-changes
  interface r2-lo area 0.0.0.0
- interface r2-eth0 area 0.0.0.0
  interface r2-eth1 area 0.0.0.0
  interface r2-eth2 area 0.0.0.0
 !
diff --git a/tests/topotests/bgp_features/r2/ospf_neighbor.json b/tests/topotests/bgp_features/r2/ospf_neighbor.json
index 5fcbd82ee..2fd589ae2 100644
--- a/tests/topotests/bgp_features/r2/ospf_neighbor.json
+++ b/tests/topotests/bgp_features/r2/ospf_neighbor.json
@@ -2,14 +2,14 @@
   "neighbors":{
     "192.168.0.1":[
       {
-        "priority":1,
-        "state":"Full\/Backup"
+        "priority":10,
+        "state":"Full\/DR"
       }
     ],
     "192.168.0.3":[
       {
-        "priority":1,
-        "state":"Full\/DR"
+        "priority":5,
+        "state":"Full\/Backup"
       }
     ]
   }
diff --git a/tests/topotests/bgp_features/r2/ospfd.conf b/tests/topotests/bgp_features/r2/ospfd.conf
index 2174fddb1..6f608e454 100644
--- a/tests/topotests/bgp_features/r2/ospfd.conf
+++ b/tests/topotests/bgp_features/r2/ospfd.conf
@@ -3,6 +3,16 @@ log file ospfd.log
 debug ospf event
 debug ospf zebra
 !
+int r2-eth1
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
+ ip ospf priority 5
+!
+int r2-eth2
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
+ ip ospf priority 10
+!
 router ospf
  ospf router-id 192.168.0.2
  log-adjacency-changes
@@ -12,12 +22,5 @@ router ospf
  timers throttle lsa all 0
  refresh timer 10
 !
-int r2-eth1
- ip ospf hello-interval 2
- ip ospf dead-interval 10
-int r2-eth2
- ip ospf hello-interval 2
- ip ospf dead-interval 10
-!
 line vty
 !
diff --git a/tests/topotests/bgp_features/r3/ospf6d.conf b/tests/topotests/bgp_features/r3/ospf6d.conf
index 7a6623f97..eb74901ba 100644
--- a/tests/topotests/bgp_features/r3/ospf6d.conf
+++ b/tests/topotests/bgp_features/r3/ospf6d.conf
@@ -4,17 +4,16 @@ debug ospf6 neighbor
 !
 interface r3-lo
 !
-interface r3-eth0
-!
 interface r3-eth1
+ ipv6 ospf6 priority 5
 !
 interface r3-eth2
+ ipv6 ospf6 priority 5
 !
 router ospf6
  ospf6 router-id 192.168.0.3
  log-adjacency-changes
  interface r3-lo area 0.0.0.0
- interface r3-eth0 area 0.0.0.0
  interface r3-eth1 area 0.0.0.0
  interface r3-eth2 area 0.0.0.0
 !
diff --git a/tests/topotests/bgp_features/r3/ospf_neighbor.json b/tests/topotests/bgp_features/r3/ospf_neighbor.json
index e90a70a8f..80fc92c3b 100644
--- a/tests/topotests/bgp_features/r3/ospf_neighbor.json
+++ b/tests/topotests/bgp_features/r3/ospf_neighbor.json
@@ -2,14 +2,14 @@
   "neighbors":{
     "192.168.0.1":[
       {
-        "priority":1,
-        "state":"Full\/Backup"
+        "priority":10,
+        "state":"Full\/DR"
       }
     ],
     "192.168.0.2":[
       {
-        "priority":1,
-        "state":"Full\/Backup"
+        "priority":10,
+        "state":"Full\/DR"
       }
     ]
   }
diff --git a/tests/topotests/bgp_features/r3/ospfd.conf b/tests/topotests/bgp_features/r3/ospfd.conf
index 795344fbe..71e4f1e1d 100644
--- a/tests/topotests/bgp_features/r3/ospfd.conf
+++ b/tests/topotests/bgp_features/r3/ospfd.conf
@@ -3,6 +3,16 @@ log file ospfd.log
 debug ospf event
 debug ospf zebra
 !
+int r3-eth1
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
+ ip ospf priority 5
+!
+int r3-eth2
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
+ ip ospf priority 5
+!
 router ospf
  ospf router-id 192.168.0.3
  log-adjacency-changes
@@ -12,12 +22,5 @@ router ospf
  timers throttle lsa all 0
  refresh timer 10
 !
-int r3-eth1
-  ip ospf hello-interval 2
-  ip ospf dead-interval 10
-int r3-eth2
-  ip ospf hello-interval 2
-  ip ospf dead-interval 10
-!
 line vty
 !
diff --git a/tests/topotests/ldp-oc-acl-topo1/r1/ospfd.conf b/tests/topotests/ldp-oc-acl-topo1/r1/ospfd.conf
index 87d5703d9..877e14ff3 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r1/ospfd.conf
+++ b/tests/topotests/ldp-oc-acl-topo1/r1/ospfd.conf
@@ -8,4 +8,5 @@ router ospf
 int r1-eth0
  ip ospf hello-interval 2
  ip ospf dead-interval 10
+ ip ospf priority 1
 !
diff --git a/tests/topotests/ldp-oc-acl-topo1/r1/show_ip_ospf_neighbor.json b/tests/topotests/ldp-oc-acl-topo1/r1/show_ip_ospf_neighbor.json
index 2c493173f..aa3f74fc5 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r1/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp-oc-acl-topo1/r1/show_ip_ospf_neighbor.json
@@ -2,7 +2,7 @@
   "neighbors":{
     "2.2.2.2":[
       {
-        "priority":1,
+        "priority":2,
         "state":"Full\/DR",
         "address":"10.0.1.2",
         "ifaceName":"r1-eth0:10.0.1.1"
diff --git a/tests/topotests/ldp-oc-acl-topo1/r2/ospfd.conf b/tests/topotests/ldp-oc-acl-topo1/r2/ospfd.conf
index 51317202b..8cba1529e 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r2/ospfd.conf
+++ b/tests/topotests/ldp-oc-acl-topo1/r2/ospfd.conf
@@ -8,8 +8,10 @@ router ospf
 int r2-eth0
  ip ospf hello-interval 2
  ip ospf dead-interval 10
+ ip ospf priority 2
 !
 int r2-eth1
  ip ospf hello-interval 2
  ip ospf dead-interval 10
+ ip ospf priority 1
 !
diff --git a/tests/topotests/ldp-oc-acl-topo1/r2/show_ip_ospf_neighbor.json b/tests/topotests/ldp-oc-acl-topo1/r2/show_ip_ospf_neighbor.json
index 55f12359e..aa6819895 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r2/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp-oc-acl-topo1/r2/show_ip_ospf_neighbor.json
@@ -5,15 +5,12 @@
         "priority":1,
         "state":"Full\/Backup",
         "address":"10.0.1.1",
-        "ifaceName":"r2-eth0:10.0.1.2",
-        "retransmitCounter":0,
-        "requestCounter":0,
-        "dbSummaryCounter":0
+        "ifaceName":"r2-eth0:10.0.1.2"
       }
     ],
     "3.3.3.3":[
       {
-        "priority":1,
+        "priority":2,
         "state":"Full\/Backup",
         "address":"10.0.2.3",
         "ifaceName":"r2-eth1:10.0.2.2"
@@ -21,7 +18,7 @@
     ],
     "4.4.4.4":[
       {
-        "priority":1,
+        "priority":3,
         "state":"Full\/DR",
         "address":"10.0.2.4",
         "ifaceName":"r2-eth1:10.0.2.2"
diff --git a/tests/topotests/ldp-oc-acl-topo1/r3/ospfd.conf b/tests/topotests/ldp-oc-acl-topo1/r3/ospfd.conf
index 4566976b7..0d3a74c4a 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r3/ospfd.conf
+++ b/tests/topotests/ldp-oc-acl-topo1/r3/ospfd.conf
@@ -9,4 +9,5 @@ router ospf
 int r3-eth0
  ip ospf hello-interval 2
  ip ospf dead-interval 10
+ ip ospf priority 2
 !
diff --git a/tests/topotests/ldp-oc-acl-topo1/r3/show_ip_ospf_neighbor.json b/tests/topotests/ldp-oc-acl-topo1/r3/show_ip_ospf_neighbor.json
index 24502ed81..905774fc4 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r3/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp-oc-acl-topo1/r3/show_ip_ospf_neighbor.json
@@ -10,7 +10,7 @@
     ],
     "4.4.4.4":[
       {
-        "priority":1,
+        "priority":3,
         "state":"Full\/DR",
         "address":"10.0.2.4",
         "ifaceName":"r3-eth0:10.0.2.3"
diff --git a/tests/topotests/ldp-oc-acl-topo1/r4/ospfd.conf b/tests/topotests/ldp-oc-acl-topo1/r4/ospfd.conf
index 5aae885a1..7bbd228d0 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r4/ospfd.conf
+++ b/tests/topotests/ldp-oc-acl-topo1/r4/ospfd.conf
@@ -8,4 +8,5 @@ router ospf
 int r4-eth0
  ip ospf hello-interval 2
  ip ospf dead-interval 10
+ ip ospf priority 3
 !
diff --git a/tests/topotests/ldp-oc-acl-topo1/r4/show_ip_ospf_neighbor.json b/tests/topotests/ldp-oc-acl-topo1/r4/show_ip_ospf_neighbor.json
index 794410522..67593952c 100644
--- a/tests/topotests/ldp-oc-acl-topo1/r4/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp-oc-acl-topo1/r4/show_ip_ospf_neighbor.json
@@ -11,7 +11,7 @@
     ],
     "3.3.3.3":[
       {
-        "priority":1,
+        "priority":2,
         "state":"Full\/Backup",
         "address":"10.0.2.3",
         "ifaceName":"r4-eth0:10.0.2.4"
diff --git a/tests/topotests/ldp-oc-topo1/r1/ospfd.conf b/tests/topotests/ldp-oc-topo1/r1/ospfd.conf
index 87d5703d9..877e14ff3 100644
--- a/tests/topotests/ldp-oc-topo1/r1/ospfd.conf
+++ b/tests/topotests/ldp-oc-topo1/r1/ospfd.conf
@@ -8,4 +8,5 @@ router ospf
 int r1-eth0
  ip ospf hello-interval 2
  ip ospf dead-interval 10
+ ip ospf priority 1
 !
diff --git a/tests/topotests/ldp-oc-topo1/r1/show_ip_ospf_neighbor.json b/tests/topotests/ldp-oc-topo1/r1/show_ip_ospf_neighbor.json
index 2c493173f..aa3f74fc5 100644
--- a/tests/topotests/ldp-oc-topo1/r1/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp-oc-topo1/r1/show_ip_ospf_neighbor.json
@@ -2,7 +2,7 @@
   "neighbors":{
     "2.2.2.2":[
       {
-        "priority":1,
+        "priority":2,
         "state":"Full\/DR",
         "address":"10.0.1.2",
         "ifaceName":"r1-eth0:10.0.1.1"
diff --git a/tests/topotests/ldp-oc-topo1/r2/ospfd.conf b/tests/topotests/ldp-oc-topo1/r2/ospfd.conf
index 51317202b..8cba1529e 100644
--- a/tests/topotests/ldp-oc-topo1/r2/ospfd.conf
+++ b/tests/topotests/ldp-oc-topo1/r2/ospfd.conf
@@ -8,8 +8,10 @@ router ospf
 int r2-eth0
  ip ospf hello-interval 2
  ip ospf dead-interval 10
+ ip ospf priority 2
 !
 int r2-eth1
  ip ospf hello-interval 2
  ip ospf dead-interval 10
+ ip ospf priority 1
 !
diff --git a/tests/topotests/ldp-oc-topo1/r2/show_ip_ospf_neighbor.json b/tests/topotests/ldp-oc-topo1/r2/show_ip_ospf_neighbor.json
index 55f12359e..aa6819895 100644
--- a/tests/topotests/ldp-oc-topo1/r2/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp-oc-topo1/r2/show_ip_ospf_neighbor.json
@@ -5,15 +5,12 @@
         "priority":1,
         "state":"Full\/Backup",
         "address":"10.0.1.1",
-        "ifaceName":"r2-eth0:10.0.1.2",
-        "retransmitCounter":0,
-        "requestCounter":0,
-        "dbSummaryCounter":0
+        "ifaceName":"r2-eth0:10.0.1.2"
       }
     ],
     "3.3.3.3":[
       {
-        "priority":1,
+        "priority":2,
         "state":"Full\/Backup",
         "address":"10.0.2.3",
         "ifaceName":"r2-eth1:10.0.2.2"
@@ -21,7 +18,7 @@
     ],
     "4.4.4.4":[
       {
-        "priority":1,
+        "priority":3,
         "state":"Full\/DR",
         "address":"10.0.2.4",
         "ifaceName":"r2-eth1:10.0.2.2"
diff --git a/tests/topotests/ldp-oc-topo1/r3/ospfd.conf b/tests/topotests/ldp-oc-topo1/r3/ospfd.conf
index 4566976b7..0d3a74c4a 100644
--- a/tests/topotests/ldp-oc-topo1/r3/ospfd.conf
+++ b/tests/topotests/ldp-oc-topo1/r3/ospfd.conf
@@ -9,4 +9,5 @@ router ospf
 int r3-eth0
  ip ospf hello-interval 2
  ip ospf dead-interval 10
+ ip ospf priority 2
 !
diff --git a/tests/topotests/ldp-oc-topo1/r3/show_ip_ospf_neighbor.json b/tests/topotests/ldp-oc-topo1/r3/show_ip_ospf_neighbor.json
index 24502ed81..905774fc4 100644
--- a/tests/topotests/ldp-oc-topo1/r3/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp-oc-topo1/r3/show_ip_ospf_neighbor.json
@@ -10,7 +10,7 @@
     ],
     "4.4.4.4":[
       {
-        "priority":1,
+        "priority":3,
         "state":"Full\/DR",
         "address":"10.0.2.4",
         "ifaceName":"r3-eth0:10.0.2.3"
diff --git a/tests/topotests/ldp-oc-topo1/r4/ospfd.conf b/tests/topotests/ldp-oc-topo1/r4/ospfd.conf
index 5aae885a1..7bbd228d0 100644
--- a/tests/topotests/ldp-oc-topo1/r4/ospfd.conf
+++ b/tests/topotests/ldp-oc-topo1/r4/ospfd.conf
@@ -8,4 +8,5 @@ router ospf
 int r4-eth0
  ip ospf hello-interval 2
  ip ospf dead-interval 10
+ ip ospf priority 3
 !
diff --git a/tests/topotests/ldp-oc-topo1/r4/show_ip_ospf_neighbor.json b/tests/topotests/ldp-oc-topo1/r4/show_ip_ospf_neighbor.json
index 794410522..67593952c 100644
--- a/tests/topotests/ldp-oc-topo1/r4/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp-oc-topo1/r4/show_ip_ospf_neighbor.json
@@ -11,7 +11,7 @@
     ],
     "3.3.3.3":[
       {
-        "priority":1,
+        "priority":2,
         "state":"Full\/Backup",
         "address":"10.0.2.3",
         "ifaceName":"r4-eth0:10.0.2.4"
diff --git a/tests/topotests/ldp-vpls-topo1/r1/ospfd.conf b/tests/topotests/ldp-vpls-topo1/r1/ospfd.conf
index 76ea32fb6..a66fb92ba 100644
--- a/tests/topotests/ldp-vpls-topo1/r1/ospfd.conf
+++ b/tests/topotests/ldp-vpls-topo1/r1/ospfd.conf
@@ -8,8 +8,10 @@ router ospf
 int r1-eth1
  ip ospf hello-interval 2
  ip ospf dead-interval 10
+ ip ospf priority 1
 !
 int r1-eth2
  ip ospf hello-interval 2
  ip ospf dead-interval 10
+ ip ospf priority 1
 !
diff --git a/tests/topotests/ldp-vpls-topo1/r1/show_ip_ospf_neighbor.json b/tests/topotests/ldp-vpls-topo1/r1/show_ip_ospf_neighbor.json
index 6e6c3c8cb..7e281abb5 100644
--- a/tests/topotests/ldp-vpls-topo1/r1/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp-vpls-topo1/r1/show_ip_ospf_neighbor.json
@@ -4,8 +4,8 @@
       {
         "dbSummaryCounter": 0,
         "retransmitCounter": 0,
-        "priority": 1,
-        "state": "Full/DR",
+        "priority": 2,
+        "state": "Full\/DR",
         "address": "10.0.1.2",
         "ifaceName": "r1-eth1:10.0.1.1",
         "requestCounter": 0
@@ -15,8 +15,8 @@
       {
         "dbSummaryCounter": 0,
         "retransmitCounter": 0,
-        "priority": 1,
-        "state": "Full/DR",
+        "priority": 2,
+        "state": "Full\/DR",
         "address": "10.0.2.3",
         "ifaceName": "r1-eth2:10.0.2.1",
         "requestCounter": 0
diff --git a/tests/topotests/ldp-vpls-topo1/r2/ospfd.conf b/tests/topotests/ldp-vpls-topo1/r2/ospfd.conf
index 7b3ddfe37..b4692feec 100644
--- a/tests/topotests/ldp-vpls-topo1/r2/ospfd.conf
+++ b/tests/topotests/ldp-vpls-topo1/r2/ospfd.conf
@@ -8,8 +8,10 @@ router ospf
 int r2-eth1
  ip ospf hello-interval 2
  ip ospf dead-interval 10
+ ip ospf priority 2
 !
 int r2-eth2
  ip ospf hello-interval 2
  ip ospf dead-interval 10
+ ip ospf priority 1
 !
diff --git a/tests/topotests/ldp-vpls-topo1/r2/show_ip_ospf_neighbor.json b/tests/topotests/ldp-vpls-topo1/r2/show_ip_ospf_neighbor.json
index b5b10cc53..22fd98f51 100644
--- a/tests/topotests/ldp-vpls-topo1/r2/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp-vpls-topo1/r2/show_ip_ospf_neighbor.json
@@ -3,7 +3,7 @@
     "1.1.1.1": [
       {
         "priority":1,
-        "state":"Full/Backup",
+        "state":"Full\/Backup",
         "address":"10.0.1.1",
         "ifaceName":"r2-eth1:10.0.1.2",
         "retransmitCounter":0,
@@ -13,8 +13,8 @@
     ],
     "3.3.3.3": [
       {
-        "priority":1,
-        "state":"Full/DR",
+        "priority":2,
+        "state":"Full\/DR",
         "address":"10.0.3.3",
         "ifaceName":"r2-eth2:10.0.3.2",
         "retransmitCounter":0,
diff --git a/tests/topotests/ldp-vpls-topo1/r3/ospfd.conf b/tests/topotests/ldp-vpls-topo1/r3/ospfd.conf
index b424f2e10..2413bfa9d 100644
--- a/tests/topotests/ldp-vpls-topo1/r3/ospfd.conf
+++ b/tests/topotests/ldp-vpls-topo1/r3/ospfd.conf
@@ -8,8 +8,10 @@ router ospf
 int r3-eth1
  ip ospf hello-interval 2
  ip ospf dead-interval 10
+ ip ospf priority 2
 !
 int r3-eth2
  ip ospf hello-interval 2
  ip ospf dead-interval 10
+ ip ospf priority 2
 !
diff --git a/tests/topotests/ldp-vpls-topo1/r3/show_ip_ospf_neighbor.json b/tests/topotests/ldp-vpls-topo1/r3/show_ip_ospf_neighbor.json
index bc7bb1e89..970eb2fc1 100644
--- a/tests/topotests/ldp-vpls-topo1/r3/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp-vpls-topo1/r3/show_ip_ospf_neighbor.json
@@ -3,7 +3,7 @@
     "1.1.1.1": [
       {
         "priority":1,
-        "state":"Full/Backup",
+        "state":"Full\/Backup",
         "address":"10.0.2.1",
         "ifaceName":"r3-eth1:10.0.2.3",
         "retransmitCounter":0,
@@ -14,7 +14,7 @@
     "2.2.2.2": [
       {
         "priority":1,
-        "state":"Full/Backup",
+        "state":"Full\/Backup",
         "address":"10.0.3.2",
         "ifaceName":"r3-eth2:10.0.3.3",
         "retransmitCounter":0,
diff --git a/tests/topotests/ldp-vpls-topo1/test_ldp_vpls_topo1.pdf b/tests/topotests/ldp-vpls-topo1/test_ldp_vpls_topo1.pdf
index dd7c6f74d..4d26732ea 100644
--- a/tests/topotests/ldp-vpls-topo1/test_ldp_vpls_topo1.pdf
+++ b/tests/topotests/ldp-vpls-topo1/test_ldp_vpls_topo1.pdf