X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FLISPFlowMapping.robot;h=1eee8412b95350b8c14c0ca0a917dbf00b15f21b;hb=HEAD;hp=9dad54ef0fad7e061376c0ec787fb5c3d83308e9;hpb=ba486e3bad2b2273218b86058841a8a61eaa7e74;p=integration%2Ftest.git

diff --git a/csit/libraries/LISPFlowMapping.robot b/csit/libraries/LISPFlowMapping.robot
index 9dad54ef0f..ba4775a69b 100644
--- a/csit/libraries/LISPFlowMapping.robot
+++ b/csit/libraries/LISPFlowMapping.robot
@@ -1,17 +1,20 @@
 *** Settings ***
-Documentation     This resource file defines keywords that are used in more
-...               than one lispflowmapping test suite. Those suites include
-...               ../variables/Variables.py, which is where some of the
-...               variables are coming from.
-Library           JsonGenerator.py
+Documentation       This resource file defines keywords that are used in more
+...                 than one lispflowmapping test suite. Those suites include
+...                 ../variables/Variables.py, which is where some of the
+...                 variables are coming from.
+
+Library             JsonGenerator.py
+
 
 *** Variables ***
-${JSON_DIR}       ${CURDIR}/../variables/lispflowmapping/Be
+${JSON_DIR}     ${CURDIR}/../variables/lispflowmapping/Be
+
 
 *** Keywords ***
 Authentication Key Should Be
-    [Arguments]    ${resp}    ${password}
     [Documentation]    Check if the authentication key in the ${resp} is ${password}
+    [Arguments]    ${resp}    ${password}
     ${authkey}=    Get Authentication Key    ${resp}
     Should Be Equal As Strings    ${authkey}    ${password}
 
@@ -20,11 +23,11 @@ Get Authentication Key
     ${output}=    Get From Dictionary    ${resp.json()}    output
     ${mapping_authkey}=    Get From Dictionary    ${output}    mapping-authkey
     ${authkey}=    Get From Dictionary    ${mapping_authkey}    key-string
-    [Return]    ${authkey}
+    RETURN    ${authkey}
 
 Ipv4 Rloc Should Be
-    [Arguments]    ${resp}    ${address}
     [Documentation]    Check if the RLOC in the ${resp} is ${address}
+    [Arguments]    ${resp}    ${address}
     ${eid_record}=    Get Eid Record    ${resp}
     ${loc_record}=    Get From Dictionary    ${eid_record}    LocatorRecord
     ${loc_record_0}=    Get From List    ${loc_record}    0
@@ -35,33 +38,56 @@ Get Eid Record
     [Arguments]    ${resp}
     ${output}=    Get From Dictionary    ${resp.json()}    output
     ${eid_record}=    Get From Dictionary    ${output}    mapping-record
-    [Return]    ${eid_record}
+    RETURN    ${eid_record}
 
 Get Ipv4 Rloc
     [Arguments]    ${loc_record}
     ${loc}=    Get From Dictionary    ${loc_record}    rloc
     ${ipv4}=    Get From Dictionary    ${loc}    ipv4
-    [Return]    ${ipv4}
+    RETURN    ${ipv4}
 
 Get Elp Hop
-    [Arguments]    ${loc_record}    ${hop_index}
     [Documentation]    Returns the Rloc object pointed to by ${hop_index}
+    [Arguments]    ${loc_record}    ${hop_index}
     ${rloc}=    Get From Dictionary    ${loc_record}    rloc
     ${exp_loc_path}=    Get From Dictionary    ${rloc}    explicit-locator-path
     ${actual_hop_index}=    Evaluate    ${hop_index} - 1
     ${hop}=    Get From List    ${exp_loc_path}    ${actual_hop_index}
-    [Return]    ${hop}
+    RETURN    ${hop}
+
+Check Key Removal
+    [Arguments]    ${json}
+    Post Log Check    ${LFM_RPC_API}:get-key    ${json}    status_codes=${DELETED_STATUS_CODES}
 
 Check Mapping Removal
     [Arguments]    ${json}
-    Post Log Check    ${LFM_RPC_API}:get-mapping    ${json}    404
+    Post Log Check    ${LFM_RPC_API}:get-mapping    ${json}    status_codes=${DELETED_STATUS_CODES}
 
 Get Mapping JSON
-    [Arguments]    ${eid}    ${rloc}
     [Documentation]    Returns mapping record JSON dict
+    [Arguments]    ${eid}    ${rloc}
     ${loc_record}=    Get LocatorRecord Object    ${rloc}
     ${lisp_address}=    Get LispAddress Object    ${eid}
     ${loc_record_list}=    Create List    ${loc_record}
     ${mapping_record_json}=    Get MappingRecord JSON    ${lisp_address}    ${loc_record_list}
     ${mapping}=    Wrap input    ${mapping_record_json}
-    [Return]    ${mapping}
+    RETURN    ${mapping}
+
+Post Log Check Authkey
+    [Documentation]    Extend the 'Post Log Check' keyword to check for the correct authentication key
+    [Arguments]    ${json}    ${password}
+    ${resp}=    Post Log Check    ${LFM_RPC_API}:get-key    ${json}
+    Authentication Key Should Be    ${resp}    ${password}
+
+Post Log Check Ipv4 Rloc
+    [Documentation]    Extend the 'Post Log Check' keyword to check for the correct IPv4 RLOC
+    [Arguments]    ${json}    ${rloc}
+    ${resp}=    Post Log Check    ${LFM_RPC_API}:get-mapping    ${json}
+    Ipv4 Rloc Should Be    ${resp}    ${rloc}
+
+Post Log Check LocatorRecord
+    [Documentation]    Extend the 'Post Log Check' keyword to check for the existence of a LocatorRecord
+    [Arguments]    ${json}
+    ${resp}=    Post Log Check    ${LFM_RPC_API}:get-mapping    ${json}
+    ${eid_record}=    Get Eid Record    ${resp}
+    Dictionary Should Contain Key    ${eid_record}    LocatorRecord