Adjust PCEP module names

[integration/test.git] / csit / suites / bgpcep / bgpclustering / 060_pcep_ha_karaf_stop.robot

diff --git a/csit/suites/bgpcep/bgpclustering/060_pcep_ha_karaf_stop.robot b/csit/suites/bgpcep/bgpclustering/060_pcep_ha_karaf_stop.robot
index 7faaa4de1d349e4f31e51eeb427d87441abf6ea7..92b5da9463906e244c1c89db6fdc423e921837d6 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/060_pcep_ha_karaf_stop.robot
+++ b/csit/suites/bgpcep/bgpclustering/060_pcep_ha_karaf_stop.robot
@@ -1,12 +1,12 @@
 *** Settings ***
 Documentation     PCEP functional HA testing with one pcep peer.
-...
+...           
 ...               Copyright (c) 2017 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 suite uses PCC mock. It is configured to have 3 peers (all 3 nodes of odl).
 ...               PCEP implemented with singleton accepts only one incomming conection. PCC mock
 ...               logs will show that one peer will be connected and two will fail.
@@ -30,9 +30,11 @@ Resource          ../../../variables/Variables.robot
 
 *** Variables ***
 ${HOLDTIME}       180
-${DIR_WITH_TEMPLATES}    ${CURDIR}/../../../variables/bgpclustering/
+${DIR_WITH_TEMPLATES}    ${CURDIR}/../../../variables/bgpclustering/${ODL_STREAM}
 ${PCC_LOG_FILE}    pccmock.stop.log
 ${CONFIG_SESSION}    session
+${OLD_ERROR_ARGS}    \n"last-received-error": {},\n"last-sent-error": {},
+${NEW_ERROR_ARGS}    ${EMPTY}
 
 *** Test Cases ***
 Get_Example_Pcep_Owner
@@ -102,6 +104,8 @@ Setup_Everything
     ${code}=    Evaluate    binascii.b2a_base64('${pcc_name}')[:-1]    modules=binascii
     BuiltIn.Set_Suite_Variable    ${pcc_name_code}    ${code}
     PcepOperations.Pcep_Topology_Precondition    ${CONFIG_SESSION}
+    ${ERROR_ARGS} =    CompareStream.Set_Variable_If_At_Least_Neon    ${NEW_ERROR_ARGS}    ${OLD_ERROR_ARGS}
+    BuiltIn.Set_Suite_Variable    ${ERROR_ARGS}
     Start_Pcc_Mock
 
 Teardown_Everything
@@ -117,7 +121,7 @@ Start_Pcc_Mock
 
 Pcep_Topology_Postcondition
     [Documentation]    Verifies if the tool reported expected data
-    &{mapping}    BuiltIn.Create_Dictionary    IP=${TOOLS_SYSTEM_IP}    CODE=${pcc_name_code}    NAME=${pcc_name}    IP_ODL=${ODL_SYSTEM_${pcep_owner}_IP}
+    &{mapping}    BuiltIn.Create_Dictionary    IP=${TOOLS_SYSTEM_IP}    CODE=${pcc_name_code}    NAME=${pcc_name}    IP_ODL=${ODL_SYSTEM_${pcep_owner}_IP}    ERRORS=${ERROR_ARGS}
     BuiltIn.Wait_Until_Keyword_Succeeds    10x    5s    TemplatedRequests.Get_As_Json_Templated    ${DIR_WITH_TEMPLATES}${/}pcep_on_state    ${mapping}    ${living_session}
     ...    verify=True