diff --git a/ldp-vpls-topo1/__init__.py b/ldp-vpls-topo1/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/ldp-vpls-topo1/ce1/zebra.conf b/ldp-vpls-topo1/ce1/zebra.conf
new file mode 100644
index 000000000000..f520fae11310
--- /dev/null
+++ b/ldp-vpls-topo1/ce1/zebra.conf
@@ -0,0 +1,12 @@
+log file /tmp/ce1-zebra.log
+!
+hostname ce1
+!
+interface ce1-eth0
+ ip address 172.16.1.1/24
+ no link-detect
+!
+ip forwarding
+!
+line vty
+!
diff --git a/ldp-vpls-topo1/ce2/zebra.conf b/ldp-vpls-topo1/ce2/zebra.conf
new file mode 100644
index 000000000000..737f30b9e793
--- /dev/null
+++ b/ldp-vpls-topo1/ce2/zebra.conf
@@ -0,0 +1,12 @@
+log file /tmp/ce2-zebra.log
+!
+hostname ce2
+!
+interface ce2-eth0
+ ip address 172.16.1.2/24
+ no link-detect
+!
+ip forwarding
+!
+line vty
+!
diff --git a/ldp-vpls-topo1/ce3/zebra.conf b/ldp-vpls-topo1/ce3/zebra.conf
new file mode 100644
index 000000000000..9e6b6b09e085
--- /dev/null
+++ b/ldp-vpls-topo1/ce3/zebra.conf
@@ -0,0 +1,12 @@
+log file /tmp/ce3-zebra.log
+!
+hostname ce3
+!
+interface ce3-eth0
+ ip address 172.16.1.3/24
+ no link-detect
+!
+ip forwarding
+!
+line vty
+!
diff --git a/ldp-vpls-topo1/r1/ldpd.conf b/ldp-vpls-topo1/r1/ldpd.conf
new file mode 100644
index 000000000000..2ab7895bdb46
--- /dev/null
+++ b/ldp-vpls-topo1/r1/ldpd.conf
@@ -0,0 +1,34 @@
+hostname r1
+log file /tmp/r1-ldpd.log
+!
+debug mpls ldp zebra
+debug mpls ldp event
+debug mpls ldp errors
+debug mpls ldp messages recv
+debug mpls ldp messages sent
+debug mpls ldp discovery hello recv
+debug mpls ldp discovery hello sent
+!
+mpls ldp
+ router-id 1.1.1.1
+ !
+ address-family ipv4
+  discovery transport-address 1.1.1.1
+  label local allocate host-routes
+  !
+  interface r1-eth1
+  !
+  interface r1-eth2
+  !
+ !
+!
+l2vpn CUST_A type vpls
+ member interface r1-eth0
+ !
+ member pseudowire r1-mpw0
+  neighbor lsr-id 2.2.2.2
+  pw-id 100
+ !
+!
+line vty
+!
diff --git a/ldp-vpls-topo1/r1/ospf-nbrs.txt b/ldp-vpls-topo1/r1/ospf-nbrs.txt
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/ldp-vpls-topo1/r1/ospfd.conf b/ldp-vpls-topo1/r1/ospfd.conf
new file mode 100644
index 000000000000..8d12ea444663
--- /dev/null
+++ b/ldp-vpls-topo1/r1/ospfd.conf
@@ -0,0 +1,7 @@
+hostname r1
+log file /tmp/r1-ospfd.log
+!
+router ospf
+ router-id 1.1.1.1
+ network 0.0.0.0/0 area 0
+!
diff --git a/ldp-vpls-topo1/r1/show_ip_ospf_neighbor.ref b/ldp-vpls-topo1/r1/show_ip_ospf_neighbor.ref
new file mode 100644
index 000000000000..2270c3fddef9
--- /dev/null
+++ b/ldp-vpls-topo1/r1/show_ip_ospf_neighbor.ref
@@ -0,0 +1,14 @@
+{
+  "2.2.2.2":{
+    "priority":1,
+    "state":"Full/DR",
+    "address":"10.0.1.2",
+    "ifaceName":"r1-eth1:10.0.1.1"
+  },
+  "3.3.3.3":{
+    "priority":1,
+    "state":"Full/DR",
+    "address":"10.0.2.3",
+    "ifaceName":"r1-eth2:10.0.2.1"
+  }
+}
diff --git a/ldp-vpls-topo1/r1/show_ip_route.ref b/ldp-vpls-topo1/r1/show_ip_route.ref
new file mode 100644
index 000000000000..8ccd60ca4122
--- /dev/null
+++ b/ldp-vpls-topo1/r1/show_ip_route.ref
@@ -0,0 +1,157 @@
+{
+  "1.1.1.1/32":[
+    {
+      "prefix":"1.1.1.1/32",
+      "protocol":"ospf",
+      "distance":110,
+      "metric":0,
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceIndex":1,
+          "interfaceName":"lo",
+          "active":true
+        }
+      ]
+    },
+    {
+      "prefix":"1.1.1.1/32",
+      "protocol":"connected",
+      "selected":true,
+      "nexthops":[
+        {
+          "fib":true,
+          "directlyConnected":true,
+          "interfaceIndex":1,
+          "interfaceName":"lo",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "2.2.2.2/32":[
+    {
+      "prefix":"2.2.2.2/32",
+      "protocol":"ospf",
+      "selected":true,
+      "distance":110,
+      "metric":10,
+      "nexthops":[
+        {
+          "fib":true,
+          "ip":"10.0.1.2",
+          "afi":"ipv4",
+          "interfaceIndex":3,
+          "interfaceName":"r1-eth1",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "3.3.3.3/32":[
+    {
+      "prefix":"3.3.3.3/32",
+      "protocol":"ospf",
+      "selected":true,
+      "distance":110,
+      "metric":10,
+      "nexthops":[
+        {
+          "fib":true,
+          "ip":"10.0.2.3",
+          "afi":"ipv4",
+          "interfaceIndex":4,
+          "interfaceName":"r1-eth2",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "10.0.1.0/24":[
+    {
+      "prefix":"10.0.1.0/24",
+      "protocol":"ospf",
+      "distance":110,
+      "metric":10,
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceIndex":3,
+          "interfaceName":"r1-eth1",
+          "active":true
+        }
+      ]
+    },
+    {
+      "prefix":"10.0.1.0/24",
+      "protocol":"connected",
+      "selected":true,
+      "nexthops":[
+        {
+          "fib":true,
+          "directlyConnected":true,
+          "interfaceIndex":3,
+          "interfaceName":"r1-eth1",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "10.0.2.0/24":[
+    {
+      "prefix":"10.0.2.0/24",
+      "protocol":"ospf",
+      "distance":110,
+      "metric":10,
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceIndex":4,
+          "interfaceName":"r1-eth2",
+          "active":true
+        }
+      ]
+    },
+    {
+      "prefix":"10.0.2.0/24",
+      "protocol":"connected",
+      "selected":true,
+      "nexthops":[
+        {
+          "fib":true,
+          "directlyConnected":true,
+          "interfaceIndex":4,
+          "interfaceName":"r1-eth2",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "10.0.3.0/24":[
+    {
+      "prefix":"10.0.3.0/24",
+      "protocol":"ospf",
+      "selected":true,
+      "distance":110,
+      "metric":20,
+      "nexthops":[
+        {
+          "fib":true,
+          "ip":"10.0.1.2",
+          "afi":"ipv4",
+          "interfaceIndex":3,
+          "interfaceName":"r1-eth1",
+          "active":true
+        },
+        {
+          "fib":true,
+          "ip":"10.0.2.3",
+          "afi":"ipv4",
+          "interfaceIndex":4,
+          "interfaceName":"r1-eth2",
+          "active":true
+        }
+      ]
+    }
+  ]
+}
diff --git a/ldp-vpls-topo1/r1/show_l2vpn_binding.ref b/ldp-vpls-topo1/r1/show_l2vpn_binding.ref
new file mode 100644
index 000000000000..b3de7e2c666f
--- /dev/null
+++ b/ldp-vpls-topo1/r1/show_l2vpn_binding.ref
@@ -0,0 +1,16 @@
+{
+  "2.2.2.2: 100":{
+    "destination":"2.2.2.2",
+    "vcId":100,
+    "localLabel":16,
+    "localControlWord":1,
+    "localVcType":"Ethernet",
+    "localGroupID":0,
+    "localIfMtu":1500,
+    "remoteLabel":16,
+    "remoteControlWord":1,
+    "remoteVcType":"Ethernet",
+    "remoteGroupID":0,
+    "remoteIfMtu":1500
+  }
+}
diff --git a/ldp-vpls-topo1/r1/show_l2vpn_vc.ref b/ldp-vpls-topo1/r1/show_l2vpn_vc.ref
new file mode 100644
index 000000000000..29e9df10899e
--- /dev/null
+++ b/ldp-vpls-topo1/r1/show_l2vpn_vc.ref
@@ -0,0 +1,8 @@
+{
+  "r1-mpw0":{
+    "peerId":"2.2.2.2",
+    "vcId":100,
+    "VpnName":"CUST_A",
+    "status":"up"
+  }
+}
diff --git a/ldp-vpls-topo1/r1/show_ldp_binding.ref b/ldp-vpls-topo1/r1/show_ldp_binding.ref
new file mode 100644
index 000000000000..c082cb6fb762
--- /dev/null
+++ b/ldp-vpls-topo1/r1/show_ldp_binding.ref
@@ -0,0 +1,52 @@
+{
+  "bindings":[
+    {
+      "addressFamily":"ipv4",
+      "prefix":"1.1.1.1/32",
+      "neighborId":"2.2.2.2",
+      "localLabel":"imp-null",
+      "remoteLabel":"17",
+      "inUse":0
+    },
+    {
+      "addressFamily":"ipv4",
+      "prefix":"1.1.1.1/32",
+      "neighborId":"3.3.3.3",
+      "localLabel":"imp-null",
+      "remoteLabel":"16",
+      "inUse":0
+    },
+    {
+      "addressFamily":"ipv4",
+      "prefix":"2.2.2.2/32",
+      "neighborId":"2.2.2.2",
+      "localLabel":"17",
+      "remoteLabel":"imp-null",
+      "inUse":1
+    },
+    {
+      "addressFamily":"ipv4",
+      "prefix":"2.2.2.2/32",
+      "neighborId":"3.3.3.3",
+      "localLabel":"17",
+      "remoteLabel":"17",
+      "inUse":0
+    },
+    {
+      "addressFamily":"ipv4",
+      "prefix":"3.3.3.3/32",
+      "neighborId":"2.2.2.2",
+      "localLabel":"18",
+      "remoteLabel":"18",
+      "inUse":0
+    },
+    {
+      "addressFamily":"ipv4",
+      "prefix":"3.3.3.3/32",
+      "neighborId":"3.3.3.3",
+      "localLabel":"18",
+      "remoteLabel":"imp-null",
+      "inUse":1
+    }
+  ]
+}
diff --git a/ldp-vpls-topo1/r1/show_ldp_discovery.ref b/ldp-vpls-topo1/r1/show_ldp_discovery.ref
new file mode 100644
index 000000000000..9301e60c6730
--- /dev/null
+++ b/ldp-vpls-topo1/r1/show_ldp_discovery.ref
@@ -0,0 +1,25 @@
+{
+  "adjacencies":[
+    {
+      "addressFamily":"ipv4",
+      "neighborId":"2.2.2.2",
+      "type":"link",
+      "interface":"r1-eth1",
+      "helloHoldtime":15
+    },
+    {
+      "addressFamily":"ipv4",
+      "neighborId":"2.2.2.2",
+      "type":"targeted",
+      "peer":"2.2.2.2",
+      "helloHoldtime":45
+    },
+    {
+      "addressFamily":"ipv4",
+      "neighborId":"3.3.3.3",
+      "type":"link",
+      "interface":"r1-eth2",
+      "helloHoldtime":15
+    }
+  ]
+}
diff --git a/ldp-vpls-topo1/r1/show_ldp_neighbor.ref b/ldp-vpls-topo1/r1/show_ldp_neighbor.ref
new file mode 100644
index 000000000000..40d8ebeb9074
--- /dev/null
+++ b/ldp-vpls-topo1/r1/show_ldp_neighbor.ref
@@ -0,0 +1,16 @@
+{
+  "neighbors":[
+    {
+      "addressFamily":"ipv4",
+      "neighborId":"2.2.2.2",
+      "state":"OPERATIONAL",
+      "transportAddress":"2.2.2.2"
+    },
+    {
+      "addressFamily":"ipv4",
+      "neighborId":"3.3.3.3",
+      "state":"OPERATIONAL",
+      "transportAddress":"3.3.3.3"
+    }
+  ]
+}
diff --git a/ldp-vpls-topo1/r1/zebra.conf b/ldp-vpls-topo1/r1/zebra.conf
new file mode 100644
index 000000000000..b7ccccbd16a3
--- /dev/null
+++ b/ldp-vpls-topo1/r1/zebra.conf
@@ -0,0 +1,30 @@
+log file /tmp/r1-zebra.log
+!
+hostname r1
+!
+debug zebra rib
+debug zebra nht
+debug zebra pseudowires
+debug zebra packet
+!
+interface lo
+ ip address 1.1.1.1/32
+!
+interface r1-eth0
+ description to s1
+ no link-detect
+!
+interface r1-eth1
+ description to s4
+ ip address 10.0.1.1/24
+ no link-detect
+!
+interface r1-eth2
+ description to s5
+ ip address 10.0.2.1/24
+ no link-detect
+!
+ip forwarding
+!
+line vty
+!
diff --git a/ldp-vpls-topo1/r2/ldpd.conf b/ldp-vpls-topo1/r2/ldpd.conf
new file mode 100644
index 000000000000..843f1601635e
--- /dev/null
+++ b/ldp-vpls-topo1/r2/ldpd.conf
@@ -0,0 +1,34 @@
+hostname r2
+log file /tmp/r2-ldpd.log
+!
+debug mpls ldp zebra
+debug mpls ldp event
+debug mpls ldp errors
+debug mpls ldp messages recv
+debug mpls ldp messages sent
+debug mpls ldp discovery hello recv
+debug mpls ldp discovery hello sent
+!
+mpls ldp
+ router-id 2.2.2.2
+ !
+ address-family ipv4
+  discovery transport-address 2.2.2.2
+  label local allocate host-routes
+  !
+  interface r2-eth1
+  !
+  interface r2-eth2
+  !
+ !
+!
+l2vpn CUST_A type vpls
+ member interface r2-eth0
+ !
+ member pseudowire r2-mpw0
+  neighbor lsr-id 1.1.1.1
+  pw-id 100
+ !
+!
+line vty
+!
diff --git a/ldp-vpls-topo1/r2/ospfd.conf b/ldp-vpls-topo1/r2/ospfd.conf
new file mode 100644
index 000000000000..c58914a7fa7e
--- /dev/null
+++ b/ldp-vpls-topo1/r2/ospfd.conf
@@ -0,0 +1,7 @@
+hostname r2
+log file /tmp/r2-ospfd.log
+!
+router ospf
+ router-id 2.2.2.2
+ network 0.0.0.0/0 area 0
+!
diff --git a/ldp-vpls-topo1/r2/show_ip_ospf_neighbor.ref b/ldp-vpls-topo1/r2/show_ip_ospf_neighbor.ref
new file mode 100644
index 000000000000..18ffbc2f8aa6
--- /dev/null
+++ b/ldp-vpls-topo1/r2/show_ip_ospf_neighbor.ref
@@ -0,0 +1,14 @@
+{
+  "1.1.1.1":{
+    "priority":1,
+    "state":"Full/Backup",
+    "address":"10.0.1.1",
+    "ifaceName":"r2-eth1:10.0.1.2"
+  },
+  "3.3.3.3":{
+    "priority":1,
+    "state":"Full/DR",
+    "address":"10.0.3.3",
+    "ifaceName":"r2-eth2:10.0.3.2"
+  }
+}
diff --git a/ldp-vpls-topo1/r2/show_ip_route.ref b/ldp-vpls-topo1/r2/show_ip_route.ref
new file mode 100644
index 000000000000..7147c6a59587
--- /dev/null
+++ b/ldp-vpls-topo1/r2/show_ip_route.ref
@@ -0,0 +1,157 @@
+{
+  "1.1.1.1/32":[
+    {
+      "prefix":"1.1.1.1/32",
+      "protocol":"ospf",
+      "selected":true,
+      "distance":110,
+      "metric":10,
+      "nexthops":[
+        {
+          "fib":true,
+          "ip":"10.0.1.1",
+          "afi":"ipv4",
+          "interfaceIndex":3,
+          "interfaceName":"r2-eth1",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "2.2.2.2/32":[
+    {
+      "prefix":"2.2.2.2/32",
+      "protocol":"ospf",
+      "distance":110,
+      "metric":0,
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceIndex":1,
+          "interfaceName":"lo",
+          "active":true
+        }
+      ]
+    },
+    {
+      "prefix":"2.2.2.2/32",
+      "protocol":"connected",
+      "selected":true,
+      "nexthops":[
+        {
+          "fib":true,
+          "directlyConnected":true,
+          "interfaceIndex":1,
+          "interfaceName":"lo",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "3.3.3.3/32":[
+    {
+      "prefix":"3.3.3.3/32",
+      "protocol":"ospf",
+      "selected":true,
+      "distance":110,
+      "metric":10,
+      "nexthops":[
+        {
+          "fib":true,
+          "ip":"10.0.3.3",
+          "afi":"ipv4",
+          "interfaceIndex":4,
+          "interfaceName":"r2-eth2",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "10.0.1.0/24":[
+    {
+      "prefix":"10.0.1.0/24",
+      "protocol":"ospf",
+      "distance":110,
+      "metric":10,
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceIndex":3,
+          "interfaceName":"r2-eth1",
+          "active":true
+        }
+      ]
+    },
+    {
+      "prefix":"10.0.1.0/24",
+      "protocol":"connected",
+      "selected":true,
+      "nexthops":[
+        {
+          "fib":true,
+          "directlyConnected":true,
+          "interfaceIndex":3,
+          "interfaceName":"r2-eth1",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "10.0.2.0/24":[
+    {
+      "prefix":"10.0.2.0/24",
+      "protocol":"ospf",
+      "selected":true,
+      "distance":110,
+      "metric":20,
+      "nexthops":[
+        {
+          "fib":true,
+          "ip":"10.0.1.1",
+          "afi":"ipv4",
+          "interfaceIndex":3,
+          "interfaceName":"r2-eth1",
+          "active":true
+        },
+        {
+          "fib":true,
+          "ip":"10.0.3.3",
+          "afi":"ipv4",
+          "interfaceIndex":4,
+          "interfaceName":"r2-eth2",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "10.0.3.0/24":[
+    {
+      "prefix":"10.0.3.0/24",
+      "protocol":"ospf",
+      "distance":110,
+      "metric":10,
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceIndex":4,
+          "interfaceName":"r2-eth2",
+          "active":true
+        }
+      ]
+    },
+    {
+      "prefix":"10.0.3.0/24",
+      "protocol":"connected",
+      "selected":true,
+      "nexthops":[
+        {
+          "fib":true,
+          "directlyConnected":true,
+          "interfaceIndex":4,
+          "interfaceName":"r2-eth2",
+          "active":true
+        }
+      ]
+    }
+  ]
+}
diff --git a/ldp-vpls-topo1/r2/show_l2vpn_binding.ref b/ldp-vpls-topo1/r2/show_l2vpn_binding.ref
new file mode 100644
index 000000000000..42c5a1cbd970
--- /dev/null
+++ b/ldp-vpls-topo1/r2/show_l2vpn_binding.ref
@@ -0,0 +1,16 @@
+{
+  "1.1.1.1: 100":{
+    "destination":"1.1.1.1",
+    "vcId":100,
+    "localLabel":16,
+    "localControlWord":1,
+    "localVcType":"Ethernet",
+    "localGroupID":0,
+    "localIfMtu":1500,
+    "remoteLabel":16,
+    "remoteControlWord":1,
+    "remoteVcType":"Ethernet",
+    "remoteGroupID":0,
+    "remoteIfMtu":1500
+  }
+}
diff --git a/ldp-vpls-topo1/r2/show_l2vpn_vc.ref b/ldp-vpls-topo1/r2/show_l2vpn_vc.ref
new file mode 100644
index 000000000000..942ed23a1e28
--- /dev/null
+++ b/ldp-vpls-topo1/r2/show_l2vpn_vc.ref
@@ -0,0 +1,8 @@
+{
+  "r2-mpw0":{
+    "peerId":"1.1.1.1",
+    "vcId":100,
+    "VpnName":"CUST_A",
+    "status":"up"
+  }
+}
diff --git a/ldp-vpls-topo1/r2/show_ldp_binding.ref b/ldp-vpls-topo1/r2/show_ldp_binding.ref
new file mode 100644
index 000000000000..717a3035bc6d
--- /dev/null
+++ b/ldp-vpls-topo1/r2/show_ldp_binding.ref
@@ -0,0 +1,52 @@
+{
+  "bindings":[
+    {
+      "addressFamily":"ipv4",
+      "prefix":"1.1.1.1/32",
+      "neighborId":"1.1.1.1",
+      "localLabel":"17",
+      "remoteLabel":"imp-null",
+      "inUse":1
+    },
+    {
+      "addressFamily":"ipv4",
+      "prefix":"1.1.1.1/32",
+      "neighborId":"3.3.3.3",
+      "localLabel":"17",
+      "remoteLabel":"16",
+      "inUse":0
+    },
+    {
+      "addressFamily":"ipv4",
+      "prefix":"2.2.2.2/32",
+      "neighborId":"1.1.1.1",
+      "localLabel":"imp-null",
+      "remoteLabel":"17",
+      "inUse":0
+    },
+    {
+      "addressFamily":"ipv4",
+      "prefix":"2.2.2.2/32",
+      "neighborId":"3.3.3.3",
+      "localLabel":"imp-null",
+      "remoteLabel":"17",
+      "inUse":0
+    },
+    {
+      "addressFamily":"ipv4",
+      "prefix":"3.3.3.3/32",
+      "neighborId":"1.1.1.1",
+      "localLabel":"18",
+      "remoteLabel":"18",
+      "inUse":0
+    },
+    {
+      "addressFamily":"ipv4",
+      "prefix":"3.3.3.3/32",
+      "neighborId":"3.3.3.3",
+      "localLabel":"18",
+      "remoteLabel":"imp-null",
+      "inUse":1
+    }
+  ]
+}
diff --git a/ldp-vpls-topo1/r2/show_ldp_discovery.ref b/ldp-vpls-topo1/r2/show_ldp_discovery.ref
new file mode 100644
index 000000000000..26801acade10
--- /dev/null
+++ b/ldp-vpls-topo1/r2/show_ldp_discovery.ref
@@ -0,0 +1,25 @@
+{
+  "adjacencies":[
+    {
+      "addressFamily":"ipv4",
+      "neighborId":"1.1.1.1",
+      "type":"link",
+      "interface":"r2-eth1",
+      "helloHoldtime":15
+    },
+    {
+      "addressFamily":"ipv4",
+      "neighborId":"1.1.1.1",
+      "type":"targeted",
+      "peer":"1.1.1.1",
+      "helloHoldtime":45
+    },
+    {
+      "addressFamily":"ipv4",
+      "neighborId":"3.3.3.3",
+      "type":"link",
+      "interface":"r2-eth2",
+      "helloHoldtime":15
+    }
+  ]
+}
diff --git a/ldp-vpls-topo1/r2/show_ldp_neighbor.ref b/ldp-vpls-topo1/r2/show_ldp_neighbor.ref
new file mode 100644
index 000000000000..eed35289ea6f
--- /dev/null
+++ b/ldp-vpls-topo1/r2/show_ldp_neighbor.ref
@@ -0,0 +1,16 @@
+{
+  "neighbors":[
+    {
+      "addressFamily":"ipv4",
+      "neighborId":"1.1.1.1",
+      "state":"OPERATIONAL",
+      "transportAddress":"1.1.1.1"
+    },
+    {
+      "addressFamily":"ipv4",
+      "neighborId":"3.3.3.3",
+      "state":"OPERATIONAL",
+      "transportAddress":"3.3.3.3"
+    }
+  ]
+}
diff --git a/ldp-vpls-topo1/r2/zebra.conf b/ldp-vpls-topo1/r2/zebra.conf
new file mode 100644
index 000000000000..e5ecd6979830
--- /dev/null
+++ b/ldp-vpls-topo1/r2/zebra.conf
@@ -0,0 +1,30 @@
+log file /tmp/r2-zebra.log
+!
+hostname r2
+!
+debug zebra rib
+debug zebra nht
+debug zebra pseudowires
+debug zebra packet
+!
+interface lo
+ ip address 2.2.2.2/32
+!
+interface r2-eth0
+ description to s2
+ no link-detect
+!
+interface r2-eth1
+ description to s4
+ ip address 10.0.1.2/24
+ no link-detect
+!
+interface r2-eth2
+ description to s6
+ ip address 10.0.3.2/24
+ no link-detect
+!
+ip forwarding
+!
+line vty
+!
diff --git a/ldp-vpls-topo1/r3/ldpd.conf b/ldp-vpls-topo1/r3/ldpd.conf
new file mode 100644
index 000000000000..7a9995d1b267
--- /dev/null
+++ b/ldp-vpls-topo1/r3/ldpd.conf
@@ -0,0 +1,26 @@
+hostname r3
+log file /tmp/r3-ldpd.log
+!
+debug mpls ldp zebra
+debug mpls ldp event
+debug mpls ldp errors
+debug mpls ldp messages recv
+debug mpls ldp messages sent
+debug mpls ldp discovery hello recv
+debug mpls ldp discovery hello sent
+!
+mpls ldp
+ router-id 3.3.3.3
+ !
+ address-family ipv4
+  discovery transport-address 3.3.3.3
+  label local allocate host-routes
+  !
+  interface r3-eth1
+  !
+  interface r3-eth2
+  !
+ !
+!
+line vty
+!
diff --git a/ldp-vpls-topo1/r3/ospfd.conf b/ldp-vpls-topo1/r3/ospfd.conf
new file mode 100644
index 000000000000..8a58d9597625
--- /dev/null
+++ b/ldp-vpls-topo1/r3/ospfd.conf
@@ -0,0 +1,7 @@
+hostname r3
+log file /tmp/r3-ospfd.log
+!
+router ospf
+ router-id 3.3.3.3
+ network 0.0.0.0/0 area 0
+!
diff --git a/ldp-vpls-topo1/r3/show_ip_ospf_neighbor.ref b/ldp-vpls-topo1/r3/show_ip_ospf_neighbor.ref
new file mode 100644
index 000000000000..b0669742abcf
--- /dev/null
+++ b/ldp-vpls-topo1/r3/show_ip_ospf_neighbor.ref
@@ -0,0 +1,14 @@
+{
+  "1.1.1.1":{
+    "priority":1,
+    "state":"Full/Backup",
+    "address":"10.0.2.1",
+    "ifaceName":"r3-eth1:10.0.2.3"
+  },
+  "2.2.2.2":{
+    "priority":1,
+    "state":"Full/Backup",
+    "address":"10.0.3.2",
+    "ifaceName":"r3-eth2:10.0.3.3"
+  }
+}
diff --git a/ldp-vpls-topo1/r3/show_ip_route.ref b/ldp-vpls-topo1/r3/show_ip_route.ref
new file mode 100644
index 000000000000..d77de7c9e3b8
--- /dev/null
+++ b/ldp-vpls-topo1/r3/show_ip_route.ref
@@ -0,0 +1,157 @@
+{
+  "1.1.1.1/32":[
+    {
+      "prefix":"1.1.1.1/32",
+      "protocol":"ospf",
+      "selected":true,
+      "distance":110,
+      "metric":10,
+      "nexthops":[
+        {
+          "fib":true,
+          "ip":"10.0.2.1",
+          "afi":"ipv4",
+          "interfaceIndex":3,
+          "interfaceName":"r3-eth1",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "2.2.2.2/32":[
+    {
+      "prefix":"2.2.2.2/32",
+      "protocol":"ospf",
+      "selected":true,
+      "distance":110,
+      "metric":10,
+      "nexthops":[
+        {
+          "fib":true,
+          "ip":"10.0.3.2",
+          "afi":"ipv4",
+          "interfaceIndex":4,
+          "interfaceName":"r3-eth2",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "3.3.3.3/32":[
+    {
+      "prefix":"3.3.3.3/32",
+      "protocol":"ospf",
+      "distance":110,
+      "metric":0,
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceIndex":1,
+          "interfaceName":"lo",
+          "active":true
+        }
+      ]
+    },
+    {
+      "prefix":"3.3.3.3/32",
+      "protocol":"connected",
+      "selected":true,
+      "nexthops":[
+        {
+          "fib":true,
+          "directlyConnected":true,
+          "interfaceIndex":1,
+          "interfaceName":"lo",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "10.0.1.0/24":[
+    {
+      "prefix":"10.0.1.0/24",
+      "protocol":"ospf",
+      "selected":true,
+      "distance":110,
+      "metric":20,
+      "nexthops":[
+        {
+          "fib":true,
+          "ip":"10.0.2.1",
+          "afi":"ipv4",
+          "interfaceIndex":3,
+          "interfaceName":"r3-eth1",
+          "active":true
+        },
+        {
+          "fib":true,
+          "ip":"10.0.3.2",
+          "afi":"ipv4",
+          "interfaceIndex":4,
+          "interfaceName":"r3-eth2",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "10.0.2.0/24":[
+    {
+      "prefix":"10.0.2.0/24",
+      "protocol":"ospf",
+      "distance":110,
+      "metric":10,
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceIndex":3,
+          "interfaceName":"r3-eth1",
+          "active":true
+        }
+      ]
+    },
+    {
+      "prefix":"10.0.2.0/24",
+      "protocol":"connected",
+      "selected":true,
+      "nexthops":[
+        {
+          "fib":true,
+          "directlyConnected":true,
+          "interfaceIndex":3,
+          "interfaceName":"r3-eth1",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "10.0.3.0/24":[
+    {
+      "prefix":"10.0.3.0/24",
+      "protocol":"ospf",
+      "distance":110,
+      "metric":10,
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceIndex":4,
+          "interfaceName":"r3-eth2",
+          "active":true
+        }
+      ]
+    },
+    {
+      "prefix":"10.0.3.0/24",
+      "protocol":"connected",
+      "selected":true,
+      "nexthops":[
+        {
+          "fib":true,
+          "directlyConnected":true,
+          "interfaceIndex":4,
+          "interfaceName":"r3-eth2",
+          "active":true
+        }
+      ]
+    }
+  ]
+}
diff --git a/ldp-vpls-topo1/r3/show_l2vpn_binding.ref b/ldp-vpls-topo1/r3/show_l2vpn_binding.ref
new file mode 100644
index 000000000000..2c63c0851048
--- /dev/null
+++ b/ldp-vpls-topo1/r3/show_l2vpn_binding.ref
@@ -0,0 +1,2 @@
+{
+}
diff --git a/ldp-vpls-topo1/r3/show_l2vpn_vc.ref b/ldp-vpls-topo1/r3/show_l2vpn_vc.ref
new file mode 100644
index 000000000000..2c63c0851048
--- /dev/null
+++ b/ldp-vpls-topo1/r3/show_l2vpn_vc.ref
@@ -0,0 +1,2 @@
+{
+}
diff --git a/ldp-vpls-topo1/r3/show_ldp_binding.ref b/ldp-vpls-topo1/r3/show_ldp_binding.ref
new file mode 100644
index 000000000000..12d0361f2b62
--- /dev/null
+++ b/ldp-vpls-topo1/r3/show_ldp_binding.ref
@@ -0,0 +1,52 @@
+{
+  "bindings":[
+    {
+      "addressFamily":"ipv4",
+      "prefix":"1.1.1.1/32",
+      "neighborId":"1.1.1.1",
+      "localLabel":"16",
+      "remoteLabel":"imp-null",
+      "inUse":1
+    },
+    {
+      "addressFamily":"ipv4",
+      "prefix":"1.1.1.1/32",
+      "neighborId":"2.2.2.2",
+      "localLabel":"16",
+      "remoteLabel":"17",
+      "inUse":0
+    },
+    {
+      "addressFamily":"ipv4",
+      "prefix":"2.2.2.2/32",
+      "neighborId":"1.1.1.1",
+      "localLabel":"17",
+      "remoteLabel":"17",
+      "inUse":0
+    },
+    {
+      "addressFamily":"ipv4",
+      "prefix":"2.2.2.2/32",
+      "neighborId":"2.2.2.2",
+      "localLabel":"17",
+      "remoteLabel":"imp-null",
+      "inUse":1
+    },
+    {
+      "addressFamily":"ipv4",
+      "prefix":"3.3.3.3/32",
+      "neighborId":"1.1.1.1",
+      "localLabel":"imp-null",
+      "remoteLabel":"18",
+      "inUse":0
+    },
+    {
+      "addressFamily":"ipv4",
+      "prefix":"3.3.3.3/32",
+      "neighborId":"2.2.2.2",
+      "localLabel":"imp-null",
+      "remoteLabel":"18",
+      "inUse":0
+    }
+  ]
+}
diff --git a/ldp-vpls-topo1/r3/show_ldp_discovery.ref b/ldp-vpls-topo1/r3/show_ldp_discovery.ref
new file mode 100644
index 000000000000..42fa98d4dafa
--- /dev/null
+++ b/ldp-vpls-topo1/r3/show_ldp_discovery.ref
@@ -0,0 +1,18 @@
+{
+  "adjacencies":[
+    {
+      "addressFamily":"ipv4",
+      "neighborId":"1.1.1.1",
+      "type":"link",
+      "interface":"r3-eth1",
+      "helloHoldtime":15
+    },
+    {
+      "addressFamily":"ipv4",
+      "neighborId":"2.2.2.2",
+      "type":"link",
+      "interface":"r3-eth2",
+      "helloHoldtime":15
+    }
+  ]
+}
diff --git a/ldp-vpls-topo1/r3/show_ldp_neighbor.ref b/ldp-vpls-topo1/r3/show_ldp_neighbor.ref
new file mode 100644
index 000000000000..5c482da69723
--- /dev/null
+++ b/ldp-vpls-topo1/r3/show_ldp_neighbor.ref
@@ -0,0 +1,16 @@
+{
+  "neighbors":[
+    {
+      "addressFamily":"ipv4",
+      "neighborId":"1.1.1.1",
+      "state":"OPERATIONAL",
+      "transportAddress":"1.1.1.1"
+    },
+    {
+      "addressFamily":"ipv4",
+      "neighborId":"2.2.2.2",
+      "state":"OPERATIONAL",
+      "transportAddress":"2.2.2.2"
+    }
+  ]
+}
diff --git a/ldp-vpls-topo1/r3/zebra.conf b/ldp-vpls-topo1/r3/zebra.conf
new file mode 100644
index 000000000000..6e4d0ce555b8
--- /dev/null
+++ b/ldp-vpls-topo1/r3/zebra.conf
@@ -0,0 +1,30 @@
+log file /tmp/r3-zebra.log
+!
+hostname r3
+!
+debug zebra rib
+debug zebra nht
+debug zebra pseudowires
+debug zebra packet
+!
+interface lo
+ ip address 3.3.3.3/32
+!
+interface r3-eth0
+ description to s3
+ no link-detect
+!
+interface r3-eth1
+ description to s5
+ ip address 10.0.2.3/24
+ no link-detect
+!
+interface r3-eth2
+ description to s6
+ ip address 10.0.3.3/24
+ no link-detect
+!
+ip forwarding
+!
+line vty
+!
diff --git a/ldp-vpls-topo1/test_ldp_vpls_topo1.dot b/ldp-vpls-topo1/test_ldp_vpls_topo1.dot
new file mode 100644
index 000000000000..4f1bd22f7c97
--- /dev/null
+++ b/ldp-vpls-topo1/test_ldp_vpls_topo1.dot
@@ -0,0 +1,111 @@
+## Color coding:
+#########################
+##  Main FRR: #f08080  red
+##  Switches: #d0e0d0  gray
+##  RIP:      #19e3d9  Cyan
+##  RIPng:    #fcb314  dark yellow
+##  OSPFv2:   #32b835  Green
+##  OSPFv3:   #19e3d9  Cyan
+##  ISIS IPv4 #fcb314  dark yellow
+##  ISIS IPv6 #9a81ec  purple
+##  BGP IPv4  #eee3d3  beige
+##  BGP IPv6  #fdff00  yellow
+##### Colors (see http://www.color-hex.com/)
+
+graph template {
+	label="Test Topology - LDP-VPLS 1";
+
+	# Routers
+	ce1 [
+		shape=doubleoctagon,
+		label="ce1",
+		fillcolor="#f08080",
+		style=filled,
+	];
+	ce2 [
+		shape=doubleoctagon
+		label="ce2",
+		fillcolor="#f08080",
+		style=filled,
+	];
+	ce3 [
+		shape=doubleoctagon
+		label="ce3",
+		fillcolor="#f08080",
+		style=filled,
+	];
+	r1 [
+		shape=doubleoctagon,
+		label="r1",
+		fillcolor="#f08080",
+		style=filled,
+	];
+	r2 [
+		shape=doubleoctagon
+		label="r2",
+		fillcolor="#f08080",
+		style=filled,
+	];
+	r3 [
+		shape=doubleoctagon
+		label="r3",
+		fillcolor="#f08080",
+		style=filled,
+	];
+
+
+	# Switches
+	s1 [
+		shape=oval,
+		label="VPLS\n172.16.1.0/24",
+		fillcolor="#d0e0d0",
+		style=filled,
+	];
+	s2 [
+		shape=oval,
+		label="VPLS\n172.16.1.0/24",
+		fillcolor="#d0e0d0",
+		style=filled,
+	];
+	s3 [
+		shape=oval,
+		label="VPLS\n172.16.1.0/24",
+		fillcolor="#d0e0d0",
+		style=filled,
+	];
+	s4 [
+		shape=oval,
+		label="s4\n10.0.1.0/24",
+		fillcolor="#d0e0d0",
+		style=filled,
+	];
+	s5 [
+		shape=oval,
+		label="s5\n10.0.2.0/24",
+		fillcolor="#d0e0d0",
+		style=filled,
+	];
+	s6 [
+		shape=oval,
+		label="s6\n10.0.3.0/24",
+		fillcolor="#d0e0d0",
+		style=filled,
+	];
+
+	# Connections
+	ce1 -- s1 [label="eth0\n.1"];
+	ce2 -- s2 [label="eth0\n.2"];
+	ce3 -- s3 [label="eth0\n.3"];
+
+	r1 -- s1 [label="eth0"];
+	r1 -- s4 [label="eth1\n.1"];
+	r1 -- s5 [label="eth2\n.1"];
+
+	r2 -- s2 [label="eth0"];
+	r2 -- s4 [label="eth1\n.2"];
+	r2 -- s6 [label="eth2\n.2"];
+
+	r3 -- s3 [label="eth0"];
+	r3 -- s5 [label="eth1\n.3"];
+	r3 -- s6 [label="eth2\n.3"];
+}
diff --git a/ldp-vpls-topo1/test_ldp_vpls_topo1.pdf b/ldp-vpls-topo1/test_ldp_vpls_topo1.pdf
new file mode 100644
index 000000000000..dd7c6f74d05f
Binary files /dev/null and b/ldp-vpls-topo1/test_ldp_vpls_topo1.pdf differ
diff --git a/ldp-vpls-topo1/test_ldp_vpls_topo1.py b/ldp-vpls-topo1/test_ldp_vpls_topo1.py
new file mode 100755
index 000000000000..96e24b46b9a4
--- /dev/null
+++ b/ldp-vpls-topo1/test_ldp_vpls_topo1.py
@@ -0,0 +1,282 @@
+#!/usr/bin/env python
+
+#
+# test_ldp_vpls_topo1.py
+# Part of NetDEF Topology Tests
+#
+# Copyright (c) 2017 by
+# Network Device Education Foundation, Inc. ("NetDEF")
+#
+# Permission to use, copy, modify, and/or distribute this software
+# for any purpose with or without fee is hereby granted, provided
+# that the above copyright notice and this permission notice appear
+# in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND NETDEF DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NETDEF BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY
+# DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+# WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+# ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+# OF THIS SOFTWARE.
+#
+
+"""
+test_ldp_vpls_topo1.py:
+
+                   +---------+                +---------+
+                   |         |                |         |
+                   |   CE1   |                |   CE2   |
+                   |         |                |         |
+                   +---------+                +---------+
+ce1-eth0 (172.16.1.1/24)|                          |ce2-eth0 (172.16.1.2/24)
+                        |                          |
+                        |                          |
+                rt1-eth0|                          |rt2-eth0
+                   +---------+  10.0.1.0/24   +---------+
+                   |         |rt1-eth1        |         |
+                   |   RT1   +----------------+   RT2   |
+                   | 1.1.1.1 |        rt2-eth1| 2.2.2.2 |
+                   |         |                |         |
+                   +---------+                +---------+
+                rt1-eth2|                          |rt2-eth2
+                        |                          |
+                        |                          |
+             10.0.2.0/24|        +---------+       |10.0.3.0/24
+                        |        |         |       |
+                        |        |   RT3   |       |
+                        +--------+ 3.3.3.3 +-------+
+                         rt3-eth2|         |rt3-eth1
+                                 +---------+
+                                      |rt3-eth0
+                                      |
+                                      |
+              ce3-eth0 (172.16.1.3/24)|
+                                 +---------+
+                                 |         |
+                                 |   CE3   |
+                                 |         |
+                                 +---------+
+"""
+
+import os
+import sys
+import pytest
+import json
+from time import sleep
+from functools import partial
+
+# Save the Current Working Directory to find configuration files.
+CWD = os.path.dirname(os.path.realpath(__file__))
+sys.path.append(os.path.join(CWD, '../'))
+
+# pylint: disable=C0413
+# Import topogen and topotest helpers
+from lib import topotest
+from lib.topogen import Topogen, TopoRouter, get_topogen
+from lib.topolog import logger
+
+# Required to instantiate the topology builder class.
+from mininet.topo import Topo
+
+class TemplateTopo(Topo):
+    "Test topology builder"
+    def build(self, *_args, **_opts):
+        "Build function"
+        tgen = get_topogen(self)
+
+        #
+        # Define FRR Routers
+        #
+        for router in ['ce1', 'ce2', 'ce3', 'r1', 'r2', 'r3']:
+            tgen.add_router(router)
+
+        #
+        # Define connections
+        #
+        switch = tgen.add_switch('s1')
+        switch.add_link(tgen.gears['ce1'])
+        switch.add_link(tgen.gears['r1'])
+
+        switch = tgen.add_switch('s2')
+        switch.add_link(tgen.gears['ce2'])
+        switch.add_link(tgen.gears['r2'])
+
+        switch = tgen.add_switch('s3')
+        switch.add_link(tgen.gears['ce3'])
+        switch.add_link(tgen.gears['r3'])
+
+        switch = tgen.add_switch('s4')
+        switch.add_link(tgen.gears['r1'])
+        switch.add_link(tgen.gears['r2'])
+
+        switch = tgen.add_switch('s5')
+        switch.add_link(tgen.gears['r1'])
+        switch.add_link(tgen.gears['r3'])
+
+        switch = tgen.add_switch('s6')
+        switch.add_link(tgen.gears['r2'])
+        switch.add_link(tgen.gears['r3'])
+
+def setup_module(mod):
+    "Sets up the pytest environment"
+    tgen = Topogen(TemplateTopo, mod.__name__)
+    tgen.start_topology()
+
+    router_list = tgen.routers()
+
+    # For all registered routers, load the zebra configuration file
+    for rname, router in router_list.iteritems():
+        router.load_config(
+            TopoRouter.RD_ZEBRA,
+            os.path.join(CWD, '{}/zebra.conf'.format(rname))
+        )
+        # Don't start ospfd and ldpd in the CE nodes
+        if router.name[0] == 'r':
+            router.load_config(
+                TopoRouter.RD_OSPF,
+                os.path.join(CWD, '{}/ospfd.conf'.format(rname))
+            )
+            router.load_config(
+                TopoRouter.RD_LDP,
+                os.path.join(CWD, '{}/ldpd.conf'.format(rname))
+            )
+
+    tgen.start_router()
+    for router in router_list.values():
+        if router.has_version('<', '3'):
+            tgen.set_error('unsupported version')
+
+def teardown_module(mod):
+    "Teardown the pytest environment"
+    tgen = get_topogen()
+
+    # This function tears down the whole topology.
+    tgen.stop_topology()
+
+def router_compare_json_output_cb(rname, command, reference):
+    tgen = get_topogen()
+    router = tgen.gears[rname]
+    output = router.vtysh_cmd(command, isjson=True)
+    refTableFile = '{}/{}/{}'.format(CWD, router.name, reference)
+    expected = json.loads(open(refTableFile).read())
+    return topotest.json_cmp(output, expected)
+
+def router_compare_json_output(rname, command, reference):
+    logger.info('Comparing router "%s" "%s" output', rname, command)
+    tgen = get_topogen()
+
+    # Run test function until we get an result. Wait at most 60 seconds.
+    test_func = partial(router_compare_json_output_cb, rname, command, reference)
+    result, diff = topotest.run_and_expect(test_func, None, count=20, wait=3)
+    assert result, '"{}" JSON output mismatches the expected result'.format(rname)
+
+def test_ospf_convergence():
+    logger.info("Test: check OSPF adjacencies")
+    tgen = get_topogen()
+
+    # Skip if previous fatal error condition is raised
+    if tgen.routers_have_failure():
+        pytest.skip(tgen.errors)
+
+    for rname in ['r1', 'r2', 'r3']:
+        router_compare_json_output(rname, "show ip ospf neighbor json", "show_ip_ospf_neighbor.ref")
+
+def test_rib():
+    logger.info("Test: verify RIB")
+    tgen = get_topogen()
+
+    # Skip if previous fatal error condition is raised
+    if tgen.routers_have_failure():
+        pytest.skip(tgen.errors)
+
+    for rname in ['r1', 'r2', 'r3']:
+        router_compare_json_output(rname, "show ip route json", "show_ip_route.ref")
+
+def test_ldp_adjacencies():
+    logger.info("Test: verify LDP adjacencies")
+    tgen = get_topogen()
+
+    # Skip if previous fatal error condition is raised
+    if tgen.routers_have_failure():
+        pytest.skip(tgen.errors)
+
+    for rname in ['r1', 'r2', 'r3']:
+        router_compare_json_output(rname, "show mpls ldp discovery json", "show_ldp_discovery.ref")
+
+def test_ldp_neighbors():
+    logger.info("Test: verify LDP neighbors")
+    tgen = get_topogen()
+
+    # Skip if previous fatal error condition is raised
+    if tgen.routers_have_failure():
+        pytest.skip(tgen.errors)
+
+    for rname in ['r1', 'r2', 'r3']:
+        router_compare_json_output(rname, "show mpls ldp neighbor json", "show_ldp_neighbor.ref")
+
+def test_ldp_bindings():
+    logger.info("Test: verify LDP bindings")
+    tgen = get_topogen()
+
+    # Skip if previous fatal error condition is raised
+    if tgen.routers_have_failure():
+        pytest.skip(tgen.errors)
+
+    for rname in ['r1', 'r2', 'r3']:
+        router_compare_json_output(rname, "show mpls ldp binding json", "show_ldp_binding.ref")
+
+def test_ldp_pwid_bindings():
+    logger.info("Test: verify LDP PW-ID bindings")
+    tgen = get_topogen()
+
+    # Skip if previous fatal error condition is raised
+    if tgen.routers_have_failure():
+        pytest.skip(tgen.errors)
+
+    for rname in ['r1', 'r2', 'r3']:
+        router_compare_json_output(rname, "show l2vpn atom binding json", "show_l2vpn_binding.ref")
+
+def test_ldp_pseudowires():
+    logger.info("Test: verify LDP pseudowires")
+    tgen = get_topogen()
+
+    # Skip if previous fatal error condition is raised
+    if tgen.routers_have_failure():
+        pytest.skip(tgen.errors)
+
+    for rname in ['r1', 'r2', 'r3']:
+        router_compare_json_output(rname, "show l2vpn atom vc json", "show_l2vpn_vc.ref")
+
+def test_ldp_pseudowires_after_link_down():
+    logger.info("Test: verify LDP pseudowires after r1-r2 link goes down")
+    tgen = get_topogen()
+
+    # Skip if previous fatal error condition is raised
+    if tgen.routers_have_failure():
+        pytest.skip(tgen.errors)
+
+    # Shut down r1-r2 link */
+    tgen = get_topogen()
+    tgen.gears['r1'].peer_link_enable('r1-eth1', False)
+
+    # Wait 15 seconds for the r1-r2 LDP link adjacencies to time out
+    sleep(15)
+
+    # check if the pseudowire is still up (using an alternate path for nexthop resolution)
+    for rname in ['r1', 'r2', 'r3']:
+        router_compare_json_output(rname, "show l2vpn atom vc json", "show_l2vpn_vc.ref")
+
+# Memory leak test template
+def test_memory_leak():
+    "Run the memory leak test and report results."
+    tgen = get_topogen()
+    if not tgen.is_memleak_enabled():
+        pytest.skip('Memory leak test/report is disabled')
+
+    tgen.report_memory_leaks()
+
+if __name__ == '__main__':
+    args = ["-s"] + sys.argv[1:]
+    sys.exit(pytest.main(args))
diff --git a/lib/topogen.py b/lib/topogen.py
index 177d908746e5..86b287301509 100644
--- a/lib/topogen.py
+++ b/lib/topogen.py
@@ -109,7 +109,8 @@ def __init__(self, cls, modname='unnamed'):
         self.routern = 1
         self.switchn = 1
         self.modname = modname
-        self.errors = {}
+        self.errorsd = {}
+        self.errors = ''
         self.peern = 1
         self._init_topo(cls)
         logger.info('loading topology: {}'.format(self.modname))
@@ -357,13 +358,14 @@ def set_error(self, message, code=None):
 
         # If no code is defined use a sequential number
         if code is None:
-            code = len(self.errors)
+            code = len(self.errorsd)
 
-        self.errors[code] = message
+        self.errorsd[code] = message
+        self.errors += '\n{}: {}'.format(code, message)
 
     def has_errors(self):
         "Returns whether errors exist or not."
-        return len(self.errors) > 0
+        return len(self.errorsd) > 0
 
     def routers_have_failure(self):
         "Runs an assertion to make sure that all routers are running."
@@ -622,6 +624,9 @@ def start(self):
             self.vtysh_cmd('configure terminal\nlog file {}/{}-{}.log'.format(
                 self.logdir, self.name, daemon), daemon=daemon)
 
+        if result != '':
+            self.tgen.set_error(result)
+
         return result
 
     def stop(self):
@@ -712,10 +717,16 @@ def version_info(self):
         "Get equipment information from 'show version'."
         output = self.vtysh_cmd('show version').split('\n')[0]
         columns = topotest.normalize_text(output).split(' ')
-        return {
-            'type': columns[0],
-            'version': columns[1],
-        }
+        try:
+            return {
+                'type': columns[0],
+                'version': columns[1],
+            }
+        except IndexError:
+            return {
+                'type': None,
+                'version': None,
+            }
 
     def has_version(self, cmpop, version):
         """
@@ -730,6 +741,9 @@ def has_version(self, cmpop, version):
         Usage example: router.has_version('>', '1.0')
         """
         rversion = self.version_info()['version']
+        if rversion is None:
+            return False
+
         result = topotest.version_cmp(rversion, version)
         if cmpop == '>=':
             return result >= 0