diff --git a/lighty-examples/lighty-bgp-community-restconf-app/LIGHTY-BGP.postman_collection.json b/lighty-examples/lighty-bgp-community-restconf-app/LIGHTY-BGP.postman_collection.json
index 20f7c94ac..0baa96b6e 100644
--- a/lighty-examples/lighty-bgp-community-restconf-app/LIGHTY-BGP.postman_collection.json
+++ b/lighty-examples/lighty-bgp-community-restconf-app/LIGHTY-BGP.postman_collection.json
@@ -1,6 +1,6 @@
 {
 	"info": {
-		"_postman_id": "a109e81e-8940-4d7d-aef3-0aa459b04907",
+		"_postman_id": "903dacee-5543-4b97-b5c6-9fb50722dcce",
 		"name": "LIGHTY-BGP",
 		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
 	},
@@ -31,11 +31,12 @@
 							"raw": "<topology xmlns=\"urn:TBD:params:xml:ns:yang:network-topology\">\n    <topology-id>bgp-example-ipv4-topology</topology-id>\n    <topology-types>\n        <bgp-ipv4-reachability-topology xmlns=\"urn:opendaylight:params:xml:ns:yang:odl-bgp-topology-types\"></bgp-ipv4-reachability-topology>\n    </topology-types>\n    <rib-id xmlns=\"urn:opendaylight:params:xml:ns:yang:odl-bgp-topology-config\">bgp-example</rib-id>\n</topology>"
 						},
 						"url": {
-							"raw": "{{lighty-host}}restconf/data/network-topology:network-topology",
+							"raw": "{{lighty-host}}/restconf/data/network-topology:network-topology",
 							"host": [
-								"{{lighty-host}}restconf"
+								"{{lighty-host}}"
 							],
 							"path": [
+								"restconf",
 								"data",
 								"network-topology:network-topology"
 							]
@@ -66,18 +67,17 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "<topology xmlns=\"urn:TBD:params:xml:ns:yang:network-topology\">\n    <topology-id>bgp-example-ipv4-topology</topology-id>\n    <topology-types>\n        <bgp-ipv4-reachability-topology xmlns=\"urn:opendaylight:params:xml:ns:yang:odl-bgp-topology-types\"></bgp-ipv4-reachability-topology>\n    </topology-types>\n    <rib-id xmlns=\"urn:opendaylight:params:xml:ns:yang:odl-bgp-topology-config\">bgp-example</rib-id>\n</topology>"
+							"raw": ""
 						},
 						"url": {
-							"raw": "{{lighty-host}}/restconf/data/network-topology:network-topology/topology=bgp-example-ipv4-topology",
+							"raw": "{{lighty-host}}/restconf/data/network-topology:network-topology",
 							"host": [
 								"{{lighty-host}}"
 							],
 							"path": [
 								"restconf",
 								"data",
-								"network-topology:network-topology",
-								"topology=bgp-example-ipv4-topology"
+								"network-topology:network-topology"
 							]
 						}
 					},
@@ -110,7 +110,7 @@
 						"header": [],
 						"body": {
 							"mode": "raw",
-							"raw": "<protocol xmlns=\"http://openconfig.net/yang/network-instance\">\n    <name>bgp-example</name>\n    <identifier xmlns:x=\"http://openconfig.net/yang/policy-types\">x:BGP</identifier>\n    <bgp xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp:openconfig-extensions\">\n        <global>\n            <config>\n                <router-id>10.0.0.51</router-id>\n                <as>64496</as>\n            </config>\n            <apply-policy>\n                <config>\n                   <default-export-policy>REJECT-ROUTE</default-export-policy>\n                   <default-import-policy>REJECT-ROUTE</default-import-policy>\n                   <import-policy>default-odl-import-policy</import-policy>\n                   <export-policy>default-odl-export-policy</export-policy>\n                </config>\n            </apply-policy>\n                            <afi-safis>\n                    <afi-safi>\n                        <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:IPV4-UNICAST</afi-safi-name>\n                    </afi-safi>\n                    <afi-safi>\n                        <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:IPV6-UNICAST</afi-safi-name>\n                    </afi-safi>\n                    <afi-safi>\n                        <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:IPV4-LABELLED-UNICAST</afi-safi-name>\n                    </afi-safi>\n                    <afi-safi>\n                        <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:IPV6-LABELLED-UNICAST</afi-safi-name>\n                    </afi-safi>\n                    <afi-safi>\n                        <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:L3VPN-IPV4-UNICAST</afi-safi-name>\n                    </afi-safi>\n                    <afi-safi>\n                        <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:L3VPN-IPV6-UNICAST</afi-safi-name>\n                    </afi-safi>\n                    <afi-safi>\n                        <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:L3VPN-IPV4-MULTICAST</afi-safi-name>\n                    </afi-safi>\n                    <afi-safi>\n                        <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:L3VPN-IPV6-MULTICAST</afi-safi-name>\n                    </afi-safi>\n                    <afi-safi>\n                        <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:L2VPN-EVPN</afi-safi-name>\n                    </afi-safi>\n                    <afi-safi>\n                        <afi-safi-name>LINKSTATE</afi-safi-name>\n                    </afi-safi>\n                    <afi-safi>\n                        <afi-safi-name>IPV4-FLOW</afi-safi-name>\n                    </afi-safi>\n                    <afi-safi>\n                        <afi-safi-name>IPV6-FLOW</afi-safi-name>\n                    </afi-safi>\n                    <afi-safi>\n                        <afi-safi-name>IPV4-L3VPN-FLOW</afi-safi-name>\n                    </afi-safi>\n                    <afi-safi>\n                        <afi-safi-name>IPV6-L3VPN-FLOW</afi-safi-name>\n                    </afi-safi>\n                    <afi-safi>\n                        <afi-safi-name>IPV4-MCAST-VPN</afi-safi-name>\n                    </afi-safi>\n                    <afi-safi>\n                        <afi-safi-name>IPV6-MCAST-VPN</afi-safi-name>\n                    </afi-safi>\n                    <afi-safi>\n                        <afi-safi-name>ROUTE-TARGET-CONSTRAIN</afi-safi-name>\n                    </afi-safi>\n                </afi-safis>\n        </global>\n    </bgp>\n</protocol>",
+							"raw": "<protocol xmlns=\"http://openconfig.net/yang/network-instance\">\n    <name>bgp-example</name>\n    <identifier xmlns:x=\"http://openconfig.net/yang/policy-types\">x:BGP</identifier>\n    <bgp xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp:openconfig-extensions\">\n        <global>\n            <config>\n                <router-id>127.0.0.1</router-id>\n                <as>64496</as>\n            </config>\n            <apply-policy>\n                <config>\n                    <default-export-policy>REJECT-ROUTE</default-export-policy>\n                    <default-import-policy>REJECT-ROUTE</default-import-policy>\n                    <import-policy>default-odl-import-policy</import-policy>\n                    <export-policy>default-odl-export-policy</export-policy>\n                </config>\n            </apply-policy>\n        </global>\n    </bgp>\n</protocol>",
 							"options": {
 								"raw": {
 									"language": "xml"
@@ -158,7 +158,7 @@
 						"header": [],
 						"body": {
 							"mode": "raw",
-							"raw": "<protocol xmlns=\"http://openconfig.net/yang/network-instance\">\n    <name>bgp-example</name>\n    <identifier xmlns:x=\"http://openconfig.net/yang/policy-types\">x:BGP</identifier>\n    <bgp xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp:openconfig-extensions\">\n        <global>\n            <config>\n                <router-id>10.0.0.51</router-id>\n                <as>64496</as>\n            </config>\n            <apply-policy>\n                <config>\n                   <default-export-policy>REJECT-ROUTE</default-export-policy>\n                   <default-import-policy>REJECT-ROUTE</default-import-policy>\n                   <import-policy>default-odl-import-policy</import-policy>\n                   <export-policy>default-odl-export-policy</export-policy>\n                </config>\n            </apply-policy>\n        </global>\n    </bgp>\n</protocol>",
+							"raw": "",
 							"options": {
 								"raw": {
 									"language": "xml"
@@ -206,7 +206,7 @@
 						"header": [],
 						"body": {
 							"mode": "raw",
-							"raw": "<peer-group xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp:openconfig-extensions\">\n    <peer-group-name>external-neighbor</peer-group-name>\n    <config>\n        <peer-type>EXTERNAL</peer-type>\n        <peer-as>64496</peer-as>\n    </config>\n    <transport>\n        <config>\n            <remote-port>179</remote-port>\n        </config>\n    </transport>\n    <graceful-restart>\n        <config>\n            <restart-time>60</restart-time>\n        </config>\n    </graceful-restart>\n    <afi-safis>\n        <afi-safi>\n            <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:IPV4-UNICAST</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:IPV6-UNICAST</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:IPV4-LABELLED-UNICAST</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:IPV6-LABELLED-UNICAST</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:L3VPN-IPV4-UNICAST</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:L3VPN-IPV6-UNICAST</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:L3VPN-IPV4-MULTICAST</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:L3VPN-IPV6-MULTICAST</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:L2VPN-EVPN</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name>LINKSTATE</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name>IPV6-FLOW</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name>IPV4-L3VPN-FLOW</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name>IPV6-L3VPN-FLOW</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name>IPV4-MCAST-VPN</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name>IPV6-MCAST-VPN</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name>ROUTE-TARGET-CONSTRAIN</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n    </afi-safis>\n</peer-group>",
+							"raw": "<peer-group xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp:openconfig-extensions\">\n    <peer-group-name>external-neighbor</peer-group-name>\n    <config>\n        <peer-type>EXTERNAL</peer-type>\n        <peer-as>64496</peer-as>\n    </config>\n    <transport>\n        <config>\n            <remote-port>17900</remote-port>\n        </config>\n    </transport>\n    <graceful-restart>\n        <config>\n            <restart-time>60</restart-time>\n        </config>\n    </graceful-restart>\n    <afi-safis>\n        <afi-safi>\n            <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:IPV4-UNICAST</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:IPV6-UNICAST</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:IPV4-LABELLED-UNICAST</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:IPV6-LABELLED-UNICAST</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:L3VPN-IPV4-UNICAST</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:L3VPN-IPV6-UNICAST</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:L3VPN-IPV4-MULTICAST</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:L3VPN-IPV6-MULTICAST</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:L2VPN-EVPN</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name>LINKSTATE</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name>IPV6-FLOW</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name>IPV4-L3VPN-FLOW</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name>IPV6-L3VPN-FLOW</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name>IPV4-MCAST-VPN</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name>IPV6-MCAST-VPN</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n        <afi-safi>\n            <afi-safi-name>ROUTE-TARGET-CONSTRAIN</afi-safi-name>\n            <graceful-restart>\n                <config>\n                    <enabled>true</enabled>\n                </config>\n            </graceful-restart>\n        </afi-safi>\n    </afi-safis>\n</peer-group>",
 							"options": {
 								"raw": {
 									"language": "xml"
@@ -234,9 +234,6 @@
 				},
 				{
 					"name": "Connect peer",
-					"protocolProfileBehavior": {
-						"disableBodyPruning": true
-					},
 					"request": {
 						"auth": {
 							"type": "basic",
@@ -253,11 +250,11 @@
 								}
 							]
 						},
-						"method": "GET",
+						"method": "POST",
 						"header": [],
 						"body": {
 							"mode": "raw",
-							"raw": "<neighbor xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp:openconfig-extensions\">\n    <neighbor-address>10.0.0.52</neighbor-address>\n    <config>\n        <peer-group>/bgp/neighbors/neighbor/bgp/peer-groups/peer-group[peer-group-name=\"external-neighbor\"]</peer-group>\n    </config>\n</neighbor>",
+							"raw": "<neighbor xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp:openconfig-extensions\">\n    <neighbor-address>127.0.0.2</neighbor-address>\n    <config>\n        <peer-group>/bgp/neighbors/neighbor/bgp/peer-groups/peer-group[peer-group-name=\"external-neighbor\"]</peer-group>\n    </config>\n</neighbor>",
 							"options": {
 								"raw": {
 									"language": "xml"
@@ -315,10 +312,10 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "<protocols xmlns=\"http://openconfig.net/yang/network-instance\">\r\n    <protocol>\r\n        <name>bgp-peer</name>\r\n        <identifier xmlns:x=\"http://openconfig.net/yang/policy-types\">x:BGP</identifier>\r\n        <bgp xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp:openconfig-extensions\">\r\n            <global>\r\n                <config>\r\n                    <!-- configure BGP-AS and router-id for bgp-rr node (lighty-bgp) -->\r\n                    <router-id>172.18.0.3</router-id>\r\n                    <as>65100</as>\r\n                </config>\r\n                <apply-policy>\r\n                    <config>\r\n                        <!-- policies applied for routing information import and export, in this example we want all routes to be accepted -->\r\n                        <default-export-policy>ACCEPT-ROUTE</default-export-policy>\r\n                        <default-import-policy>ACCEPT-ROUTE</default-import-policy>\r\n                        <import-policy>default-odl-import-policy</import-policy>\r\n                        <export-policy>default-odl-export-policy</export-policy>\r\n                    </config>\r\n                </apply-policy>\r\n                <afi-safis>\r\n                    <!-- enable accepting address families, in this case all possible -->\r\n                    <afi-safi>\r\n                        <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:IPV4-UNICAST</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:IPV6-UNICAST</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:IPV4-LABELLED-UNICAST</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:IPV6-LABELLED-UNICAST</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:L3VPN-IPV4-UNICAST</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:L3VPN-IPV6-UNICAST</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:L3VPN-IPV4-MULTICAST</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:L3VPN-IPV6-MULTICAST</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:L2VPN-EVPN</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name>LINKSTATE</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name>IPV4-FLOW</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name>IPV6-FLOW</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name>IPV4-L3VPN-FLOW</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name>IPV6-L3VPN-FLOW</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name>IPV4-MCAST-VPN</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name>IPV6-MCAST-VPN</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name>ROUTE-TARGET-CONSTRAIN</afi-safi-name>\r\n                    </afi-safi>\r\n                </afi-safis>\r\n            </global>\r\n            <neighbors>\r\n                <neighbor>\r\n                    <!-- ip address of the neighbor (CEOS3) -->\r\n                    <neighbor-address>172.18.0.4</neighbor-address>\r\n                    <config>\r\n        \t\t\t\t<peer-type>INTERNAL</peer-type>\r\n        \t\t\t\t<peer-as>65100</peer-as>\r\n    \t\t\t\t</config>\r\n                    <!-- define BGP peering under AFI IPv4 and L2VPN SAFI EVPN -->\r\n                    <afi-safis>\r\n                    \t<afi-safi>\r\n                            <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:IPV4-UNICAST</afi-safi-name>\r\n                        </afi-safi>\r\n                    \t<afi-safi>\r\n                            <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:L2VPN-EVPN</afi-safi-name>\r\n                        </afi-safi>\r\n                    </afi-safis>\r\n                    <!-- define BGP hold-time timer -->\r\n                    <timers>\r\n                        <config>\r\n                            <hold-time>180</hold-time>\r\n                            <connect-retry>5</connect-retry>\r\n                        </config>\r\n                    </timers>\r\n                    <!-- define TCP transport capabilities -->\r\n                    <transport>\r\n                        <config>\r\n                            <remote-port>179</remote-port>\r\n                            <passive-mode>true</passive-mode>\r\n                            <local-address>172.18.0.4</local-address>\r\n                        </config>\r\n                    </transport>\r\n                </neighbor>\r\n            </neighbors>\r\n        </bgp>\r\n    </protocol>\r\n</protocols>"
+							"raw": ""
 						},
 						"url": {
-							"raw": "{{lighty-host}}/restconf/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,bgp-example/bgp-openconfig-extensions:bgp/neighbors/neighbor=10.0.0.52/state",
+							"raw": "{{lighty-host}}/restconf/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,bgp-example/bgp-openconfig-extensions:bgp/neighbors/neighbor=127.0.0.2/state",
 							"host": [
 								"{{lighty-host}}"
 							],
@@ -331,12 +328,60 @@
 								"protocol=openconfig-policy-types%3ABGP,bgp-example",
 								"bgp-openconfig-extensions:bgp",
 								"neighbors",
-								"neighbor=10.0.0.52",
+								"neighbor=127.0.0.2",
 								"state"
 							]
 						}
 					},
 					"response": []
+				},
+				{
+					"name": "Connect multiple peers",
+					"request": {
+						"auth": {
+							"type": "basic",
+							"basic": [
+								{
+									"key": "password",
+									"value": "admin",
+									"type": "string"
+								},
+								{
+									"key": "username",
+									"value": "admin",
+									"type": "string"
+								}
+							]
+						},
+						"method": "PUT",
+						"header": [],
+						"body": {
+							"mode": "raw",
+							"raw": "<neighbors xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp:openconfig-extensions\">\n    <neighbor>\n        <neighbor-address>127.0.0.2</neighbor-address>\n        <config>\n            <peer-group>/bgp/neighbors/neighbor/bgp/peer-groups/peer-group[peer-group-name=\"external-neighbor\"]</peer-group>\n        </config>\n    </neighbor>\n    <neighbor>\n        <neighbor-address>127.0.0.3</neighbor-address>\n        <config>\n            <peer-group>/bgp/neighbors/neighbor/bgp/peer-groups/peer-group[peer-group-name=\"external-neighbor\"]</peer-group>\n        </config>\n    </neighbor>\n    <neighbor>\n        <neighbor-address>127.0.0.4</neighbor-address>\n        <config>\n            <peer-group>/bgp/neighbors/neighbor/bgp/peer-groups/peer-group[peer-group-name=\"external-neighbor\"]</peer-group>\n        </config>\n    </neighbor>\n    <neighbor>\n        <neighbor-address>127.0.0.5</neighbor-address>\n        <config>\n            <peer-group>/bgp/neighbors/neighbor/bgp/peer-groups/peer-group[peer-group-name=\"external-neighbor\"]</peer-group>\n        </config>\n    </neighbor>\n        <neighbor>\n        <neighbor-address>127.0.0.6</neighbor-address>\n        <config>\n            <peer-group>/bgp/neighbors/neighbor/bgp/peer-groups/peer-group[peer-group-name=\"external-neighbor\"]</peer-group>\n        </config>\n    </neighbor>\n</neighbors>",
+							"options": {
+								"raw": {
+									"language": "xml"
+								}
+							}
+						},
+						"url": {
+							"raw": "{{lighty-host}}/restconf/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,bgp-example/bgp-openconfig-extensions:bgp/neighbors",
+							"host": [
+								"{{lighty-host}}"
+							],
+							"path": [
+								"restconf",
+								"data",
+								"openconfig-network-instance:network-instances",
+								"network-instance=global-bgp",
+								"openconfig-network-instance:protocols",
+								"protocol=openconfig-policy-types%3ABGP,bgp-example",
+								"bgp-openconfig-extensions:bgp",
+								"neighbors"
+							]
+						}
+					},
+					"response": []
 				}
 			]
 		},
@@ -372,7 +417,7 @@
 				],
 				"body": {
 					"mode": "raw",
-					"raw": "<protocols xmlns=\"http://openconfig.net/yang/network-instance\">\r\n    <protocol>\r\n        <name>bgp-peer</name>\r\n        <identifier xmlns:x=\"http://openconfig.net/yang/policy-types\">x:BGP</identifier>\r\n        <bgp xmlns=\"urn:opendaylight:params:xml:ns:yang:bgp:openconfig-extensions\">\r\n            <global>\r\n                <config>\r\n                    <!-- configure BGP-AS and router-id for bgp-rr node (lighty-bgp) -->\r\n                    <router-id>172.18.0.3</router-id>\r\n                    <as>65100</as>\r\n                </config>\r\n                <apply-policy>\r\n                    <config>\r\n                        <!-- policies applied for routing information import and export, in this example we want all routes to be accepted -->\r\n                        <default-export-policy>ACCEPT-ROUTE</default-export-policy>\r\n                        <default-import-policy>ACCEPT-ROUTE</default-import-policy>\r\n                        <import-policy>default-odl-import-policy</import-policy>\r\n                        <export-policy>default-odl-export-policy</export-policy>\r\n                    </config>\r\n                </apply-policy>\r\n                <afi-safis>\r\n                    <!-- enable accepting address families, in this case all possible -->\r\n                    <afi-safi>\r\n                        <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:IPV4-UNICAST</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:IPV6-UNICAST</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:IPV4-LABELLED-UNICAST</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:IPV6-LABELLED-UNICAST</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:L3VPN-IPV4-UNICAST</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:L3VPN-IPV6-UNICAST</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:L3VPN-IPV4-MULTICAST</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:L3VPN-IPV6-MULTICAST</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:L2VPN-EVPN</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name>LINKSTATE</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name>IPV4-FLOW</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name>IPV6-FLOW</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name>IPV4-L3VPN-FLOW</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name>IPV6-L3VPN-FLOW</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name>IPV4-MCAST-VPN</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name>IPV6-MCAST-VPN</afi-safi-name>\r\n                    </afi-safi>\r\n                    <afi-safi>\r\n                        <afi-safi-name>ROUTE-TARGET-CONSTRAIN</afi-safi-name>\r\n                    </afi-safi>\r\n                </afi-safis>\r\n            </global>\r\n            <neighbors>\r\n                <neighbor>\r\n                    <!-- ip address of the neighbor (CEOS3) -->\r\n                    <neighbor-address>172.18.0.4</neighbor-address>\r\n                    <config>\r\n        \t\t\t\t<peer-type>INTERNAL</peer-type>\r\n        \t\t\t\t<peer-as>65100</peer-as>\r\n    \t\t\t\t</config>\r\n                    <!-- define BGP peering under AFI IPv4 and L2VPN SAFI EVPN -->\r\n                    <afi-safis>\r\n                    \t<afi-safi>\r\n                            <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:IPV4-UNICAST</afi-safi-name>\r\n                        </afi-safi>\r\n                    \t<afi-safi>\r\n                            <afi-safi-name xmlns:x=\"http://openconfig.net/yang/bgp-types\">x:L2VPN-EVPN</afi-safi-name>\r\n                        </afi-safi>\r\n                    </afi-safis>\r\n                    <!-- define BGP hold-time timer -->\r\n                    <timers>\r\n                        <config>\r\n                            <hold-time>180</hold-time>\r\n                            <connect-retry>5</connect-retry>\r\n                        </config>\r\n                    </timers>\r\n                    <!-- define TCP transport capabilities -->\r\n                    <transport>\r\n                        <config>\r\n                            <remote-port>179</remote-port>\r\n                            <passive-mode>true</passive-mode>\r\n                            <local-address>172.18.0.4</local-address>\r\n                        </config>\r\n                    </transport>\r\n                </neighbor>\r\n            </neighbors>\r\n        </bgp>\r\n    </protocol>\r\n</protocols>"
+					"raw": ""
 				},
 				"url": {
 					"raw": "{{lighty-host}}/restconf/data/openconfig-routing-policy:routing-policy/policy-definitions",
@@ -413,7 +458,8 @@
 	"variable": [
 		{
 			"key": "lighty-host",
-			"value": "http://127.0.0.1:8888"
+			"value": "http://127.0.0.1:8888",
+			"type": "default"
 		}
 	]
 }
\ No newline at end of file