Adding Encapsulation in VPLS and correcting bugs.

Change-Id: Idc0c1834ae2bbd0fdaf564fd65360cc0f018d18d
diff --git a/tools/test/topos/vpls.json b/tools/test/topos/vpls.json
index a7eceea..0ffe259 100644
--- a/tools/test/topos/vpls.json
+++ b/tools/test/topos/vpls.json
@@ -47,8 +47,8 @@
   },
   "apps" : {
     "org.onosproject.vpls" : {
-      "vpls" : {
-        "vplsNetworks" : [
+      "vpls": {
+        "vplsList" : [
           {
             "name" : "net1",
             "interfaces" : ["vlan100H1", "vlan200H1"]