From fe9905263190dfd0a5956f682f93895e7021ccbb Mon Sep 17 00:00:00 2001
From: Tomas Markovic <tomas.markovic@pantheon.tech>
Date: Tue, 19 Jun 2018 07:13:36 +0200
Subject: [PATCH] Add peer group configuration

There are now base peer-groups defined,
which we can use for shorter peer configuration
definition. But this is only avaiable to
fluorine, so I am adding this only to fluorine tests.

Change-Id: I65507022d68708bcded838bc3483772792492c1c
Signed-off-by: Tomas Markovic <tomas.markovic@pantheon.tech>
---
 .../bgpfunct/060_bgp_functional_mvpn.robot    |  2 --
 .../bgpfunctional/mvpn/bgp_peer/data.xml      | 32 +------------------
 2 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/csit/suites/bgpcep/bgpfunct/060_bgp_functional_mvpn.robot b/csit/suites/bgpcep/bgpfunct/060_bgp_functional_mvpn.robot
index 36441bbc35..2b59d70ae4 100644
--- a/csit/suites/bgpcep/bgpfunct/060_bgp_functional_mvpn.robot
+++ b/csit/suites/bgpcep/bgpfunct/060_bgp_functional_mvpn.robot
@@ -28,8 +28,6 @@ Resource          ../../../variables/Variables.robot
 
 *** Variables ***
 ${HOLDTIME}       180
-${APP_PEER_NAME}    example-bgp-peer-app
-${BGP_DIR}        ${CURDIR}/../../../variables/bgpfunctional
 ${CONFIG_SESSION}    config-session
 ${MVPN_DIR}       ${CURDIR}/../../../variables/bgpfunctional/mvpn
 ${PLAY_SCRIPT}    ${CURDIR}/../../../../tools/fastbgp/play.py
diff --git a/csit/variables/bgpfunctional/mvpn/bgp_peer/data.xml b/csit/variables/bgpfunctional/mvpn/bgp_peer/data.xml
index ba486131a3..a1f4368b19 100644
--- a/csit/variables/bgpfunctional/mvpn/bgp_peer/data.xml
+++ b/csit/variables/bgpfunctional/mvpn/bgp_peer/data.xml
@@ -1,36 +1,6 @@
 <neighbor xmlns="urn:opendaylight:params:xml:ns:yang:bgp:openconfig-extensions">
     <neighbor-address>$IP</neighbor-address>
-    <route-reflector>
-        <config>
-            <route-reflector-client>false</route-reflector-client>
-        </config>
-    </route-reflector>
-    <timers>
-        <config>
-            <hold-time>$HOLDTIME</hold-time>
-        </config>
-    </timers>
-    <transport>
-        <config>
-            <remote-port>$PEER_PORT</remote-port>
-            <passive-mode>$PASSIVE_MODE</passive-mode>
-        </config>
-    </transport>
     <config>
-        <peer-type>INTERNAL</peer-type>
+        <peer-group>/bgp/neighbors/neighbor/bgp/peer-groups/peer-group[peer-group-name="internal-neighbor"]</peer-group>
     </config>
-    <afi-safis>
-        <afi-safi>
-            <afi-safi-name xmlns:x="http://openconfig.net/yang/bgp-types">x:IPV4-UNICAST</afi-safi-name>
-        </afi-safi>
-        <afi-safi>
-            <afi-safi-name>IPV4-MCAST-VPN</afi-safi-name>
-        </afi-safi>
-        <afi-safi>
-            <afi-safi-name>IPV6-MCAST-VPN</afi-safi-name>
-        </afi-safi>
-        <afi-safi>
-            <afi-safi-name>LINKSTATE</afi-safi-name>
-        </afi-safi>
-    </afi-safis>
 </neighbor>
-- 
2.36.6