X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=csit%2Fsuites%2Fbgpcep%2Fbgpfunct%2F060_bgp_functional_mvpn.robot;fp=csit%2Fsuites%2Fbgpcep%2Fbgpfunct%2F060_bgp_functional_mvpn.robot;h=35e5ad6179898e831b5f35f44cd8d822d1eaae39;hb=bb40dc3a88bc93489e703c24e25469dd6aaaa74b;hp=846a04a0f0bc3c8dafa503f48e366b38d96f49ce;hpb=033145416651ef18a2c786d9de977d268539eaeb;p=integration%2Ftest.git

diff --git a/csit/suites/bgpcep/bgpfunct/060_bgp_functional_mvpn.robot b/csit/suites/bgpcep/bgpfunct/060_bgp_functional_mvpn.robot
index 846a04a0f0..35e5ad6179 100644
--- a/csit/suites/bgpcep/bgpfunct/060_bgp_functional_mvpn.robot
+++ b/csit/suites/bgpcep/bgpfunct/060_bgp_functional_mvpn.robot
@@ -1,50 +1,66 @@
 *** Settings ***
-Documentation     Functional test for bgp - mvpn
+Documentation       Functional test for bgp - mvpn
 ...
-...               Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+...                 Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
 ...
-...               This program and the accompanying materials are made available under the
-...               terms of the Eclipse Public License v1.0 which accompanies this distbmution,
-...               and is available at http://www.eclipse.org/legal/epl-v10.html
+...                 This program and the accompanying materials are made available under the
+...                 terms of the Eclipse Public License v1.0 which accompanies this distbmution,
+...                 and is available at http://www.eclipse.org/legal/epl-v10.html
 ...
-...               This suite tests advertising mvpn routes to odl. For advertising play.py is used,
-...               and particular files are stored as *.hex files. There are 7 different
-...               types of routes used for auto-discovery of multicast network. Also 4 more routes
-...               with new attributes specific for mvpn.
-Suite Setup       Start_Suite
-Suite Teardown    Stop_Suite
-Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
-Library           RequestsLibrary
-Library           SSHLibrary
-Library           String
-Library           ../../../libraries/BgpRpcClient.py    ${TOOLS_SYSTEM_IP}
-Resource          ../../../libraries/BGPcliKeywords.robot
-Resource          ../../../libraries/BGPSpeaker.robot
-Resource          ../../../libraries/BgpOperations.robot
-Resource          ../../../libraries/SetupUtils.robot
-Resource          ../../../libraries/SSHKeywords.robot
-Resource          ../../../libraries/TemplatedRequests.robot
-Resource          ../../../variables/Variables.robot
+...                 This suite tests advertising mvpn routes to odl. For advertising play.py is used,
+...                 and particular files are stored as *.hex files. There are 7 different
+...                 types of routes used for auto-discovery of multicast network. Also 4 more routes
+...                 with new attributes specific for mvpn.
+
+Library             RequestsLibrary
+Library             SSHLibrary
+Library             String
+Library             ../../../libraries/BgpRpcClient.py    ${TOOLS_SYSTEM_IP}
+Resource            ../../../libraries/BGPcliKeywords.robot
+Resource            ../../../libraries/BGPSpeaker.robot
+Resource            ../../../libraries/BgpOperations.robot
+Resource            ../../../libraries/SetupUtils.robot
+Resource            ../../../libraries/SSHKeywords.robot
+Resource            ../../../libraries/TemplatedRequests.robot
+Resource            ../../../variables/Variables.robot
+
+Suite Setup         Start_Suite
+Suite Teardown      Stop_Suite
+Test Setup          SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
+
 
 *** Variables ***
-${HOLDTIME}       180
-${CONFIG_SESSION}    config-session
-${MVPN_DIR}       ${CURDIR}/../../../variables/bgpfunctional/mvpn
-${PLAY_SCRIPT}    ${CURDIR}/../../../../tools/fastbgp/play.py
-${RIB_NAME}       example-bgp-rib
-&{MVPN_APP_PEER}    IP=${ODL_SYSTEM_IP}    BGP_RIB=${RIB_NAME}
-&{MVPN_ODL_CONFIG}    IP=${TOOLS_SYSTEM_IP}    HOLDTIME=${HOLDTIME}    PEER_PORT=${BGP_TOOL_PORT}    INITIATE=false    BGP_RIB=${RIB_NAME}    PASSIVE_MODE=true
+${HOLDTIME}             180
+${CONFIG_SESSION}       config-session
+${MVPN_DIR}             ${CURDIR}/../../../variables/bgpfunctional/mvpn
+${PLAY_SCRIPT}          ${CURDIR}/../../../../tools/fastbgp/play.py
+${RIB_NAME}             example-bgp-rib
+&{MVPN_APP_PEER}        IP=${ODL_SYSTEM_IP}    BGP_RIB=${RIB_NAME}
+&{MVPN_ODL_CONFIG}
+...                     IP=${TOOLS_SYSTEM_IP}
+...                     HOLDTIME=${HOLDTIME}
+...                     PEER_PORT=${BGP_TOOL_PORT}
+...                     INITIATE=false
+...                     BGP_RIB=${RIB_NAME}
+...                     PASSIVE_MODE=true
+
 
 *** Test Cases ***
 Configure_App_Peer
     [Documentation]    Configures bgp application peer.
     [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
-    TemplatedRequests.Put_As_Xml_Templated    ${MVPN_DIR}/app_peer    mapping=${MVPN_APP_PEER}    session=${CONFIG_SESSION}
+    TemplatedRequests.Put_As_Xml_Templated
+    ...    ${MVPN_DIR}/app_peer
+    ...    mapping=${MVPN_APP_PEER}
+    ...    session=${CONFIG_SESSION}
 
 Reconfigure_ODL_To_Accept_Connection
     [Documentation]    Configures BGP peer module with initiate-connection set to false.
     [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
-    TemplatedRequests.Put_As_Xml_Templated    ${MVPN_DIR}/bgp_peer    mapping=${MVPN_ODL_CONFIG}    session=${CONFIG_SESSION}
+    TemplatedRequests.Put_As_Xml_Templated
+    ...    ${MVPN_DIR}/bgp_peer
+    ...    mapping=${MVPN_ODL_CONFIG}
+    ...    session=${CONFIG_SESSION}
 
 Start_Bgp_Peer
     [Documentation]    Start Python speaker to connect to ODL. We need to do WUKS until odl really starts to accept incomming bgp connection. The failure happens if the incomming connection comes too quickly after configuring the peer in the previous test case.
@@ -152,18 +168,25 @@ Kill_Talking_BGP_Speaker
 Delete_Bgp_Peer_Configuration
     [Documentation]    Revert the BGP configuration to the original state: without any configured peers.
     [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
-    TemplatedRequests.Delete_Templated    ${MVPN_DIR}/bgp_peer    mapping=${MVPN_ODL_CONFIG}    session=${CONFIG_SESSION}
+    TemplatedRequests.Delete_Templated
+    ...    ${MVPN_DIR}/bgp_peer
+    ...    mapping=${MVPN_ODL_CONFIG}
+    ...    session=${CONFIG_SESSION}
 
 Deconfigure_App_Peer
     [Documentation]    Revert the BGP configuration to the original state: without application peer
     [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
     TemplatedRequests.Delete_Templated    ${MVPN_DIR}/app_peer    mapping=${MVPN_APP_PEER}    session=${CONFIG_SESSION}
 
+
 *** Keywords ***
 Start_Suite
     [Documentation]    Initialize SetupUtils. Suite setup keyword.
     SetupUtils.Setup_Utils_For_Setup_And_Teardown
-    ${mininet_conn_id} =    SSHLibrary.Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=6s
+    ${mininet_conn_id} =    SSHLibrary.Open Connection
+    ...    ${TOOLS_SYSTEM_IP}
+    ...    prompt=${DEFAULT_LINUX_PROMPT}
+    ...    timeout=6s
     Builtin.Set Suite Variable    ${mininet_conn_id}
     SSHKeywords.Flexible Mininet Login    ${TOOLS_SYSTEM_USER}
     RequestsLibrary.Create Session    ${CONFIG_SESSION}    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}
@@ -177,5 +200,6 @@ Stop_Suite
 
 Start_Bgp_Peer
     [Documentation]    Starts bgp peer and verifies that the peer runs.
-    BGPSpeaker.Start_BGP_Speaker    --amount 0 --myip=${TOOLS_SYSTEM_IP} --myport=${BGP_TOOL_PORT} --peerip=${ODL_SYSTEM_IP} --peerport=${ODL_BGP_PORT} --debug --mvpn --wfr 1
+    BGPSpeaker.Start_BGP_Speaker
+    ...    --amount 0 --myip=${TOOLS_SYSTEM_IP} --myport=${BGP_TOOL_PORT} --peerip=${ODL_SYSTEM_IP} --peerport=${ODL_BGP_PORT} --debug --mvpn --wfr 1
     BGPcliKeywords.Read_And_Fail_If_Prompt_Is_Seen