Changed test csit/suites/lispflowmapping/msmr/030_RPC_Datatypes.robot

Replaced static Json file variables with pyangbind generated binding files.
Removed Instance Id test.

Change-Id: I67f33b007407e94d2738c937a07c05857c076fc3
Signed-off-by: Ashish <ashishk.iiit@gmail.com>

diff --git a/csit/suites/lispflowmapping/msmr/030_RPC_Datatypes.robot b/csit/suites/lispflowmapping/msmr/030_RPC_Datatypes.robot
index cd09d5d5786f814e504af1d3d75be6b41644e516..2df1acc992b313e59602a6c58ae85c99d5c1dbb1 100644 (file)
--- a/csit/suites/lispflowmapping/msmr/030_RPC_Datatypes.robot
+++ b/csit/suites/lispflowmapping/msmr/030_RPC_Datatypes.robot
@@ -9,6 +9,7 @@ Library           Collections
 Library           OperatingSystem
 Library           RequestsLibrary
 Library           ../../../libraries/Common.py
+Library           ../../../libraries/JsonGenerator.py
 Variables         ../../../variables/Variables.py
 Resource          ../../../libraries/LISPFlowMapping.robot
 Resource          ../../../libraries/Utils.robot
@@ -16,58 +17,54 @@ Resource          ../../../libraries/Utils.robot
 *** Test Cases ***
 IPv4 Prefix
     [Documentation]    Perform mapping operations with an IPv4 EID
-    rpc_add-mapping_ipv4_ipv4.json    rpc_get-remove_ipv4.json
+    ipv4:192.0.2.1/32    ipv4:10.10.10.10    ipv4:192.0.2.1/32
 
 IPv6 Prefix
     [Documentation]    Perform mapping operations with an IPv6 EID
-    rpc_add-mapping_ipv6_ipv4.json    rpc_get-remove_ipv6.json
+    ipv6:2001:db8::1/128    ipv4:10.10.10.10    ipv6:2001:db8::1/128
 
 MAC Address
     [Documentation]    Perform mapping operations with a MAC address EID
-    rpc_add-mapping_mac_ipv4.json    rpc_get-remove_mac.json
+    mac:00:11:22:33:44:55    ipv4:10.10.10.10    mac:00:11:22:33:44:55
 
 Distinguished Name
     [Documentation]    Perform mapping operations with a Distinguished Name EID
-    rpc_add-mapping_dn_ipv4.json    rpc_get-remove_dn.json
+    dn:stringAsIs    ipv4:10.10.10.10    dn:stringAsIs
 
 AS Number
     [Documentation]    Perform mapping operations with an Autonomous System Number EID
-    rpc_add-mapping_as_ipv4.json    rpc_get-remove_as.json
-
-Instance ID
-    [Documentation]    Perform mapping operations with an IPv4 EID in Instance ID 1
-    rpc_add-mapping_iid_ipv4.json    rpc_get-remove_iid.json
+    as:64500    ipv4:10.10.10.10    as:64500
 
 Source/Destination
     [Documentation]    Perform mapping operations with a Source/Destination EID
-    rpc_add-mapping_srcdst_ipv4.json    rpc_get-remove_srcdst.json
+    srcdst:192.0.2.1/32|192.0.2.2/32    ipv4:10.10.10.10    srcdst:192.0.2.1/32|192.0.2.2/32
 
 Key/Value
     [Documentation]    Perform mapping operations with a Key/Value EID
-    rpc_add-mapping_kv_ipv4.json    rpc_get-remove_kv.json
+    kv:192.0.2.1->192.0.2.2    ipv4:10.10.10.10    kv:192.0.2.1->192.0.2.2
 
 Service Path
     [Documentation]    Perform mapping operations with a Service Path EID
-    rpc_add-mapping_sp_ipv4.json    rpc_get-remove_sp.json
+    sp:42(3)    ipv4:10.10.10.10    sp:42(3)
 
 AFI List
     [Documentation]    Perform mapping operations with an IPv4 EID mapped to an AFI List RLOC
-    rpc_add-mapping_ipv4_list.json    rpc_get-remove_ipv4.json
+    ipv4:192.0.2.1/32    list:{10.10.10.10,2001:db8::1}    ipv4:192.0.2.1/32
 
 Application Data
     [Documentation]    Perform mapping operations with an IPv4 EID mapped to an Application Data RLOC
-    rpc_add-mapping_ipv4_appdata.json    rpc_get-remove_ipv4.json
+    ipv4:192.0.2.1/32    appdata:10.10.10.10!128!17!80-81!6667-7000    ipv4:192.0.2.1/32
 
 Explicit Locator Path
     [Documentation]    Perform mapping operations with an IPv4 EID mapped to an ELP RLOC
-    rpc_add-mapping_ipv4_elp.json    rpc_get-remove_ipv4.json
+    ipv4:192.0.2.1/32    elp:{20.20.20.20|lps->30.30.30.30|ls}    ipv4:192.0.2.1/32
 
 *** Keywords ***
 Check Datatype
-    [Arguments]    ${add_mapping_json_file}    ${get_mapping_json_file}
+    [Arguments]    ${add_mapping_eid}    ${add_mapping_rloc}    ${get_mapping_eid}
     [Documentation]    Perform CRD operations using a specific datatype
-    ${add_mapping}=    OperatingSystem.Get File    ${JSON_DIR}/${add_mapping_json_file}
-    ${get_mapping}=    OperatingSystem.Get File    ${JSON_DIR}/${get_mapping_json_file}
+    ${add_mapping}=    Get Mapping JSON    ${add_mapping_eid}    ${add_mapping_rloc}
+    ${get_mapping}=    Get LispAddress JSON And Wrap input    ${get_mapping_eid}
     Set Suite Variable    ${RPC_Datatype__current_json}    ${get_mapping}
     Post Log Check    ${LFM_RPC_API}:add-mapping    ${add_mapping}
     Sleep    200ms    Avoid race conditions