Migrate bgpcep suites restconf calls to rfc8040

Change-Id: I2e4e0929e300156cd6820ff8671f979d991d9834
Signed-off-by: Tomas Cere <tomas.cere@pantheon.tech>

diff --git a/csit/libraries/BgpOperations.robot b/csit/libraries/BgpOperations.robot
index e44c3367383bc4247067a630734582a86319c00f..7f0cc9dd976b384fa7dc44d5c2075e5c53e75c9f 100644 (file)
--- a/csit/libraries/BgpOperations.robot
+++ b/csit/libraries/BgpOperations.robot
@@ -360,8 +360,8 @@ Odl_To_Play_Template
 Play_To_Odl_Template
     [Arguments]    ${totest}    ${dir}    ${ipv}=ipv4
     ${as_path} =    CompareStream.Set_Variable_If_At_Least_Neon    ${NEW_AS_PATH}    ${OLD_AS_PATH}
-    &{adj_rib_in}    BuiltIn.Create_Dictionary    PATH=peer/bgp:%2F%2F${TOOLS_SYSTEM_IP}/adj-rib-in    BGP_RIB=${RIB_NAME}    AS_PATH=${as_path}
-    &{effective_rib_in}    BuiltIn.Create_Dictionary    PATH=peer/bgp:%2F%2F${TOOLS_SYSTEM_IP}/effective-rib-in    BGP_RIB=${RIB_NAME}    AS_PATH=${as_path}
+    &{adj_rib_in}    BuiltIn.Create_Dictionary    PATH=peer\=bgp:%2F%2F${TOOLS_SYSTEM_IP}/adj-rib-in    BGP_RIB=${RIB_NAME}    AS_PATH=${as_path}
+    &{effective_rib_in}    BuiltIn.Create_Dictionary    PATH=peer\=bgp:%2F%2F${TOOLS_SYSTEM_IP}/effective-rib-in    BGP_RIB=${RIB_NAME}    AS_PATH=${as_path}
     &{loc_rib}    BuiltIn.Create_Dictionary    PATH=loc-rib    BGP_RIB=${RIB_NAME}    AS_PATH=${as_path}
     ${announce_hex} =    OperatingSystem.Get_File    ${dir}/${totest}/announce_${totest}.hex
     ${withdraw_hex} =    OperatingSystem.Get_File    ${dir}/${totest}/withdraw_${totest}.hex

diff --git a/csit/libraries/TemplatedRequests.robot b/csit/libraries/TemplatedRequests.robot
index 44e61bd4f814dfd35c6c1d4f2b55575e5bd0a2ba..99a19b2332057d4d798c3708c983142698bf9d67 100644 (file)
--- a/csit/libraries/TemplatedRequests.robot
+++ b/csit/libraries/TemplatedRequests.robot
@@ -135,7 +135,7 @@ Create_Default_Session
     RequestsLibrary.Create_Session    alias=default    url=${url}    auth=${auth}    timeout=${timeout}    max_retries=${max_retries}
 
 Get_As_Json_Templated
-    [Arguments]    ${folder}    ${mapping}={}    ${session}=default    ${verify}=False    ${iterations}=${EMPTY}    ${iter_start}=1
+    [Arguments]    ${folder}    ${mapping}=&{EMPTY}    ${session}=default    ${verify}=False    ${iterations}=${EMPTY}    ${iter_start}=1
     ...    ${http_timeout}=${EMPTY}    ${log_response}=True    ${iter_j_offset}=0
     [Documentation]    Add arguments sensible for JSON data, return Get_Templated response text.
     ...    Optionally, verification against JSON data (may be iterated) is called.
@@ -148,7 +148,7 @@ Get_As_Json_Templated
     [Return]    ${response_text}
 
 Get_As_Xml_Templated
-    [Arguments]    ${folder}    ${mapping}={}    ${session}=default    ${verify}=False    ${iterations}=${EMPTY}    ${iter_start}=1
+    [Arguments]    ${folder}    ${mapping}=&{EMPTY}    ${session}=default    ${verify}=False    ${iterations}=${EMPTY}    ${iter_start}=1
     ...    ${http_timeout}=${EMPTY}    ${iter_j_offset}=0
     [Documentation]    Add arguments sensible for XML data, return Get_Templated response text.
     ...    Optionally, verification against XML data (may be iterated) is called.
@@ -159,7 +159,7 @@ Get_As_Xml_Templated
     [Return]    ${response_text}
 
 Put_As_Json_Templated
-    [Arguments]    ${folder}    ${mapping}={}    ${session}=default    ${verify}=False    ${iterations}=${EMPTY}    ${iter_start}=1
+    [Arguments]    ${folder}    ${mapping}=&{EMPTY}    ${session}=default    ${verify}=False    ${iterations}=${EMPTY}    ${iter_start}=1
     ...    ${http_timeout}=${EMPTY}    ${iter_j_offset}=0
     [Documentation]    Add arguments sensible for JSON data, return Put_Templated response text.
     ...    Optionally, verification against response.json (no iteration) is called.
@@ -173,7 +173,7 @@ Put_As_Json_Templated
     [Return]    ${response_text}
 
 Put_As_Xml_Templated
-    [Arguments]    ${folder}    ${mapping}={}    ${session}=default    ${verify}=False    ${iterations}=${EMPTY}    ${iter_start}=1
+    [Arguments]    ${folder}    ${mapping}=&{EMPTY}    ${session}=default    ${verify}=False    ${iterations}=${EMPTY}    ${iter_start}=1
     ...    ${http_timeout}=${EMPTY}    ${iter_j_offset}=0
     [Documentation]    Add arguments sensible for XML data, return Put_Templated response text.
     ...    Optionally, verification against response.xml (no iteration) is called.
@@ -186,7 +186,7 @@ Put_As_Xml_Templated
     [Return]    ${response_text}
 
 Post_As_Json_Templated
-    [Arguments]    ${folder}    ${mapping}={}    ${session}=default    ${verify}=False    ${iterations}=${EMPTY}    ${iter_start}=1
+    [Arguments]    ${folder}    ${mapping}=&{EMPTY}    ${session}=default    ${verify}=False    ${iterations}=${EMPTY}    ${iter_start}=1
     ...    ${additional_allowed_status_codes}=${NO_STATUS_CODES}    ${explicit_status_codes}=${NO_STATUS_CODES}    ${http_timeout}=${EMPTY}    ${iter_j_offset}=0
     [Documentation]    Add arguments sensible for JSON data, return Post_Templated response text.
     ...    Optionally, verification against response.json (no iteration) is called.
@@ -203,7 +203,7 @@ Post_As_Json_Templated
     [Return]    ${response_text}
 
 Post_As_Json_Rfc8040_Templated
-    [Arguments]    ${folder}    ${mapping}={}    ${session}=default    ${verify}=False    ${iterations}=${EMPTY}    ${iter_start}=1
+    [Arguments]    ${folder}    ${mapping}=&{EMPTY}    ${session}=default    ${verify}=False    ${iterations}=${EMPTY}    ${iter_start}=1
     ...    ${additional_allowed_status_codes}=${NO_STATUS_CODES}    ${explicit_status_codes}=${NO_STATUS_CODES}    ${http_timeout}=${EMPTY}    ${iter_j_offset}=0
     [Documentation]    Add arguments sensible for JSON data, return Post_Templated response text.
     ...    Optionally, verification against response.json (no iteration) is called.
@@ -222,7 +222,7 @@ Post_As_Json_Rfc8040_Templated
     [Return]    ${response_text}
 
 Post_As_Xml_Templated
-    [Arguments]    ${folder}    ${mapping}={}    ${session}=default    ${verify}=False    ${iterations}=${EMPTY}    ${iter_start}=1
+    [Arguments]    ${folder}    ${mapping}=&{EMPTY}    ${session}=default    ${verify}=False    ${iterations}=${EMPTY}    ${iter_start}=1
     ...    ${additional_allowed_status_codes}=${NO_STATUS_CODES}    ${explicit_status_codes}=${NO_STATUS_CODES}    ${http_timeout}=${EMPTY}    ${iter_j_offset}=0
     [Documentation]    Add arguments sensible for XML data, return Post_Templated response text.
     ...    Optionally, verification against response.xml (no iteration) is called.
@@ -236,21 +236,21 @@ Post_As_Xml_Templated
     [Return]    ${response_text}
 
 Delete_Templated
-    [Arguments]    ${folder}    ${mapping}={}    ${session}=default    ${additional_allowed_status_codes}=${NO_STATUS_CODES}    ${http_timeout}=${EMPTY}    ${location}=location
+    [Arguments]    ${folder}    ${mapping}=&{EMPTY}    ${session}=default    ${additional_allowed_status_codes}=${NO_STATUS_CODES}    ${http_timeout}=${EMPTY}    ${location}=location
     [Documentation]    Resolve URI from folder, issue DELETE request.
-    ${uri} =    Resolve_Text_From_Template_Folder    folder=${folder}    base_name=${location}    extension=uri    mapping=${mapping}
+    ${uri} =    Resolve_Text_From_Template_Folder    folder=${folder}    base_name=${location}    extension=uri    mapping=${mapping}    percent_encode=True
     ${response_text} =    Delete_From_Uri    uri=${uri}    session=${session}    additional_allowed_status_codes=${additional_allowed_status_codes}    http_timeout=${http_timeout}
     [Return]    ${response_text}
 
 Verify_Response_As_Json_Templated
-    [Arguments]    ${response}    ${folder}    ${base_name}=response    ${mapping}={}    ${iterations}=${EMPTY}    ${iter_start}=1    ${iter_j_offset}=0
+    [Arguments]    ${response}    ${folder}    ${base_name}=response    ${mapping}=&{EMPTY}    ${iterations}=${EMPTY}    ${iter_start}=1    ${iter_j_offset}=0
     [Documentation]    Resolve expected JSON data, should be equal to provided \${response}.
     ...    JSON normalization is used, endlines enabled for readability.
     Verify_Response_Templated    response=${response}    folder=${folder}    base_name=${base_name}    extension=json    mapping=${mapping}    normalize_json=True
     ...    endline=${\n}    iterations=${iterations}    iter_start=${iter_start}    iter_j_offset=${iter_j_offset}
 
 Verify_Response_As_Xml_Templated
-    [Arguments]    ${response}    ${folder}    ${base_name}=response    ${mapping}={}    ${iterations}=${EMPTY}    ${iter_start}=1    ${iter_j_offset}=0
+    [Arguments]    ${response}    ${folder}    ${base_name}=response    ${mapping}=&{EMPTY}    ${iterations}=${EMPTY}    ${iter_start}=1    ${iter_j_offset}=0
     [Documentation]    Resolve expected XML data, should be equal to provided \${response}.
     ...    Endline set to empty, as this Resource does not support indented XML comparison.
     Verify_Response_Templated    response=${response}    folder=${folder}    base_name=${base_name}    extension=xml    mapping=${mapping}    normalize_json=False
@@ -329,9 +329,9 @@ Resolve_Volatiles_Path
     [Return]    ${volatiles_list}
 
 Get_Templated
-    [Arguments]    ${folder}    ${accept}    ${mapping}={}    ${session}=default    ${normalize_json}=False    ${http_timeout}=${EMPTY}    ${log_response}=True
+    [Arguments]    ${folder}    ${accept}    ${mapping}=&{EMPTY}    ${session}=default    ${normalize_json}=False    ${http_timeout}=${EMPTY}    ${log_response}=True
     [Documentation]    Resolve URI from folder, call Get_From_Uri, return response text.
-    ${uri} =    Resolve_Text_From_Template_Folder    folder=${folder}    base_name=location    extension=uri    mapping=${mapping}
+    ${uri} =    Resolve_Text_From_Template_Folder    folder=${folder}    base_name=location    extension=uri    mapping=${mapping}    percent_encode=True
     ${jmes_expression} =    Resolve_Jmes_Path    ${folder}
     ${volatiles_list}=    Resolve_Volatiles_Path    ${folder}
     ${response_text} =    Get_From_Uri    uri=${uri}    accept=${accept}    session=${session}    normalize_json=${normalize_json}    jmes_path=${jmes_expression}
@@ -339,10 +339,10 @@ Get_Templated
     [Return]    ${response_text}
 
 Put_Templated
-    [Arguments]    ${folder}    ${base_name}    ${extension}    ${content_type}    ${accept}    ${mapping}={}
+    [Arguments]    ${folder}    ${base_name}    ${extension}    ${content_type}    ${accept}    ${mapping}=&{EMPTY}
     ...    ${session}=default    ${normalize_json}=False    ${endline}=${\n}    ${iterations}=${EMPTY}    ${iter_start}=1    ${http_timeout}=${EMPTY}    ${iter_j_offset}=0
     [Documentation]    Resolve URI and data from folder, call Put_To_Uri, return response text.
-    ${uri} =    Resolve_Text_From_Template_Folder    folder=${folder}    base_name=location    extension=uri    mapping=${mapping}
+    ${uri} =    Resolve_Text_From_Template_Folder    folder=${folder}    base_name=location    extension=uri    mapping=${mapping}    percent_encode=True
     ${data} =    Resolve_Text_From_Template_Folder    folder=${folder}    base_name=${base_name}    extension=${extension}    mapping=${mapping}    endline=${endline}
     ...    iterations=${iterations}    iter_start=${iter_start}    iter_j_offset=${iter_j_offset}
     ${jmes_expression} =    Resolve_Jmes_Path    ${folder}
@@ -351,11 +351,11 @@ Put_Templated
     [Return]    ${response_text}
 
 Post_Templated
-    [Arguments]    ${folder}    ${base_name}    ${extension}    ${content_type}    ${accept}    ${mapping}={}
+    [Arguments]    ${folder}    ${base_name}    ${extension}    ${content_type}    ${accept}    ${mapping}=&{EMPTY}
     ...    ${session}=default    ${normalize_json}=False    ${endline}=${\n}    ${iterations}=${EMPTY}    ${iter_start}=1    ${additional_allowed_status_codes}=${NO_STATUS_CODES}
     ...    ${explicit_status_codes}=${NO_STATUS_CODES}    ${http_timeout}=${EMPTY}    ${iter_j_offset}=0
     [Documentation]    Resolve URI and data from folder, call Post_To_Uri, return response text.
-    ${uri} =    Resolve_Text_From_Template_Folder    folder=${folder}    base_name=location    extension=uri    mapping=${mapping}
+    ${uri} =    Resolve_Text_From_Template_Folder    folder=${folder}    base_name=location    extension=uri    mapping=${mapping}    percent_encode=True
     ${data} =    Resolve_Text_From_Template_Folder    folder=${folder}    name_prefix=post_    base_name=${base_name}    extension=${extension}    mapping=${mapping}
     ...    endline=${endline}    iterations=${iterations}    iter_start=${iter_start}    iter_j_offset=${iter_j_offset}
     ${jmes_expression} =    Resolve_Jmes_Path    ${folder}
@@ -364,7 +364,7 @@ Post_Templated
     [Return]    ${response_text}
 
 Verify_Response_Templated
-    [Arguments]    ${response}    ${folder}    ${base_name}    ${extension}    ${mapping}={}    ${normalize_json}=False
+    [Arguments]    ${response}    ${folder}    ${base_name}    ${extension}    ${mapping}=&{EMPTY}    ${normalize_json}=False
     ...    ${endline}=${\n}    ${iterations}=${EMPTY}    ${iter_start}=1    ${iter_j_offset}=0
     [Documentation]    Resolve expected text from template, provided response shuld be equal.
     ...    If \${normalize_json}, perform normalization before comparison.
@@ -460,8 +460,8 @@ Join_Two_Headers
     [Return]    ${accumulator}
 
 Resolve_Text_From_Template_Folder
-    [Arguments]    ${folder}    ${name_prefix}=${EMPTY}    ${base_name}=data    ${extension}=json    ${mapping}={}    ${iterations}=${EMPTY}
-    ...    ${iter_start}=1    ${iter_j_offset}=0    ${endline}=${\n}
+    [Arguments]    ${folder}    ${name_prefix}=${EMPTY}    ${base_name}=data    ${extension}=json    ${mapping}=${EMPTY}    ${iterations}=${EMPTY}
+    ...    ${iter_start}=1    ${iter_j_offset}=0    ${endline}=${\n}    ${percent_encode}=False
     [Documentation]    Read a template from folder, strip endline, make changes according to mapping, return the result.
     ...    If \${iterations} value is present, put text together from "prolog", "item" and "epilog" parts,
     ...    where additional template variable ${i} goes from ${iter_start}, by one ${iterations} times.
@@ -469,9 +469,9 @@ Resolve_Text_From_Template_Folder
     ...    used to create non uniform data in order to be able to validate UPDATE operations.
     ...    POST (as opposed to PUT) needs slightly different data, \${name_prefix} may be used to distinguish.
     ...    (Actually, it is GET who formats data differently when URI is a top-level container.)
-    BuiltIn.Run_Keyword_And_Return_If    not "${iterations}"    Resolve_Text_From_Template_File    folder=${folder}    file_name=${name_prefix}${base_name}.${extension}    mapping=${mapping}
-    ${prolog} =    Resolve_Text_From_Template_File    folder=${folder}    file_name=${name_prefix}${base_name}.prolog.${extension}    mapping=${mapping}
-    ${epilog} =    Resolve_Text_From_Template_File    folder=${folder}    file_name=${name_prefix}${base_name}.epilog.${extension}    mapping=${mapping}
+    BuiltIn.Run_Keyword_And_Return_If    not "${iterations}"    Resolve_Text_From_Template_File    folder=${folder}    file_name=${name_prefix}${base_name}.${extension}    mapping=${mapping}    percent_encode=${percent_encode}
+    ${prolog} =    Resolve_Text_From_Template_File    folder=${folder}    file_name=${name_prefix}${base_name}.prolog.${extension}    mapping=${mapping}    percent_encode=${percent_encode}
+    ${epilog} =    Resolve_Text_From_Template_File    folder=${folder}    file_name=${name_prefix}${base_name}.epilog.${extension}    mapping=${mapping}    percent_encode=${percent_encode}
     # Even POST uses the same item template (except indentation), so name prefix is ignored.
     ${item_template} =    Resolve_Text_From_Template_File    folder=${folder}    file_name=${base_name}.item.${extension}    mapping=${mapping}
     ${items} =    BuiltIn.Create_List
@@ -488,7 +488,7 @@ Resolve_Text_From_Template_Folder
     [Return]    ${final_text}
 
 Resolve_Text_From_Template_File
-    [Arguments]    ${folder}    ${file_name}    ${mapping}={}
+    [Arguments]    ${folder}    ${file_name}    ${mapping}=&{EMPTY}    ${percent_encode}=False
     [Documentation]    Check if ${folder}.${ODL_STREAM}/${file_name} exists. If yes read and Log contents of file ${folder}.${ODL_STREAM}/${file_name},
     ...    remove endline, perform safe substitution, return result.
     ...    If no do it with the default ${folder}/${file_name}.
@@ -497,7 +497,9 @@ Resolve_Text_From_Template_File
     ${file_path}=    BuiltIn.Set Variable If    ${file_stream_exists}    ${file_path_stream}    ${folder}${/}${file_name}
     ${template} =    OperatingSystem.Get_File    ${file_path}
     BuiltIn.Log    ${template}
-    ${final_text} =    BuiltIn.Evaluate    string.Template('''${template}'''.rstrip()).safe_substitute(${mapping})    modules=string
+    ${mapping_to_use} =    BuiltIn.Run_Keyword_If    ${percent_encode} == True    Encode_Mapping    ${mapping}
+    ...    ELSE    BuiltIn.Set_Variable    ${mapping}
+    ${final_text} =    BuiltIn.Evaluate    string.Template('''${template}'''.rstrip()).safe_substitute(${mapping_to_use})    modules=string
     # Final text is logged where used.
     [Return]    ${final_text}
 
@@ -516,3 +518,19 @@ Normalize_Jsons_With_Bits_And_Compare
     ${expected_normalized} =    norm_json.normalize_json_text    ${expected_raw}    keys_with_bits=${keys_with_bits}
     ${actual_normalized} =    norm_json.normalize_json_text    ${actual_raw}    keys_with_bits=${keys_with_bits}
     BuiltIn.Should_Be_Equal    ${expected_normalized}    ${actual_normalized}
+
+Encode_Mapping
+    [Arguments]    ${mapping}
+    BuiltIn.Log    mapping: ${mapping}
+    ${encoded_mapping} =    BuiltIn.Create_Dictionary
+    FOR    ${key}    ${value}    IN    &{mapping}
+        ${encoded_value} =    Percent_Encode_String    ${value}
+        Collections.Set_To_Dictionary    ${encoded_mapping}    ${key}    ${encoded_value}
+    END
+    [Return]    ${encoded_mapping}
+
+Percent_Encode_String
+    [Arguments]    ${value}
+    [Documentation]    Percent encodes reserved characters in the given string so it can be used as part of url.
+    ${encoded} =    String.Replace_String_Using_Regexp    ${value}    :    %3A
+    [Return]    ${encoded}

diff --git a/csit/suites/bgpcep/bgpfunct/020_bgp_functional_multipath.robot b/csit/suites/bgpcep/bgpfunct/020_bgp_functional_multipath.robot
index f251e1da20989b5474ea4d72899ba6edf544a89e..2012d4ed072cdf233bf3ffcdd01820c68a921c2a 100644 (file)
--- a/csit/suites/bgpcep/bgpfunct/020_bgp_functional_multipath.robot
+++ b/csit/suites/bgpcep/bgpfunct/020_bgp_functional_multipath.robot
@@ -41,7 +41,7 @@ ${N_PATHS_VALUE}    2
 &{DEFAULT_MAPPING}    ODLIP=${ODL_SYSTEM_IP}    EXAIP=${TOOLS_SYSTEM_IP}    NPATHS=${N_PATHS_VALUE}
 @{PATH_ID_LIST}    1    2    3
 ${NEXT_HOP_PREF}    100.100.100.
-${OPENCONFIG_RIB_URI}    /restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/example-bgp-rib
+${OPENCONFIG_RIB_URI}    /rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,example-bgp-rib
 ${NPATHS_SELM}    n-paths
 ${ALLPATHS_SELM}    all-paths
 ${ADDPATHCAP_SR}    send\\/receive
@@ -151,7 +151,7 @@ Configure_Odl_Peer_With_Path_Selection_Mode
 
 Store_Rib_Configuration
     [Documentation]    Stores rib configuration
-    ${rib_old}=    TemplatedRequests.Get_As_Xml_Templated    ${MULT_VAR_FOLDER}/rib    mapping=${DEFAULT_MAPPING}    session=${CONFIG_SESSION}
+    ${rib_old}=    TemplatedRequests.Get_As_Xml_Templated    ${MULT_VAR_FOLDER}/rib_config    mapping=${DEFAULT_MAPPING}    session=${CONFIG_SESSION}
     BuiltIn.Set_Suite_Variable    ${rib_old}
 
 Log_Loc_Rib_Operational

diff --git a/csit/suites/bgpcep/bgpfunct/090_bgp_functional_rt_constrain_validation.robot b/csit/suites/bgpcep/bgpfunct/090_bgp_functional_rt_constrain_validation.robot
index b471d4b734556e3bcb6bc4fdcb99d4622deee7db..fa834c0285d7686baf7878929bde687913d27633 100644 (file)
--- a/csit/suites/bgpcep/bgpfunct/090_bgp_functional_rt_constrain_validation.robot
+++ b/csit/suites/bgpcep/bgpfunct/090_bgp_functional_rt_constrain_validation.robot
@@ -49,7 +49,7 @@ ${NEW_AS_PATH}    ${EMPTY}
 @{ODL_IP_INDICES_ALL}    2    3    4
 @{L3VPN_RT_CHECK}    false    true    false
 &{RT_CONSTRAIN_APP_PEER}    IP=${ODL_SYSTEM_IP}    BGP_RIB=${RIB_NAME}
-&{ADJ_RIB_OUT}    PATH=peer/bgp:%2F%2F${ODL_3_IP}/adj-rib-out    BGP_RIB=${RIB_NAME}
+&{ADJ_RIB_OUT}    PATH=peer\=bgp:%2F%2F${ODL_3_IP}/adj-rib-out    BGP_RIB=${RIB_NAME}
 
 *** Test Cases ***
 Reconfigure_ODL_To_Accept_Connection
@@ -75,7 +75,7 @@ Play_To_Odl_ext_l3vpn_rt_arg
     [Documentation]    This TC sends route-target route containing route-target argument from node 1 to odl
     ...    so odl can identify this peer as appropriate for advertizement when it recieves such route.
     Play_To_Odl_Non_Removal_BgpRpcClient2    ext_l3vpn_rt_arg    ${RT_CONSTRAIN_DIR}
-    &{effective_rib_in}    BuiltIn.Create_Dictionary    PATH=peer/bgp:%2F%2F${ODL_2_IP}/effective-rib-in    BGP_RIB=${RIB_NAME}    AS_PATH=${AS_PATH}
+    &{effective_rib_in}    BuiltIn.Create_Dictionary    PATH=peer\=bgp:%2F%2F${ODL_2_IP}/effective-rib-in    BGP_RIB=${RIB_NAME}    AS_PATH=${AS_PATH}
     BuiltIn.Wait_Until_Keyword_Succeeds    3x    2s    TemplatedRequests.Get_As_Json_Templated    ${RT_CONSTRAIN_DIR}/ext_l3vpn_rt_arg/rib    mapping=${effective_rib_in}    session=${CONFIG_SESSION}
     ...    verify=True
 
@@ -101,7 +101,7 @@ Play_To_Odl_rt_constrain_type_1
     [Documentation]    Sends RT route from node 3 to odl and then checks that odl does not advertize l3vpn route from previous TC,
     ...    that is that update message is empty.
     Play_To_Odl_Non_Removal_BgpRpcClient4    rt_constrain_type_1    ${RT_CONSTRAIN_DIR}
-    &{effective_rib_in} =    BuiltIn.Create_Dictionary    PATH=peer/bgp:%2F%2F${ODL_4_IP}/effective-rib-in    BGP_RIB=${RIB_NAME}    AS_PATH=${AS_PATH}
+    &{effective_rib_in} =    BuiltIn.Create_Dictionary    PATH=peer\=bgp:%2F%2F${ODL_4_IP}/effective-rib-in    BGP_RIB=${RIB_NAME}    AS_PATH=${AS_PATH}
     BuiltIn.Wait_Until_Keyword_Succeeds    3x    2s    TemplatedRequests.Get_As_Json_Templated    ${RT_CONSTRAIN_DIR}/rt_constrain_type_1/rib    mapping=${effective_rib_in}    session=${CONFIG_SESSION}
     ...    verify=True
     ${update} =    BgpRpcClient4.play_get

diff --git a/csit/variables/bgpclustering/aluminium/bgp_peer/location.uri b/csit/variables/bgpclustering/aluminium/bgp_peer/location.uri
index d713ddf1ec1b5c4cad75036a6e246354cfc1faae..3b3a11f883e9a40842af36bceb6ce5cab039bf9a 100644 (file)
--- a/csit/variables/bgpclustering/aluminium/bgp_peer/location.uri
+++ b/csit/variables/bgpclustering/aluminium/bgp_peer/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpclustering/aluminium/bgp_peer_openconf/location.uri b/csit/variables/bgpclustering/aluminium/bgp_peer_openconf/location.uri
index d713ddf1ec1b5c4cad75036a6e246354cfc1faae..4c3af055b767a96f43b059f3f69a39bdae69445b 100644 (file)
--- a/csit/variables/bgpclustering/aluminium/bgp_peer_openconf/location.uri
+++ b/csit/variables/bgpclustering/aluminium/bgp_peer_openconf/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/neighbors/neighbor/$IP

diff --git a/csit/variables/bgpclustering/aluminium/bgp_peer_operational/location.uri b/csit/variables/bgpclustering/aluminium/bgp_peer_operational/location.uri
index ebfcce9aaef85fd86069da9dc65b925cf60b1289..889749c528e71764be7cb8af93409edf585792fc 100644 (file)
--- a/csit/variables/bgpclustering/aluminium/bgp_peer_operational/location.uri
+++ b/csit/variables/bgpclustering/aluminium/bgp_peer_operational/location.uri
@@ -1 +1 @@
-restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME/yang-ext:mount/config:modules/module/odl-bgp-rib-impl-cfg:bgp-peer/$BGP_NAME
+rests/data/network-topology:network-topology/topology=topology-netconf/node=$DEVICE_NAME/yang-ext:mount/config:modules/module=odl-bgp-rib-impl-cfg:bgp-peer/$BGP_NAME?content=nonconfig

diff --git a/csit/variables/bgpclustering/aluminium/pcep_on_state/location.uri b/csit/variables/bgpclustering/aluminium/pcep_on_state/location.uri
index 7a4b1bf20d86d50e6563012360981ea292e58622..f29f632cbba2111ee0d8eb7016249d4a497ceab1 100644 (file)
--- a/csit/variables/bgpclustering/aluminium/pcep_on_state/location.uri
+++ b/csit/variables/bgpclustering/aluminium/pcep_on_state/location.uri
@@ -1 +1 @@
-restconf/operational/network-topology:network-topology/topology/pcep-topology
+rests/data/network-topology:network-topology/topology=pcep-topology

diff --git a/csit/variables/bgpclustering/magnesium/bgp_peer/location.uri b/csit/variables/bgpclustering/magnesium/bgp_peer/location.uri
index d713ddf1ec1b5c4cad75036a6e246354cfc1faae..ecc3796dfd00ab8346ccbea36a2324c55c1f3441 100644 (file)
--- a/csit/variables/bgpclustering/magnesium/bgp_peer/location.uri
+++ b/csit/variables/bgpclustering/magnesium/bgp_peer/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/neighbors/neighbor/$IP
+restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/neighbors/neighbor/$IP

diff --git a/csit/variables/bgpclustering/magnesium/bgp_peer_openconf/location.uri b/csit/variables/bgpclustering/magnesium/bgp_peer_openconf/location.uri
index d713ddf1ec1b5c4cad75036a6e246354cfc1faae..ecc3796dfd00ab8346ccbea36a2324c55c1f3441 100644 (file)
--- a/csit/variables/bgpclustering/magnesium/bgp_peer_openconf/location.uri
+++ b/csit/variables/bgpclustering/magnesium/bgp_peer_openconf/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/neighbors/neighbor/$IP
+restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/neighbors/neighbor/$IP

diff --git a/csit/variables/bgpflowspec/bgp_flowspec/location.uri b/csit/variables/bgpflowspec/bgp_flowspec/location.uri
index fc496ea46024137d6421b59e821e908362189bbc..1896e7b3843a08e0811f244275ac75471947436e 100644 (file)
--- a/csit/variables/bgpflowspec/bgp_flowspec/location.uri
+++ b/csit/variables/bgpflowspec/bgp_flowspec/location.uri
@@ -1 +1 @@
-/restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/loc-rib/tables/bgp-types:ipv4-address-family/bgp-flowspec:flowspec-subsequent-address-family/bgp-flowspec:flowspec-routes
+rests/data/bgp-rib:bgp-rib/rib=example-bgp-rib/loc-rib/tables=bgp-types%3Aipv4-address-family,bgp-flowspec%3Aflowspec-subsequent-address-family/bgp-flowspec:flowspec-routes?content=nonconfig

diff --git a/csit/variables/bgpflowspec/bgp_flowspec_redirect/location.uri b/csit/variables/bgpflowspec/bgp_flowspec_redirect/location.uri
index fc496ea46024137d6421b59e821e908362189bbc..1896e7b3843a08e0811f244275ac75471947436e 100644 (file)
--- a/csit/variables/bgpflowspec/bgp_flowspec_redirect/location.uri
+++ b/csit/variables/bgpflowspec/bgp_flowspec_redirect/location.uri
@@ -1 +1 @@
-/restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/loc-rib/tables/bgp-types:ipv4-address-family/bgp-flowspec:flowspec-subsequent-address-family/bgp-flowspec:flowspec-routes
+rests/data/bgp-rib:bgp-rib/rib=example-bgp-rib/loc-rib/tables=bgp-types%3Aipv4-address-family,bgp-flowspec%3Aflowspec-subsequent-address-family/bgp-flowspec:flowspec-routes?content=nonconfig

diff --git a/csit/variables/bgpflowspec/bgp_peer/location.uri b/csit/variables/bgpflowspec/bgp_peer/location.uri
index d713ddf1ec1b5c4cad75036a6e246354cfc1faae..3b3a11f883e9a40842af36bceb6ce5cab039bf9a 100644 (file)
--- a/csit/variables/bgpflowspec/bgp_peer/location.uri
+++ b/csit/variables/bgpflowspec/bgp_peer/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpflowspec/empty_route/data.json b/csit/variables/bgpflowspec/empty_route/data.json
index 0fe3dfd4fe991473fbdc4fe3344a6e7b620885be..10c219c01b3721b678341a0a4e24df6432525f24 100644 (file)
--- a/csit/variables/bgpflowspec/empty_route/data.json
+++ b/csit/variables/bgpflowspec/empty_route/data.json
@@ -1,5 +1,5 @@
 {
-    "tables": [
+    "bgp-rib:tables": [
         {
             "afi": "bgp-types:ipv4-address-family",
             "safi": "bgp-flowspec:flowspec-subsequent-address-family",

diff --git a/csit/variables/bgpflowspec/empty_route/location.uri b/csit/variables/bgpflowspec/empty_route/location.uri
index b8c52ac6830012d0e600610124407e8c30865671..96b82cdc814ed2200b9dca4b60f537ae85246c26 100644 (file)
--- a/csit/variables/bgpflowspec/empty_route/location.uri
+++ b/csit/variables/bgpflowspec/empty_route/location.uri
@@ -1 +1 @@
-/restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/loc-rib/tables/bgp-types:ipv4-address-family/bgp-flowspec:flowspec-subsequent-address-family/
+rests/data/bgp-rib:bgp-rib/rib=example-bgp-rib/loc-rib/tables=bgp-types%3Aipv4-address-family,bgp-flowspec%3Aflowspec-subsequent-address-family?content=nonconfig

diff --git a/csit/variables/bgpfunctional/addNeighbor_bgp/location.uri b/csit/variables/bgpfunctional/addNeighbor_bgp/location.uri
index 370afc1d00c8582270241bda8ed1874bc4232e46..eec403c102991d5f86ea2e377724d922f357f3a4 100644 (file)
--- a/csit/variables/bgpfunctional/addNeighbor_bgp/location.uri
+++ b/csit/variables/bgpfunctional/addNeighbor_bgp/location.uri
@@ -1 +1 @@
-/restconf/config/ebgp:bgp/
+/rests/data/ebgp:bgp/

diff --git a/csit/variables/bgpfunctional/addNeighborsContainer_bgp/location.uri b/csit/variables/bgpfunctional/addNeighborsContainer_bgp/location.uri
index 370afc1d00c8582270241bda8ed1874bc4232e46..eec403c102991d5f86ea2e377724d922f357f3a4 100644 (file)
--- a/csit/variables/bgpfunctional/addNeighborsContainer_bgp/location.uri
+++ b/csit/variables/bgpfunctional/addNeighborsContainer_bgp/location.uri
@@ -1 +1 @@
-/restconf/config/ebgp:bgp/
+/rests/data/ebgp:bgp/

diff --git a/csit/variables/bgpfunctional/app_peer/location.uri b/csit/variables/bgpfunctional/app_peer/location.uri
index d713ddf1ec1b5c4cad75036a6e246354cfc1faae..3b3a11f883e9a40842af36bceb6ce5cab039bf9a 100644 (file)
--- a/csit/variables/bgpfunctional/app_peer/location.uri
+++ b/csit/variables/bgpfunctional/app_peer/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpfunctional/bgp_md5/bgp_peer/location.uri b/csit/variables/bgpfunctional/bgp_md5/bgp_peer/location.uri
index d713ddf1ec1b5c4cad75036a6e246354cfc1faae..3b3a11f883e9a40842af36bceb6ce5cab039bf9a 100644 (file)
--- a/csit/variables/bgpfunctional/bgp_md5/bgp_peer/location.uri
+++ b/csit/variables/bgpfunctional/bgp_md5/bgp_peer/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpfunctional/bgp_peer/location.uri b/csit/variables/bgpfunctional/bgp_peer/location.uri
index d713ddf1ec1b5c4cad75036a6e246354cfc1faae..3b3a11f883e9a40842af36bceb6ce5cab039bf9a 100644 (file)
--- a/csit/variables/bgpfunctional/bgp_peer/location.uri
+++ b/csit/variables/bgpfunctional/bgp_peer/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpfunctional/bgppolicies/app_peer/location.uri b/csit/variables/bgpfunctional/bgppolicies/app_peer/location.uri
index 2981ee4b43efe5b9bbad9d6cdcc7ee33428a6db8..f4b6c05b282aab448dd2434fe25f0dc9b762b703 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/app_peer/location.uri
+++ b/csit/variables/bgpfunctional/bgppolicies/app_peer/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/neighbors/
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/neighbors

diff --git a/csit/variables/bgpfunctional/bgppolicies/app_peer_rib.oxygen/location.uri b/csit/variables/bgpfunctional/bgppolicies/app_peer_rib.oxygen/location.uri
index d60fc01184452c6ac302b5c3cfabd3a41b68996f..1229c3e85bbd3f5eaf1bdaf373e7d62cbed33ec4 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/app_peer_rib.oxygen/location.uri
+++ b/csit/variables/bgpfunctional/bgppolicies/app_peer_rib.oxygen/location.uri
@@ -1 +1 @@
-restconf/config/bgp-rib:application-rib/$IP/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes
+restconf/config/bgp-rib:application-rib/$IP/tables/bgp-types%3Aipv4-address-family/bgp-types%3Aunicast-subsequent-address-family/bgp-inet:ipv4-routes

diff --git a/csit/variables/bgpfunctional/bgppolicies/app_peer_rib/location.uri b/csit/variables/bgpfunctional/bgppolicies/app_peer_rib/location.uri
index d60fc01184452c6ac302b5c3cfabd3a41b68996f..8b9ea62bff407dfaacd5c73e43af07abf65276e3 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/app_peer_rib/location.uri
+++ b/csit/variables/bgpfunctional/bgppolicies/app_peer_rib/location.uri
@@ -1 +1 @@
-restconf/config/bgp-rib:application-rib/$IP/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes
+rests/data/bgp-rib:application-rib=$IP/tables=bgp-types%3Aipv4-address-family,bgp-types%3Aunicast-subsequent-address-family/bgp-inet:ipv4-routes

diff --git a/csit/variables/bgpfunctional/bgppolicies/app_peer_route.oxygen/location.uri b/csit/variables/bgpfunctional/bgppolicies/app_peer_route.oxygen/location.uri
index d60fc01184452c6ac302b5c3cfabd3a41b68996f..1229c3e85bbd3f5eaf1bdaf373e7d62cbed33ec4 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/app_peer_route.oxygen/location.uri
+++ b/csit/variables/bgpfunctional/bgppolicies/app_peer_route.oxygen/location.uri
@@ -1 +1 @@
-restconf/config/bgp-rib:application-rib/$IP/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes
+restconf/config/bgp-rib:application-rib/$IP/tables/bgp-types%3Aipv4-address-family/bgp-types%3Aunicast-subsequent-address-family/bgp-inet:ipv4-routes

diff --git a/csit/variables/bgpfunctional/bgppolicies/app_peer_route/location.uri b/csit/variables/bgpfunctional/bgppolicies/app_peer_route/location.uri
index d60fc01184452c6ac302b5c3cfabd3a41b68996f..8b9ea62bff407dfaacd5c73e43af07abf65276e3 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/app_peer_route/location.uri
+++ b/csit/variables/bgpfunctional/bgppolicies/app_peer_route/location.uri
@@ -1 +1 @@
-restconf/config/bgp-rib:application-rib/$IP/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes
+rests/data/bgp-rib:application-rib=$IP/tables=bgp-types%3Aipv4-address-family,bgp-types%3Aunicast-subsequent-address-family/bgp-inet:ipv4-routes

diff --git a/csit/variables/bgpfunctional/bgppolicies/ebgp_peer/location.uri b/csit/variables/bgpfunctional/bgppolicies/ebgp_peer/location.uri
index d713ddf1ec1b5c4cad75036a6e246354cfc1faae..3b3a11f883e9a40842af36bceb6ce5cab039bf9a 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/ebgp_peer/location.uri
+++ b/csit/variables/bgpfunctional/bgppolicies/ebgp_peer/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/location.uri b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/location.uri
index 04671fb7a597895e2047da60d062909be71c11ed..24466377732ffeb4ad10f058ad8aefaa073b8cba 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/location.uri
+++ b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/peer/bgp:%2F%2F$IP/effective-rib-in
+rests/data/bgp-rib:bgp-rib/rib=example-bgp-rib/peer=bgp%3A%2F%2F$IP/effective-rib-in

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_1.oxygen/data.json b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_1.oxygen/data.json
deleted file mode 100644 (file)
index bf48053..0000000
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_1.oxygen/data.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "bgp-inet:ipv4-routes": {
-        "ipv4-route": [
-            {
-                "attributes": {
-                    "as-path": {},
-                    "communities": [
-                        {
-                            "as-number": 30741,
-                            "semantics": 0
-                        },
-                        {
-                            "as-number": 30741,
-                            "semantics": 30741
-                        }
-                    ],
-                    "ipv4-next-hop": {
-                        "global": "11.0.255.254"
-                    },
-                    "local-pref": {
-                        "pref": 100
-                    },
-                    "origin": {
-                        "value": "igp"
-                    }
-                },
-                "path-id": 0,
-                "prefix": "1.1.1.0/24"
-            }
-        ]
-    }
-}

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_1.oxygen/location.uri b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_1.oxygen/location.uri
deleted file mode 100644 (file)
index 16928e5..0000000
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_1.oxygen/location.uri
+++ /dev/null
@@ -1 +0,0 @@
-restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/peer/bgp:%2F%2F$IP/effective-rib-in/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_1/location.uri b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_1/location.uri
index 16928e529fbb85519cc4dfe89278351108e77b94..c2b0ff7877b3966f1233feb79ea691c22a9c4bfc 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_1/location.uri
+++ b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_1/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/peer/bgp:%2F%2F$IP/effective-rib-in/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes
+rests/data/bgp-rib:bgp-rib/rib=example-bgp-rib/peer=bgp%3A%2F%2F$IP/effective-rib-in/tables=bgp-types%3Aipv4-address-family,bgp-types%3Aunicast-subsequent-address-family/bgp-inet:ipv4-routes

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_2.oxygen/data.json b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_2.oxygen/data.json
deleted file mode 100644 (file)
index 741b504..0000000
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_2.oxygen/data.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "bgp-inet:ipv4-routes": {
-        "ipv4-route": [
-            {
-                "attributes": {
-                    "as-path": {},
-                    "ipv4-next-hop": {
-                        "global": "12.0.255.254"
-                    },
-                    "local-pref": {
-                        "pref": 100
-                    },
-                    "origin": {
-                        "value": "igp"
-                    }
-                },
-                "path-id": 0,
-                "prefix": "2.1.1.0/24"
-            },
-            {
-                "attributes": {
-                    "as-path": {},
-                    "ipv4-next-hop": {
-                        "global": "12.1.255.254"
-                    },
-                    "local-pref": {
-                        "pref": 100
-                    },
-                    "origin": {
-                        "value": "igp"
-                    }
-                },
-                "path-id": 0,
-                "prefix": "2.2.1.0/24"
-            },
-            {
-                "attributes": {
-                    "as-path": {},
-                    "ipv4-next-hop": {
-                        "global": "12.3.255.254"
-                    },
-                    "local-pref": {
-                        "pref": 100
-                    },
-                    "origin": {
-                        "value": "igp"
-                    }
-                },
-                "path-id": 0,
-                "prefix": "2.3.1.0/24"
-            }
-        ]
-    }
-}

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_2.oxygen/location.uri b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_2.oxygen/location.uri
deleted file mode 100644 (file)
index 16928e5..0000000
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_2.oxygen/location.uri
+++ /dev/null
@@ -1 +0,0 @@
-restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/peer/bgp:%2F%2F$IP/effective-rib-in/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_2/location.uri b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_2/location.uri
index 16928e529fbb85519cc4dfe89278351108e77b94..c2b0ff7877b3966f1233feb79ea691c22a9c4bfc 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_2/location.uri
+++ b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_2/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/peer/bgp:%2F%2F$IP/effective-rib-in/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes
+rests/data/bgp-rib:bgp-rib/rib=example-bgp-rib/peer=bgp%3A%2F%2F$IP/effective-rib-in/tables=bgp-types%3Aipv4-address-family,bgp-types%3Aunicast-subsequent-address-family/bgp-inet:ipv4-routes

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_3.oxygen/data.json b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_3.oxygen/data.json
deleted file mode 100644 (file)
index 4ea2e36..0000000
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_3.oxygen/data.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "bgp-vpn-ipv4:vpn-ipv4-routes": {
-        "vpn-route": [
-            {
-                "attributes": {
-                    "as-path": {
-                        "segments": [
-                            {
-                                "as-sequence": [
-                                    35000,
-                                    60000,
-                                    64000
-                                ]
-                            }
-                        ]
-                    },
-                    "communities": [
-                        {
-                            "as-number": 64000,
-                            "semantics": 43
-                        }
-                    ],
-                    "extended-communities": [
-                        {
-                            "route-target-extended-community": {
-                                "global-administrator": 24563,
-                                "local-administrator": "ByNLLg=="
-                            },
-                            "transitive": true
-                        }
-                    ],
-                    "ipv4-next-hop": {
-                        "global": "104.36.0.254"
-                    },
-                    "origin": {
-                        "value": "igp"
-                    }
-                },
-                "label-stack": [
-                    {
-                        "label-value": 256
-                    }
-                ],
-                "prefix": "103.36.0.0/24",
-                "route-distinguisher": "0:3548:478513974",
-                "route-key": "WAAADdwchYs2ZyQA"
-            }
-        ]
-    }
-}

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_3.oxygen/location.uri b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_3.oxygen/location.uri
deleted file mode 100644 (file)
index 71bbc71..0000000
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_3.oxygen/location.uri
+++ /dev/null
@@ -1 +0,0 @@
-restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/peer/bgp:%2F%2F$IP/effective-rib-in/tables/bgp-types:ipv4-address-family/bgp-types:mpls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_3/location.uri b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_3/location.uri
index 71bbc71e96b527e905b2eaf08917e3f548caa904..fada9dda2d1b0008bfad70d308e3f8f16fd3111d 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_3/location.uri
+++ b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_3/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/peer/bgp:%2F%2F$IP/effective-rib-in/tables/bgp-types:ipv4-address-family/bgp-types:mpls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes
+rests/data/bgp-rib:bgp-rib/rib=example-bgp-rib/peer=bgp%3A%2F%2F$IP/effective-rib-in/tables=bgp-types%3Aipv4-address-family,bgp-types%3Ampls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_4.oxygen/data.json b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_4.oxygen/data.json
deleted file mode 100644 (file)
index 5abf3e9..0000000
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_4.oxygen/data.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "bgp-inet:ipv4-routes": {
-        "ipv4-route": [
-            {
-                "attributes": {
-                    "as-path": {},
-                    "communities": [
-                        {
-                            "as-number": 30740,
-                            "semantics": 0
-                        },
-                        {
-                            "as-number": 30740,
-                            "semantics": 30740
-                        }
-                    ],
-                    "ipv4-next-hop": {
-                        "global": "14.0.255.254"
-                    },
-                    "origin": {
-                        "value": "igp"
-                    }
-                },
-                "path-id": 0,
-                "prefix": "4.1.1.0/24"
-            }
-        ]
-    }
-}

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_4.oxygen/location.uri b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_4.oxygen/location.uri
deleted file mode 100644 (file)
index 16928e5..0000000
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_4.oxygen/location.uri
+++ /dev/null
@@ -1 +0,0 @@
-restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/peer/bgp:%2F%2F$IP/effective-rib-in/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_4/location.uri b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_4/location.uri
index 16928e529fbb85519cc4dfe89278351108e77b94..c2b0ff7877b3966f1233feb79ea691c22a9c4bfc 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_4/location.uri
+++ b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_4/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/peer/bgp:%2F%2F$IP/effective-rib-in/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes
+rests/data/bgp-rib:bgp-rib/rib=example-bgp-rib/peer=bgp%3A%2F%2F$IP/effective-rib-in/tables=bgp-types%3Aipv4-address-family,bgp-types%3Aunicast-subsequent-address-family/bgp-inet:ipv4-routes

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_5.oxygen/data.json b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_5.oxygen/data.json
deleted file mode 100644 (file)
index 6c33bd3..0000000
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_5.oxygen/data.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "bgp-inet:ipv4-routes": {
-        "ipv4-route": [
-            {
-                "attributes": {
-                    "as-path": {},
-                    "extended-communities": [
-                        {
-                            "route-target-extended-community": {
-                                "global-administrator": 31740,
-                                "local-administrator": "AAB7/A=="
-                            },
-                            "transitive": true
-                        }
-                    ],
-                    "ipv4-next-hop": {
-                        "global": "15.0.255.254"
-                    },
-                    "local-pref": {
-                        "pref": 100
-                    },
-                    "origin": {
-                        "value": "igp"
-                    }
-                },
-                "path-id": 0,
-                "prefix": "5.1.1.0/24"
-            }
-        ]
-    }
-}

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_5.oxygen/location.uri b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_5.oxygen/location.uri
deleted file mode 100644 (file)
index 16928e5..0000000
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_5.oxygen/location.uri
+++ /dev/null
@@ -1 +0,0 @@
-restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/peer/bgp:%2F%2F$IP/effective-rib-in/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_5/location.uri b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_5/location.uri
index 16928e529fbb85519cc4dfe89278351108e77b94..c2b0ff7877b3966f1233feb79ea691c22a9c4bfc 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_5/location.uri
+++ b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_5/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/peer/bgp:%2F%2F$IP/effective-rib-in/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes
+rests/data/bgp-rib:bgp-rib/rib=example-bgp-rib/peer=bgp%3A%2F%2F$IP/effective-rib-in/tables=bgp-types%3Aipv4-address-family,bgp-types%3Aunicast-subsequent-address-family/bgp-inet:ipv4-routes

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_6.oxygen/data.json b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_6.oxygen/data.json
deleted file mode 100644 (file)
index cd048b2..0000000
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_6.oxygen/data.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "bgp-vpn-ipv6:vpn-ipv6-routes": {
-        "vpn-route": [
-            {
-                "attributes": {
-                    "as-path": {
-                        "segments": [
-                            {
-                                "as-sequence": [
-                                    25186,
-                                    64512,
-                                    65000
-                                ]
-                            }
-                        ]
-                    },
-                    "communities": [
-                        {
-                            "as-number": 65000,
-                            "semantics": 33
-                        }
-                    ],
-                    "extended-communities": [
-                        {
-                            "route-target-extended-community": {
-                                "global-administrator": 10283,
-                                "local-administrator": "BPlceA=="
-                            },
-                            "transitive": true
-                        }
-                    ],
-                    "ipv6-next-hop": {
-                        "global": "::ffff"
-                    },
-                    "local-pref": {
-                        "pref": 100
-                    },
-                    "origin": {
-                        "value": "igp"
-                    },
-                    "originator-id": {
-                        "originator": "57.35.2.240"
-                    }
-                },
-                "label-stack": [
-                    {
-                        "label-value": 926
-                    }
-                ],
-                "prefix": "2001:4b50:20c0::/48",
-                "route-distinguisher": "0:3215:583457597",
-                "route-key": "cAAADI8ixts9IAFLUCDA"
-            }
-        ]
-    }
-}

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_6.oxygen/location.uri b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_6.oxygen/location.uri
deleted file mode 100644 (file)
index 528a0d7..0000000
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_6.oxygen/location.uri
+++ /dev/null
@@ -1 +0,0 @@
-restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/peer/bgp:%2F%2F$IP/effective-rib-in/tables/bgp-types:ipv6-address-family/bgp-types:mpls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv6:vpn-ipv6-routes

diff --git a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_6/location.uri b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_6/location.uri
index 528a0d7eb0898a2844a315423138a1c65391dd85..9fba429859efd8dffa913b7f0552459243e5cc83 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_6/location.uri
+++ b/csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_6/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/peer/bgp:%2F%2F$IP/effective-rib-in/tables/bgp-types:ipv6-address-family/bgp-types:mpls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv6:vpn-ipv6-routes
+rests/data/bgp-rib:bgp-rib/rib=example-bgp-rib/peer=bgp%3A%2F%2F$IP/effective-rib-in/tables=bgp-types%3Aipv6-address-family,bgp-types%3Ampls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv6:vpn-ipv6-routes

diff --git a/csit/variables/bgpfunctional/bgppolicies/ibgp_peer/location.uri b/csit/variables/bgpfunctional/bgppolicies/ibgp_peer/location.uri
index d713ddf1ec1b5c4cad75036a6e246354cfc1faae..3b3a11f883e9a40842af36bceb6ce5cab039bf9a 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/ibgp_peer/location.uri
+++ b/csit/variables/bgpfunctional/bgppolicies/ibgp_peer/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpfunctional/bgppolicies/rib_state/location.uri b/csit/variables/bgpfunctional/bgppolicies/rib_state/location.uri
index 48fa884f3db9e74794b7c66f024d9c455b2bc585..8b73b7f7efa88d289e4a2e167eec829a566cff4e 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/rib_state/location.uri
+++ b/csit/variables/bgpfunctional/bgppolicies/rib_state/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib
+rests/data/bgp-rib:bgp-rib/rib=example-bgp-rib

diff --git a/csit/variables/bgpfunctional/bgppolicies/rr_client_peer/location.uri b/csit/variables/bgpfunctional/bgppolicies/rr_client_peer/location.uri
index d713ddf1ec1b5c4cad75036a6e246354cfc1faae..3b3a11f883e9a40842af36bceb6ce5cab039bf9a 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/rr_client_peer/location.uri
+++ b/csit/variables/bgpfunctional/bgppolicies/rr_client_peer/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpfunctional/bgppolicies/topology_state/data.json b/csit/variables/bgpfunctional/bgppolicies/topology_state/data.json
index 79b8ae619805bbc098704a70c81e7fbd7935fb70..b392a661f9635f0a2266c47ef37c280abee764f1 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/topology_state/data.json
+++ b/csit/variables/bgpfunctional/bgppolicies/topology_state/data.json
@@ -1,7 +1,8 @@
 {
-    "topology": [
+    "network-topology:topology": [
         {
             "topology-id": "example-ipv4-topology",
+            "odl-bgp-topology-config:rib-id": "example-bgp-rib",
             "server-provided": true,
             "topology-types": {
                 "odl-bgp-topology-types:bgp-ipv4-reachability-topology": {}

diff --git a/csit/variables/bgpfunctional/bgppolicies/topology_state/location.uri b/csit/variables/bgpfunctional/bgppolicies/topology_state/location.uri
index 82e25f3d74831312622088e60729c7b02c547e84..99063391acbcf670cfb3cd53ed6a1c1e049d3e2c 100644 (file)
--- a/csit/variables/bgpfunctional/bgppolicies/topology_state/location.uri
+++ b/csit/variables/bgpfunctional/bgppolicies/topology_state/location.uri
@@ -1 +1 @@
-/restconf/operational/network-topology:network-topology/topology/example-ipv4-topology
+/rests/data/network-topology:network-topology/topology=example-ipv4-topology

diff --git a/csit/variables/bgpfunctional/bmp_basic/empty_structure/data.json b/csit/variables/bgpfunctional/bmp_basic/empty_structure/data.json
index 66ebc3aa1a96075efcdf45fa2fa989549552e025..4a9246e74aa46d124354d018239b231408528440 100644 (file)
--- a/csit/variables/bgpfunctional/bmp_basic/empty_structure/data.json
+++ b/csit/variables/bgpfunctional/bmp_basic/empty_structure/data.json
@@ -1,5 +1,5 @@
 {
-    "bmp-monitor": {
+    "bmp-monitor:bmp-monitor": {
         "monitor": [
             {
                 "monitor-id": "example-bmp-monitor"

diff --git a/csit/variables/bgpfunctional/bmp_basic/empty_structure/location.uri b/csit/variables/bgpfunctional/bmp_basic/empty_structure/location.uri
index 513abc0ac6974759542b2a4d67a0fc08896f7831..8f6a549bca013d309be00b1ec5b4b6765c1d0e93 100644 (file)
--- a/csit/variables/bgpfunctional/bmp_basic/empty_structure/location.uri
+++ b/csit/variables/bgpfunctional/bmp_basic/empty_structure/location.uri
@@ -1 +1 @@
-/restconf/operational/bmp-monitor:bmp-monitor
+/rests/data/bmp-monitor:bmp-monitor

diff --git a/csit/variables/bgpfunctional/bmp_basic/filled_structure/data.json b/csit/variables/bgpfunctional/bmp_basic/filled_structure/data.json
index deca11d914872685f47b9d8329c151202e46cc14..8bbc8006596b5ab9835e07fc5a39b88a1f633eb2 100644 (file)
--- a/csit/variables/bgpfunctional/bmp_basic/filled_structure/data.json
+++ b/csit/variables/bgpfunctional/bmp_basic/filled_structure/data.json
@@ -1,5 +1,5 @@
 {
-    "bmp-monitor": {
+    "bmp-monitor:bmp-monitor": {
         "monitor": [
             {
                 "monitor-id": "example-bmp-monitor",

diff --git a/csit/variables/bgpfunctional/bmp_basic/filled_structure/location.uri b/csit/variables/bgpfunctional/bmp_basic/filled_structure/location.uri
index 513abc0ac6974759542b2a4d67a0fc08896f7831..8f6a549bca013d309be00b1ec5b4b6765c1d0e93 100644 (file)
--- a/csit/variables/bgpfunctional/bmp_basic/filled_structure/location.uri
+++ b/csit/variables/bgpfunctional/bmp_basic/filled_structure/location.uri
@@ -1 +1 @@
-/restconf/operational/bmp-monitor:bmp-monitor
+/rests/data/bmp-monitor:bmp-monitor

diff --git a/csit/variables/bgpfunctional/create_bgp/location.uri b/csit/variables/bgpfunctional/create_bgp/location.uri
index 370afc1d00c8582270241bda8ed1874bc4232e46..eec403c102991d5f86ea2e377724d922f357f3a4 100644 (file)
--- a/csit/variables/bgpfunctional/create_bgp/location.uri
+++ b/csit/variables/bgpfunctional/create_bgp/location.uri
@@ -1 +1 @@
-/restconf/config/ebgp:bgp/
+/rests/data/ebgp:bgp/

diff --git a/csit/variables/bgpfunctional/create_etep/location.uri b/csit/variables/bgpfunctional/create_etep/location.uri
index 25894b847a9a5bd5b564455d3753634967efd856..62a3d847cb04240a99a6c0bdaf819f3c80237259 100644 (file)
--- a/csit/variables/bgpfunctional/create_etep/location.uri
+++ b/csit/variables/bgpfunctional/create_etep/location.uri
@@ -1 +1 @@
-/restconf/operations/itm-rpc:add-external-tunnel-endpoint/
+/rests/operations/itm-rpc:add-external-tunnel-endpoint/

diff --git a/csit/variables/bgpfunctional/delete_etep/location.uri b/csit/variables/bgpfunctional/delete_etep/location.uri
index 2e845f0ec79317794d8b7ce2a20a41ca3f247b89..cae86a64964a2f5fdbfa594a457226a16fdce5a8 100644 (file)
--- a/csit/variables/bgpfunctional/delete_etep/location.uri
+++ b/csit/variables/bgpfunctional/delete_etep/location.uri
@@ -1 +1 @@
-/restconf/operations/itm-rpc:remove-external-tunnel-endpoint/
+/rests/operations/itm-rpc:remove-external-tunnel-endpoint/

diff --git a/csit/variables/bgpfunctional/ebgp_peer/location.uri b/csit/variables/bgpfunctional/ebgp_peer/location.uri
index 2e9bef729577a72e45906d65379b937eb44bcc21..a64f3658c46198469a14b33f9cf5c990ae64018b 100644 (file)
--- a/csit/variables/bgpfunctional/ebgp_peer/location.uri
+++ b/csit/variables/bgpfunctional/ebgp_peer/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpfunctional/graceful_restart/empty_ipv6_route/location.uri b/csit/variables/bgpfunctional/graceful_restart/empty_ipv6_route/location.uri
index 1d7830bb546a7c450c7d4e56d43c4eb003e3844c..c7a61e04618b83dbf26f405d3b09387173b47e6f 100644 (file)
--- a/csit/variables/bgpfunctional/graceful_restart/empty_ipv6_route/location.uri
+++ b/csit/variables/bgpfunctional/graceful_restart/empty_ipv6_route/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/loc-rib/tables/bgp-types:ipv6-address-family/bgp-types:unicast-subsequent-address-family/
+rests/data/bgp-rib:bgp-rib/rib=example-bgp-rib/loc-rib/tables=bgp-types%3Aipv6-address-family,bgp-types%3Aunicast-subsequent-address-family/

diff --git a/csit/variables/bgpfunctional/graceful_restart/empty_route/location.uri b/csit/variables/bgpfunctional/graceful_restart/empty_route/location.uri
index 6a0a99bf970a5d05e60f60fe3445108aa2c1b23c..1263d39dea4a9bda5ddd5b8a65d0d385442addea 100644 (file)
--- a/csit/variables/bgpfunctional/graceful_restart/empty_route/location.uri
+++ b/csit/variables/bgpfunctional/graceful_restart/empty_route/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/loc-rib/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/
+rests/data/bgp-rib:bgp-rib/rib=example-bgp-rib/loc-rib/tables=bgp-types%3Aipv4-address-family,bgp-types%3Aunicast-subsequent-address-family/

diff --git a/csit/variables/bgpfunctional/graceful_restart/ipv4_1/location.uri b/csit/variables/bgpfunctional/graceful_restart/ipv4_1/location.uri
index 0a87e72993e8bbb23871218c33f969c82dfda6cd..03138da91d997a82a93b5a39e1596619c4c3e06b 100644 (file)
--- a/csit/variables/bgpfunctional/graceful_restart/ipv4_1/location.uri
+++ b/csit/variables/bgpfunctional/graceful_restart/ipv4_1/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/loc-rib/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes
+rests/data/bgp-rib:bgp-rib/rib=example-bgp-rib/loc-rib/tables=bgp-types%3Aipv4-address-family,bgp-types%3Aunicast-subsequent-address-family/bgp-inet:ipv4-routes

diff --git a/csit/variables/bgpfunctional/graceful_restart/ipv4_1_1/location.uri b/csit/variables/bgpfunctional/graceful_restart/ipv4_1_1/location.uri
index 0a87e72993e8bbb23871218c33f969c82dfda6cd..03138da91d997a82a93b5a39e1596619c4c3e06b 100644 (file)
--- a/csit/variables/bgpfunctional/graceful_restart/ipv4_1_1/location.uri
+++ b/csit/variables/bgpfunctional/graceful_restart/ipv4_1_1/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/loc-rib/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes
+rests/data/bgp-rib:bgp-rib/rib=example-bgp-rib/loc-rib/tables=bgp-types%3Aipv4-address-family,bgp-types%3Aunicast-subsequent-address-family/bgp-inet:ipv4-routes

diff --git a/csit/variables/bgpfunctional/graceful_restart/ipv4_2/location.uri b/csit/variables/bgpfunctional/graceful_restart/ipv4_2/location.uri
index 0a87e72993e8bbb23871218c33f969c82dfda6cd..03138da91d997a82a93b5a39e1596619c4c3e06b 100644 (file)
--- a/csit/variables/bgpfunctional/graceful_restart/ipv4_2/location.uri
+++ b/csit/variables/bgpfunctional/graceful_restart/ipv4_2/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/loc-rib/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes
+rests/data/bgp-rib:bgp-rib/rib=example-bgp-rib/loc-rib/tables=bgp-types%3Aipv4-address-family,bgp-types%3Aunicast-subsequent-address-family/bgp-inet:ipv4-routes

diff --git a/csit/variables/bgpfunctional/graceful_restart/ipv4_2_1/location.uri b/csit/variables/bgpfunctional/graceful_restart/ipv4_2_1/location.uri
index 0a87e72993e8bbb23871218c33f969c82dfda6cd..03138da91d997a82a93b5a39e1596619c4c3e06b 100644 (file)
--- a/csit/variables/bgpfunctional/graceful_restart/ipv4_2_1/location.uri
+++ b/csit/variables/bgpfunctional/graceful_restart/ipv4_2_1/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/loc-rib/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes
+rests/data/bgp-rib:bgp-rib/rib=example-bgp-rib/loc-rib/tables=bgp-types%3Aipv4-address-family,bgp-types%3Aunicast-subsequent-address-family/bgp-inet:ipv4-routes

diff --git a/csit/variables/bgpfunctional/graceful_restart/ipv6_1/location.uri b/csit/variables/bgpfunctional/graceful_restart/ipv6_1/location.uri
index 1ce5b5c6c7ccd25e8d552260f937c820e9155cd8..f058a4480ffe1063f4d638832d947a6726cf3fab 100644 (file)
--- a/csit/variables/bgpfunctional/graceful_restart/ipv6_1/location.uri
+++ b/csit/variables/bgpfunctional/graceful_restart/ipv6_1/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/loc-rib/tables/bgp-types:ipv6-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv6-routes
+rests/data/bgp-rib:bgp-rib/rib=example-bgp-rib/loc-rib/tables=bgp-types%3Aipv6-address-family,bgp-types%3Aunicast-subsequent-address-family/bgp-inet:ipv6-routes

diff --git a/csit/variables/bgpfunctional/graceful_restart/peers/location.uri b/csit/variables/bgpfunctional/graceful_restart/peers/location.uri
index 2e9bef729577a72e45906d65379b937eb44bcc21..3b3a11f883e9a40842af36bceb6ce5cab039bf9a 100644 (file)
--- a/csit/variables/bgpfunctional/graceful_restart/peers/location.uri
+++ b/csit/variables/bgpfunctional/graceful_restart/peers/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpfunctional/graceful_restart/restart/location.uri b/csit/variables/bgpfunctional/graceful_restart/restart/location.uri
index bd2e7e98e653b420a4f9b56a307e18516daa7e5a..a2ed6b055389e1eb6684f7d93f23dd0f9d0c622f 100644 (file)
--- a/csit/variables/bgpfunctional/graceful_restart/restart/location.uri
+++ b/csit/variables/bgpfunctional/graceful_restart/restart/location.uri
@@ -1 +1 @@
-restconf/operations/bgp-peer-rpc:restart-gracefully
+rests/operations/bgp-peer-rpc:restart-gracefully

diff --git a/csit/variables/bgpfunctional/ipv6/application_peer/location.uri b/csit/variables/bgpfunctional/ipv6/application_peer/location.uri
index d713ddf1ec1b5c4cad75036a6e246354cfc1faae..3b3a11f883e9a40842af36bceb6ce5cab039bf9a 100644 (file)
--- a/csit/variables/bgpfunctional/ipv6/application_peer/location.uri
+++ b/csit/variables/bgpfunctional/ipv6/application_peer/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpfunctional/ipv6/bgp_neighbor_rib/location.uri b/csit/variables/bgpfunctional/ipv6/bgp_neighbor_rib/location.uri
index d713ddf1ec1b5c4cad75036a6e246354cfc1faae..3b3a11f883e9a40842af36bceb6ce5cab039bf9a 100644 (file)
--- a/csit/variables/bgpfunctional/ipv6/bgp_neighbor_rib/location.uri
+++ b/csit/variables/bgpfunctional/ipv6/bgp_neighbor_rib/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpfunctional/ipv6/bgp_peer/location.uri b/csit/variables/bgpfunctional/ipv6/bgp_peer/location.uri
index d713ddf1ec1b5c4cad75036a6e246354cfc1faae..3b3a11f883e9a40842af36bceb6ce5cab039bf9a 100644 (file)
--- a/csit/variables/bgpfunctional/ipv6/bgp_peer/location.uri
+++ b/csit/variables/bgpfunctional/ipv6/bgp_peer/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpfunctional/ipv6/bgp_rib/location.uri b/csit/variables/bgpfunctional/ipv6/bgp_rib/location.uri
index fecf5ff73ae2a83e7b61049260b2e514c635e782..336d183d98afaf87a2bccd83816b35185833f5d5 100644 (file)
--- a/csit/variables/bgpfunctional/ipv6/bgp_rib/location.uri
+++ b/csit/variables/bgpfunctional/ipv6/bgp_rib/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB_OPENCONFIG
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB_OPENCONFIG

diff --git a/csit/variables/bgpfunctional/ipv6/graceful_restart/location.uri b/csit/variables/bgpfunctional/ipv6/graceful_restart/location.uri
index d713ddf1ec1b5c4cad75036a6e246354cfc1faae..3b3a11f883e9a40842af36bceb6ce5cab039bf9a 100644 (file)
--- a/csit/variables/bgpfunctional/ipv6/graceful_restart/location.uri
+++ b/csit/variables/bgpfunctional/ipv6/graceful_restart/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpfunctional/ipv6/ipv6_route_injection/location.uri b/csit/variables/bgpfunctional/ipv6/ipv6_route_injection/location.uri
index 2a9c6601317626f97a8116f85076c1ee5f349b00..1e03329bb17dc22df155c45d5f689dbe022177fb 100644 (file)
--- a/csit/variables/bgpfunctional/ipv6/ipv6_route_injection/location.uri
+++ b/csit/variables/bgpfunctional/ipv6/ipv6_route_injection/location.uri
@@ -1 +1 @@
-restconf/config/bgp-rib:application-rib/$IP/tables/bgp-types:ipv6-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv6-routes
+rests/data/bgp-rib:application-rib=$IP/tables=bgp-types%3Aipv6-address-family,bgp-types%3Aunicast-subsequent-address-family/bgp-inet:ipv6-routes

diff --git a/csit/variables/bgpfunctional/ipv6/ipv6_topology_empty/data.json b/csit/variables/bgpfunctional/ipv6/ipv6_topology_empty/data.json
index 5b63cca850f26b6077174cf0196ebb2b6646c111..f0c1b95ab4a512f48209f07e5d4cd40aca2d52b1 100644 (file)
--- a/csit/variables/bgpfunctional/ipv6/ipv6_topology_empty/data.json
+++ b/csit/variables/bgpfunctional/ipv6/ipv6_topology_empty/data.json
@@ -1,6 +1,7 @@
 {
-    "topology": [
+    "network-topology:topology": [
         {
+            "odl-bgp-topology-config:rib-id": "example-bgp-rib",
             "server-provided": true,
             "topology-id": "example-ipv6-topology",
             "topology-types": {

diff --git a/csit/variables/bgpfunctional/ipv6/ipv6_topology_empty/location.uri b/csit/variables/bgpfunctional/ipv6/ipv6_topology_empty/location.uri
index 56a3cc0f6944bf7b27ef1a78771fdb1e7b5164f1..51b94a02bd69372721d8cd5eddc1595f02e156a4 100644 (file)
--- a/csit/variables/bgpfunctional/ipv6/ipv6_topology_empty/location.uri
+++ b/csit/variables/bgpfunctional/ipv6/ipv6_topology_empty/location.uri
@@ -1 +1 @@
-restconf/operational/network-topology:network-topology/topology/example-ipv6-topology
+rests/data/network-topology:network-topology/topology=example-ipv6-topology

diff --git a/csit/variables/bgpfunctional/ipv6/ipv6_topology_filled/data.json b/csit/variables/bgpfunctional/ipv6/ipv6_topology_filled/data.json
index 05ec3994ea4ead8bb283727e85573bf843e86a12..f1ced1e028f19956f6f435200c0eec259bfe952c 100644 (file)
--- a/csit/variables/bgpfunctional/ipv6/ipv6_topology_filled/data.json
+++ b/csit/variables/bgpfunctional/ipv6/ipv6_topology_filled/data.json
@@ -1,5 +1,5 @@
 {
-    "topology": [
+    "network-topology:topology": [
         {
             "node": [
                 {
@@ -13,6 +13,7 @@
                     "node-id": "2607:f0d0:1002:11::2"
                 }
             ],
+            "odl-bgp-topology-config:rib-id": "example-bgp-rib",
             "server-provided": true,
             "topology-id": "example-ipv6-topology",
             "topology-types": {

diff --git a/csit/variables/bgpfunctional/ipv6/ipv6_topology_filled/location.uri b/csit/variables/bgpfunctional/ipv6/ipv6_topology_filled/location.uri
index 56a3cc0f6944bf7b27ef1a78771fdb1e7b5164f1..51b94a02bd69372721d8cd5eddc1595f02e156a4 100644 (file)
--- a/csit/variables/bgpfunctional/ipv6/ipv6_topology_filled/location.uri
+++ b/csit/variables/bgpfunctional/ipv6/ipv6_topology_filled/location.uri
@@ -1 +1 @@
-restconf/operational/network-topology:network-topology/topology/example-ipv6-topology
+rests/data/network-topology:network-topology/topology=example-ipv6-topology

diff --git a/csit/variables/bgpfunctional/ipv6/rib_state/location.uri b/csit/variables/bgpfunctional/ipv6/rib_state/location.uri
index 48fa884f3db9e74794b7c66f024d9c455b2bc585..8b73b7f7efa88d289e4a2e167eec829a566cff4e 100644 (file)
--- a/csit/variables/bgpfunctional/ipv6/rib_state/location.uri
+++ b/csit/variables/bgpfunctional/ipv6/rib_state/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib
+rests/data/bgp-rib:bgp-rib/rib=example-bgp-rib

diff --git a/csit/variables/bgpfunctional/l3vpn_ipv4/bgp_l3vpn_ipv4/location.uri b/csit/variables/bgpfunctional/l3vpn_ipv4/bgp_l3vpn_ipv4/location.uri
index def78398e3fa73c61b531fc47f33a4c3ce4ec352..6e7feae6b4e446f05090caef706053fe9d1b9868 100644 (file)
--- a/csit/variables/bgpfunctional/l3vpn_ipv4/bgp_l3vpn_ipv4/location.uri
+++ b/csit/variables/bgpfunctional/l3vpn_ipv4/bgp_l3vpn_ipv4/location.uri
@@ -1 +1 @@
-/restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/loc-rib/tables/bgp-types:ipv4-address-family/bgp-types:mpls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes
+/rests/data/bgp-rib:bgp-rib/rib=example-bgp-rib/loc-rib/tables=bgp-types%3Aipv4-address-family,bgp-types%3Ampls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes

diff --git a/csit/variables/bgpfunctional/l3vpn_ipv4/bgp_l3vpn_ipv4_empty/location.uri b/csit/variables/bgpfunctional/l3vpn_ipv4/bgp_l3vpn_ipv4_empty/location.uri
index def78398e3fa73c61b531fc47f33a4c3ce4ec352..6e7feae6b4e446f05090caef706053fe9d1b9868 100644 (file)
--- a/csit/variables/bgpfunctional/l3vpn_ipv4/bgp_l3vpn_ipv4_empty/location.uri
+++ b/csit/variables/bgpfunctional/l3vpn_ipv4/bgp_l3vpn_ipv4_empty/location.uri
@@ -1 +1 @@
-/restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/loc-rib/tables/bgp-types:ipv4-address-family/bgp-types:mpls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes
+/rests/data/bgp-rib:bgp-rib/rib=example-bgp-rib/loc-rib/tables=bgp-types%3Aipv4-address-family,bgp-types%3Ampls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes

diff --git a/csit/variables/bgpfunctional/l3vpn_ipv4/bgp_l3vpn_ipv4_path/location.uri b/csit/variables/bgpfunctional/l3vpn_ipv4/bgp_l3vpn_ipv4_path/location.uri
index def78398e3fa73c61b531fc47f33a4c3ce4ec352..6e7feae6b4e446f05090caef706053fe9d1b9868 100644 (file)
--- a/csit/variables/bgpfunctional/l3vpn_ipv4/bgp_l3vpn_ipv4_path/location.uri
+++ b/csit/variables/bgpfunctional/l3vpn_ipv4/bgp_l3vpn_ipv4_path/location.uri
@@ -1 +1 @@
-/restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/loc-rib/tables/bgp-types:ipv4-address-family/bgp-types:mpls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes
+/rests/data/bgp-rib:bgp-rib/rib=example-bgp-rib/loc-rib/tables=bgp-types%3Aipv4-address-family,bgp-types%3Ampls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes

diff --git a/csit/variables/bgpfunctional/l3vpn_ipv4/bgp_peer/location.uri b/csit/variables/bgpfunctional/l3vpn_ipv4/bgp_peer/location.uri
index 2e9bef729577a72e45906d65379b937eb44bcc21..cf0ae6276340c547266cadf249f3c93b64a71aea 100644 (file)
--- a/csit/variables/bgpfunctional/l3vpn_ipv4/bgp_peer/location.uri
+++ b/csit/variables/bgpfunctional/l3vpn_ipv4/bgp_peer/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB/bgp-openconfig-extensions:bgp/neighbors/neighbor/$IP

diff --git a/csit/variables/bgpfunctional/l3vpn_ipv4/empty_route/data.json b/csit/variables/bgpfunctional/l3vpn_ipv4/empty_route/data.json
index 3566ea931f8120ef8cd45a63b8a8ab1b81631372..a0c23c6d2d0893bcf45cf2851f6725f4cf7ff7dd 100644 (file)
--- a/csit/variables/bgpfunctional/l3vpn_ipv4/empty_route/data.json
+++ b/csit/variables/bgpfunctional/l3vpn_ipv4/empty_route/data.json
@@ -1,5 +1,5 @@
 {
-    "tables": [
+    "bgp-rib:tables": [
         {
             "afi": "bgp-types:ipv4-address-family",
             "safi": "bgp-types:mpls-labeled-vpn-subsequent-address-family",

diff --git a/csit/variables/bgpfunctional/l3vpn_ipv4/empty_route/location.uri b/csit/variables/bgpfunctional/l3vpn_ipv4/empty_route/location.uri
index c512232df58776846a017e3c82eb38ce3c34dc1b..b626f65be2625cd9dbe1d35ecc5898ce29cfb28f 100644 (file)
--- a/csit/variables/bgpfunctional/l3vpn_ipv4/empty_route/location.uri
+++ b/csit/variables/bgpfunctional/l3vpn_ipv4/empty_route/location.uri
@@ -1 +1 @@
-/restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/loc-rib/tables/bgp-types:ipv4-address-family/bgp-types:mpls-labeled-vpn-subsequent-address-family/
+/rests/data/bgp-rib:bgp-rib/rib=example-bgp-rib/loc-rib/tables=bgp-types%3Aipv4-address-family,bgp-types%3Ampls-labeled-vpn-subsequent-address-family

diff --git a/csit/variables/bgpfunctional/l3vpn_ipv4/route-path/location.uri b/csit/variables/bgpfunctional/l3vpn_ipv4/route-path/location.uri
index 5308660dd23de9a4859d2a329523186305db79a7..9d0ef723ca208fa72b90564949c301dfdaa8e99e 100644 (file)
--- a/csit/variables/bgpfunctional/l3vpn_ipv4/route-path/location.uri
+++ b/csit/variables/bgpfunctional/l3vpn_ipv4/route-path/location.uri
@@ -1 +1 @@
-/restconf/config/bgp-rib:application-rib/$APP_PEER_IP/tables/bgp-types:ipv4-address-family/bgp-types:mpls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes
+/rests/data/bgp-rib:application-rib=$APP_PEER_IP/tables=bgp-types%3Aipv4-address-family,bgp-types%3Ampls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes

diff --git a/csit/variables/bgpfunctional/l3vpn_ipv4/route/location.uri b/csit/variables/bgpfunctional/l3vpn_ipv4/route/location.uri
index 5308660dd23de9a4859d2a329523186305db79a7..9d0ef723ca208fa72b90564949c301dfdaa8e99e 100644 (file)
--- a/csit/variables/bgpfunctional/l3vpn_ipv4/route/location.uri
+++ b/csit/variables/bgpfunctional/l3vpn_ipv4/route/location.uri
@@ -1 +1 @@
-/restconf/config/bgp-rib:application-rib/$APP_PEER_IP/tables/bgp-types:ipv4-address-family/bgp-types:mpls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes
+/rests/data/bgp-rib:application-rib=$APP_PEER_IP/tables=bgp-types%3Aipv4-address-family,bgp-types%3Ampls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes

diff --git a/csit/variables/bgpfunctional/l3vpn_mcast/app_peer/location.uri b/csit/variables/bgpfunctional/l3vpn_mcast/app_peer/location.uri
index 2e9bef729577a72e45906d65379b937eb44bcc21..a64f3658c46198469a14b33f9cf5c990ae64018b 100644 (file)
--- a/csit/variables/bgpfunctional/l3vpn_mcast/app_peer/location.uri
+++ b/csit/variables/bgpfunctional/l3vpn_mcast/app_peer/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpfunctional/l3vpn_mcast/bgp_peer/location.uri b/csit/variables/bgpfunctional/l3vpn_mcast/bgp_peer/location.uri
index 2e9bef729577a72e45906d65379b937eb44bcc21..a64f3658c46198469a14b33f9cf5c990ae64018b 100644 (file)
--- a/csit/variables/bgpfunctional/l3vpn_mcast/bgp_peer/location.uri
+++ b/csit/variables/bgpfunctional/l3vpn_mcast/bgp_peer/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv4.fluorine/location.uri b/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv4.fluorine/location.uri
index ceff12f0c4de1907e9dbf4a928db4ee29d9bffe2..3a730886201c7aac898e73ef6e92fa64ae9b4d78 100644 (file)
--- a/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv4.fluorine/location.uri
+++ b/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv4.fluorine/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-l3vpn-mcast:mcast-mpls-labeled-vpn-subsequent-address-family/bgp-l3vpn-mcast:l3vpn-mcast-routes-ipv4
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv4-address-family,bgp-l3vpn-mcast%3Amcast-mpls-labeled-vpn-subsequent-address-family/bgp-l3vpn-mcast:l3vpn-mcast-routes-ipv4

diff --git a/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv4.oxygen/location.uri b/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv4.oxygen/location.uri
index ceff12f0c4de1907e9dbf4a928db4ee29d9bffe2..3a730886201c7aac898e73ef6e92fa64ae9b4d78 100644 (file)
--- a/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv4.oxygen/location.uri
+++ b/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv4.oxygen/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-l3vpn-mcast:mcast-mpls-labeled-vpn-subsequent-address-family/bgp-l3vpn-mcast:l3vpn-mcast-routes-ipv4
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv4-address-family,bgp-l3vpn-mcast%3Amcast-mpls-labeled-vpn-subsequent-address-family/bgp-l3vpn-mcast:l3vpn-mcast-routes-ipv4

diff --git a/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv4/data.json b/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv4/data.json
index 1fdd416137a3a5518f99c436c3c448a433788922..60f98a31737918797b975b92b00ac838795b16b0 100644 (file)
--- a/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv4/data.json
+++ b/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv4/data.json
@@ -1,5 +1,5 @@
 {
-  "tables": [
+  "bgp-rib:tables": [
     {
       "afi": "bgp-types:ipv4-address-family",
       "safi": "bgp-l3vpn-mcast:mcast-mpls-labeled-vpn-subsequent-address-family",

diff --git a/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv4/location.uri b/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv4/location.uri
index ffda217313fb7d6f362a187f3b238efbbc70ab81..88dbc0be128af5efdfec058596c80fb8d4ee9146 100644 (file)
--- a/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv4/location.uri
+++ b/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv4/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-l3vpn-mcast:mcast-mpls-labeled-vpn-subsequent-address-family/
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv4-address-family,bgp-l3vpn-mcast%3Amcast-mpls-labeled-vpn-subsequent-address-family

diff --git a/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv6.fluorine/location.uri b/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv6.fluorine/location.uri
index 2ea86440c1bf7886acd63c63bcfdadf3fe7aa725..bcce75b211ca478fcf62c46810505d3ec525ebb5 100644 (file)
--- a/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv6.fluorine/location.uri
+++ b/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv6.fluorine/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv6-address-family/bgp-l3vpn-mcast:mcast-mpls-labeled-vpn-subsequent-address-family/bgp-l3vpn-mcast:l3vpn-mcast-routes-ipv6
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv6-address-family,bgp-l3vpn-mcast%3Amcast-mpls-labeled-vpn-subsequent-address-family/bgp-l3vpn-mcast:l3vpn-mcast-routes-ipv6

diff --git a/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv6.oxygen/location.uri b/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv6.oxygen/location.uri
index 2ea86440c1bf7886acd63c63bcfdadf3fe7aa725..bcce75b211ca478fcf62c46810505d3ec525ebb5 100644 (file)
--- a/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv6.oxygen/location.uri
+++ b/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv6.oxygen/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv6-address-family/bgp-l3vpn-mcast:mcast-mpls-labeled-vpn-subsequent-address-family/bgp-l3vpn-mcast:l3vpn-mcast-routes-ipv6
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv6-address-family,bgp-l3vpn-mcast%3Amcast-mpls-labeled-vpn-subsequent-address-family/bgp-l3vpn-mcast:l3vpn-mcast-routes-ipv6

diff --git a/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv6/data.json b/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv6/data.json
index 6493c64047e0fde22b8ad9e933b449455f4a4a85..aadd8bb8657210d0175ca075b7ef4fc1ae5c10a3 100644 (file)
--- a/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv6/data.json
+++ b/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv6/data.json
@@ -1,5 +1,5 @@
 {
-  "tables": [
+  "bgp-rib:tables": [
     {
       "afi": "bgp-types:ipv6-address-family",
       "safi": "bgp-l3vpn-mcast:mcast-mpls-labeled-vpn-subsequent-address-family",

diff --git a/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv6/location.uri b/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv6/location.uri
index 665f6766698c49281ea1ede4f1c1d6e424af3882..db48f0e74e46b08f093bcc74d28a9e380845cafb 100644 (file)
--- a/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv6/location.uri
+++ b/csit/variables/bgpfunctional/l3vpn_mcast/empty_routes/ipv6/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv6-address-family/bgp-l3vpn-mcast:mcast-mpls-labeled-vpn-subsequent-address-family/
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv6-address-family,bgp-l3vpn-mcast%3Amcast-mpls-labeled-vpn-subsequent-address-family

diff --git a/csit/variables/bgpfunctional/l3vpn_mcast/l3vpn_mcast/app/location.uri b/csit/variables/bgpfunctional/l3vpn_mcast/l3vpn_mcast/app/location.uri
index 128e8eacf94ecfcb90dd2e9322091672bac9f517..ce57cee80900dc8a4a29476eebe225a7e912ebf0 100644 (file)
--- a/csit/variables/bgpfunctional/l3vpn_mcast/l3vpn_mcast/app/location.uri
+++ b/csit/variables/bgpfunctional/l3vpn_mcast/l3vpn_mcast/app/location.uri
@@ -1 +1 @@
-/restconf/config/bgp-rib:application-rib/$IP/tables/bgp-types:ipv4-address-family/bgp-l3vpn-mcast:mcast-mpls-labeled-vpn-subsequent-address-family/bgp-l3vpn-mcast:l3vpn-mcast-routes-ipv4
+/rests/data/bgp-rib:application-rib=$IP/tables=bgp-types%3Aipv4-address-family,bgp-l3vpn-mcast%3Amcast-mpls-labeled-vpn-subsequent-address-family/bgp-l3vpn-mcast:l3vpn-mcast-routes-ipv4

diff --git a/csit/variables/bgpfunctional/l3vpn_mcast/l3vpn_mcast/rib/location.uri b/csit/variables/bgpfunctional/l3vpn_mcast/l3vpn_mcast/rib/location.uri
index ceff12f0c4de1907e9dbf4a928db4ee29d9bffe2..3a730886201c7aac898e73ef6e92fa64ae9b4d78 100644 (file)
--- a/csit/variables/bgpfunctional/l3vpn_mcast/l3vpn_mcast/rib/location.uri
+++ b/csit/variables/bgpfunctional/l3vpn_mcast/l3vpn_mcast/rib/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-l3vpn-mcast:mcast-mpls-labeled-vpn-subsequent-address-family/bgp-l3vpn-mcast:l3vpn-mcast-routes-ipv4
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv4-address-family,bgp-l3vpn-mcast%3Amcast-mpls-labeled-vpn-subsequent-address-family/bgp-l3vpn-mcast:l3vpn-mcast-routes-ipv4

diff --git a/csit/variables/bgpfunctional/l3vpn_mcast/l3vpn_mcast_ipv6/app/location.uri b/csit/variables/bgpfunctional/l3vpn_mcast/l3vpn_mcast_ipv6/app/location.uri
index ad289a3aa77cdccc68d37771924941dc5c20cf4a..0adc7893c2ca4908513e592b240ac2979a93534f 100644 (file)
--- a/csit/variables/bgpfunctional/l3vpn_mcast/l3vpn_mcast_ipv6/app/location.uri
+++ b/csit/variables/bgpfunctional/l3vpn_mcast/l3vpn_mcast_ipv6/app/location.uri
@@ -1 +1 @@
-/restconf/config/bgp-rib:application-rib/$IP/tables/bgp-types:ipv6-address-family/bgp-l3vpn-mcast:mcast-mpls-labeled-vpn-subsequent-address-family/bgp-l3vpn-mcast:l3vpn-mcast-routes-ipv6
+/rests/data/bgp-rib:application-rib=$IP/tables=bgp-types%3Aipv6-address-family,bgp-l3vpn-mcast%3Amcast-mpls-labeled-vpn-subsequent-address-family/bgp-l3vpn-mcast:l3vpn-mcast-routes-ipv6

diff --git a/csit/variables/bgpfunctional/l3vpn_mcast/l3vpn_mcast_ipv6/rib/location.uri b/csit/variables/bgpfunctional/l3vpn_mcast/l3vpn_mcast_ipv6/rib/location.uri
index 2ea86440c1bf7886acd63c63bcfdadf3fe7aa725..bcce75b211ca478fcf62c46810505d3ec525ebb5 100644 (file)
--- a/csit/variables/bgpfunctional/l3vpn_mcast/l3vpn_mcast_ipv6/rib/location.uri
+++ b/csit/variables/bgpfunctional/l3vpn_mcast/l3vpn_mcast_ipv6/rib/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv6-address-family/bgp-l3vpn-mcast:mcast-mpls-labeled-vpn-subsequent-address-family/bgp-l3vpn-mcast:l3vpn-mcast-routes-ipv6
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv6-address-family,bgp-l3vpn-mcast%3Amcast-mpls-labeled-vpn-subsequent-address-family/bgp-l3vpn-mcast:l3vpn-mcast-routes-ipv6

diff --git a/csit/variables/bgpfunctional/multipaths/bgp_peer/location.uri b/csit/variables/bgpfunctional/multipaths/bgp_peer/location.uri
index d713ddf1ec1b5c4cad75036a6e246354cfc1faae..3b3a11f883e9a40842af36bceb6ce5cab039bf9a 100644 (file)
--- a/csit/variables/bgpfunctional/multipaths/bgp_peer/location.uri
+++ b/csit/variables/bgpfunctional/multipaths/bgp_peer/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpfunctional/multipaths/rib/location.uri b/csit/variables/bgpfunctional/multipaths/rib/location.uri
index e44e67057d1edf70a1c629791293c8e67d5f5191..e760065b97eba2e15587318b6d446ae322616c02 100644 (file)
--- a/csit/variables/bgpfunctional/multipaths/rib/location.uri
+++ b/csit/variables/bgpfunctional/multipaths/rib/location.uri
@@ -1 +1 @@
-/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/example-bgp-rib
+/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,example-bgp-rib

diff --git a/csit/variables/bgpfunctional/multipaths/rib_config/location.uri b/csit/variables/bgpfunctional/multipaths/rib_config/location.uri
new file mode 100644 (file)
index 0000000..2ec5d2c
--- /dev/null
+++ b/csit/variables/bgpfunctional/multipaths/rib_config/location.uri
@@ -0,0 +1 @@
+/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,example-bgp-rib?content=config

diff --git a/csit/variables/bgpfunctional/multipaths/rib_policies/location.uri b/csit/variables/bgpfunctional/multipaths/rib_policies/location.uri
index e44e67057d1edf70a1c629791293c8e67d5f5191..e760065b97eba2e15587318b6d446ae322616c02 100644 (file)
--- a/csit/variables/bgpfunctional/multipaths/rib_policies/location.uri
+++ b/csit/variables/bgpfunctional/multipaths/rib_policies/location.uri
@@ -1 +1 @@
-/restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/example-bgp-rib
+/rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,example-bgp-rib

diff --git a/csit/variables/bgpfunctional/multipaths/route/location.uri b/csit/variables/bgpfunctional/multipaths/route/location.uri
index 778b65c69c78b1e9373ef961180b801a7b0bf183..a58826dc7f9bea59fc628c884976237de2640af1 100644 (file)
--- a/csit/variables/bgpfunctional/multipaths/route/location.uri
+++ b/csit/variables/bgpfunctional/multipaths/route/location.uri
@@ -1 +1 @@
-/restconf/config/bgp-rib:application-rib/$APP_RIB/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes/
+/rests/data/bgp-rib:application-rib=$APP_RIB/tables=bgp-types%3Aipv4-address-family,bgp-types%3Aunicast-subsequent-address-family/bgp-inet:ipv4-routes

diff --git a/csit/variables/bgpfunctional/mvpn/app_peer/location.uri b/csit/variables/bgpfunctional/mvpn/app_peer/location.uri
index 2e9bef729577a72e45906d65379b937eb44bcc21..a64f3658c46198469a14b33f9cf5c990ae64018b 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/app_peer/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/app_peer/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpfunctional/mvpn/bgp_peer/location.uri b/csit/variables/bgpfunctional/mvpn/bgp_peer/location.uri
index 2e9bef729577a72e45906d65379b937eb44bcc21..a64f3658c46198469a14b33f9cf5c990ae64018b 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/bgp_peer/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/bgp_peer/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpfunctional/mvpn/empty_routes/ipv4.fluorine/location.uri b/csit/variables/bgpfunctional/mvpn/empty_routes/ipv4.fluorine/location.uri
index 1256403496e017b7d6597cabf267dd90c0f4b6d5..721b2919ca0c9d257f92ea412f1b6fe0b6cb3166 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/empty_routes/ipv4.fluorine/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/empty_routes/ipv4.fluorine/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv4-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4

diff --git a/csit/variables/bgpfunctional/mvpn/empty_routes/ipv4.oxygen/data.json b/csit/variables/bgpfunctional/mvpn/empty_routes/ipv4.oxygen/data.json
deleted file mode 100644 (file)
index da9e2d3..0000000
--- a/csit/variables/bgpfunctional/mvpn/empty_routes/ipv4.oxygen/data.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "bgp-mvpn-ipv4:mvpn-routes-ipv4": {}
-}

diff --git a/csit/variables/bgpfunctional/mvpn/empty_routes/ipv4.oxygen/location.uri b/csit/variables/bgpfunctional/mvpn/empty_routes/ipv4.oxygen/location.uri
deleted file mode 100644 (file)
index 1256403..0000000
--- a/csit/variables/bgpfunctional/mvpn/empty_routes/ipv4.oxygen/location.uri
+++ /dev/null
@@ -1 +0,0 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4

diff --git a/csit/variables/bgpfunctional/mvpn/empty_routes/ipv4/data.json b/csit/variables/bgpfunctional/mvpn/empty_routes/ipv4/data.json
index e1f398ff049b12fe28903898624c9c84d24eb5a5..b420c566351d5897cedb818be304180c5e4f6171 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/empty_routes/ipv4/data.json
+++ b/csit/variables/bgpfunctional/mvpn/empty_routes/ipv4/data.json
@@ -1,5 +1,5 @@
 {
-  "tables": [
+  "bgp-rib:tables": [
     {
       "afi": "bgp-types:ipv4-address-family",
       "safi": "bgp-mvpn:mcast-vpn-subsequent-address-family",

diff --git a/csit/variables/bgpfunctional/mvpn/empty_routes/ipv4/location.uri b/csit/variables/bgpfunctional/mvpn/empty_routes/ipv4/location.uri
index e3733d69e0cfb5d3f999202c0299a8e56016aa6a..2bccb1a001907a74aa8900aa746715ec2d15a6e9 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/empty_routes/ipv4/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/empty_routes/ipv4/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv4-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family

diff --git a/csit/variables/bgpfunctional/mvpn/empty_routes/ipv6.fluorine/location.uri b/csit/variables/bgpfunctional/mvpn/empty_routes/ipv6.fluorine/location.uri
index 99626a41854f224a470ebde8fc8f8b1ea24e7716..b4e5b4eb52533b3f96e553ec07eb5178cb5701c6 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/empty_routes/ipv6.fluorine/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/empty_routes/ipv6.fluorine/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv6-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv6:mvpn-routes-ipv6
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv6-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family/bgp-mvpn-ipv6:mvpn-routes-ipv6

diff --git a/csit/variables/bgpfunctional/mvpn/empty_routes/ipv6.oxygen/data.json b/csit/variables/bgpfunctional/mvpn/empty_routes/ipv6.oxygen/data.json
deleted file mode 100644 (file)
index 21650b8..0000000
--- a/csit/variables/bgpfunctional/mvpn/empty_routes/ipv6.oxygen/data.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "bgp-mvpn-ipv6:mvpn-routes-ipv6": {}
-}

diff --git a/csit/variables/bgpfunctional/mvpn/empty_routes/ipv6.oxygen/location.uri b/csit/variables/bgpfunctional/mvpn/empty_routes/ipv6.oxygen/location.uri
deleted file mode 100644 (file)
index 99626a4..0000000
--- a/csit/variables/bgpfunctional/mvpn/empty_routes/ipv6.oxygen/location.uri
+++ /dev/null
@@ -1 +0,0 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv6-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv6:mvpn-routes-ipv6

diff --git a/csit/variables/bgpfunctional/mvpn/empty_routes/ipv6/data.json b/csit/variables/bgpfunctional/mvpn/empty_routes/ipv6/data.json
index 1a9eacb23d7825309af9ae4eaadcb09d60285c45..a7b44b4bd589f739535f4ed33a59bdf9ea28e1e1 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/empty_routes/ipv6/data.json
+++ b/csit/variables/bgpfunctional/mvpn/empty_routes/ipv6/data.json
@@ -1,5 +1,5 @@
 {
-  "tables": [
+  "bgp-rib:tables": [
     {
       "afi": "bgp-types:ipv6-address-family",
       "safi": "bgp-mvpn:mcast-vpn-subsequent-address-family",

diff --git a/csit/variables/bgpfunctional/mvpn/empty_routes/ipv6/location.uri b/csit/variables/bgpfunctional/mvpn/empty_routes/ipv6/location.uri
index 5eb1166952cfa9ff7170594e691c442bea227fdf..56c398872cc4f3c8cb99d8bfbedb3adefd296916 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/empty_routes/ipv6/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/empty_routes/ipv6/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv6-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv6-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family

diff --git a/csit/variables/bgpfunctional/mvpn/inter_as_ipmsi_ad/app/location.uri b/csit/variables/bgpfunctional/mvpn/inter_as_ipmsi_ad/app/location.uri
index df3068157ced106561e9d95c547ea9d551047dba..bd0408f4147a2535804ff4a47279e5d676fd3c22 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/inter_as_ipmsi_ad/app/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/inter_as_ipmsi_ad/app/location.uri
@@ -1 +1 @@
-/restconf/config/bgp-rib:application-rib/$IP/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4
+/rests/data/bgp-rib:application-rib=$IP/tables=bgp-types%3Aipv4-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4

diff --git a/csit/variables/bgpfunctional/mvpn/inter_as_ipmsi_ad/rib/location.uri b/csit/variables/bgpfunctional/mvpn/inter_as_ipmsi_ad/rib/location.uri
index 1256403496e017b7d6597cabf267dd90c0f4b6d5..721b2919ca0c9d257f92ea412f1b6fe0b6cb3166 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/inter_as_ipmsi_ad/rib/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/inter_as_ipmsi_ad/rib/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv4-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4

diff --git a/csit/variables/bgpfunctional/mvpn/intra_as_ipmsi_ad/app/location.uri b/csit/variables/bgpfunctional/mvpn/intra_as_ipmsi_ad/app/location.uri
index df3068157ced106561e9d95c547ea9d551047dba..bd0408f4147a2535804ff4a47279e5d676fd3c22 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/intra_as_ipmsi_ad/app/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/intra_as_ipmsi_ad/app/location.uri
@@ -1 +1 @@
-/restconf/config/bgp-rib:application-rib/$IP/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4
+/rests/data/bgp-rib:application-rib=$IP/tables=bgp-types%3Aipv4-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4

diff --git a/csit/variables/bgpfunctional/mvpn/intra_as_ipmsi_ad/rib/location.uri b/csit/variables/bgpfunctional/mvpn/intra_as_ipmsi_ad/rib/location.uri
index 1256403496e017b7d6597cabf267dd90c0f4b6d5..721b2919ca0c9d257f92ea412f1b6fe0b6cb3166 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/intra_as_ipmsi_ad/rib/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/intra_as_ipmsi_ad/rib/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv4-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4

diff --git a/csit/variables/bgpfunctional/mvpn/intra_ipv6/app/location.uri b/csit/variables/bgpfunctional/mvpn/intra_ipv6/app/location.uri
index 8d637372ddd66cb471e04ca8870e2e172a84455b..7ba971530528d3c7a7debb3190196741d5c10900 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/intra_ipv6/app/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/intra_ipv6/app/location.uri
@@ -1 +1 @@
-/restconf/config/bgp-rib:application-rib/$IP/tables/bgp-types:ipv6-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv6:mvpn-routes-ipv6
+/rests/data/bgp-rib:application-rib=$IP/tables=bgp-types%3Aipv6-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family/bgp-mvpn-ipv6:mvpn-routes-ipv6

diff --git a/csit/variables/bgpfunctional/mvpn/intra_ipv6/rib/location.uri b/csit/variables/bgpfunctional/mvpn/intra_ipv6/rib/location.uri
index 99626a41854f224a470ebde8fc8f8b1ea24e7716..b4e5b4eb52533b3f96e553ec07eb5178cb5701c6 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/intra_ipv6/rib/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/intra_ipv6/rib/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv6-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv6:mvpn-routes-ipv6
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv6-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family/bgp-mvpn-ipv6:mvpn-routes-ipv6

diff --git a/csit/variables/bgpfunctional/mvpn/intra_pe_distinguisher/app/location.uri b/csit/variables/bgpfunctional/mvpn/intra_pe_distinguisher/app/location.uri
index df3068157ced106561e9d95c547ea9d551047dba..bd0408f4147a2535804ff4a47279e5d676fd3c22 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/intra_pe_distinguisher/app/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/intra_pe_distinguisher/app/location.uri
@@ -1 +1 @@
-/restconf/config/bgp-rib:application-rib/$IP/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4
+/rests/data/bgp-rib:application-rib=$IP/tables=bgp-types%3Aipv4-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4

diff --git a/csit/variables/bgpfunctional/mvpn/intra_pe_distinguisher/rib/location.uri b/csit/variables/bgpfunctional/mvpn/intra_pe_distinguisher/rib/location.uri
index 1256403496e017b7d6597cabf267dd90c0f4b6d5..721b2919ca0c9d257f92ea412f1b6fe0b6cb3166 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/intra_pe_distinguisher/rib/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/intra_pe_distinguisher/rib/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv4-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4

diff --git a/csit/variables/bgpfunctional/mvpn/intra_source_as/app/location.uri b/csit/variables/bgpfunctional/mvpn/intra_source_as/app/location.uri
index df3068157ced106561e9d95c547ea9d551047dba..bd0408f4147a2535804ff4a47279e5d676fd3c22 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/intra_source_as/app/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/intra_source_as/app/location.uri
@@ -1 +1 @@
-/restconf/config/bgp-rib:application-rib/$IP/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4
+/rests/data/bgp-rib:application-rib=$IP/tables=bgp-types%3Aipv4-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4

diff --git a/csit/variables/bgpfunctional/mvpn/intra_source_as/rib/location.uri b/csit/variables/bgpfunctional/mvpn/intra_source_as/rib/location.uri
index 1256403496e017b7d6597cabf267dd90c0f4b6d5..721b2919ca0c9d257f92ea412f1b6fe0b6cb3166 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/intra_source_as/rib/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/intra_source_as/rib/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv4-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4

diff --git a/csit/variables/bgpfunctional/mvpn/intra_source_as_4/app/location.uri b/csit/variables/bgpfunctional/mvpn/intra_source_as_4/app/location.uri
index df3068157ced106561e9d95c547ea9d551047dba..bd0408f4147a2535804ff4a47279e5d676fd3c22 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/intra_source_as_4/app/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/intra_source_as_4/app/location.uri
@@ -1 +1 @@
-/restconf/config/bgp-rib:application-rib/$IP/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4
+/rests/data/bgp-rib:application-rib=$IP/tables=bgp-types%3Aipv4-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4

diff --git a/csit/variables/bgpfunctional/mvpn/intra_source_as_4/rib/location.uri b/csit/variables/bgpfunctional/mvpn/intra_source_as_4/rib/location.uri
index 1256403496e017b7d6597cabf267dd90c0f4b6d5..721b2919ca0c9d257f92ea412f1b6fe0b6cb3166 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/intra_source_as_4/rib/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/intra_source_as_4/rib/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv4-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4

diff --git a/csit/variables/bgpfunctional/mvpn/intra_vrf/app/location.uri b/csit/variables/bgpfunctional/mvpn/intra_vrf/app/location.uri
index df3068157ced106561e9d95c547ea9d551047dba..bd0408f4147a2535804ff4a47279e5d676fd3c22 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/intra_vrf/app/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/intra_vrf/app/location.uri
@@ -1 +1 @@
-/restconf/config/bgp-rib:application-rib/$IP/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4
+/rests/data/bgp-rib:application-rib=$IP/tables=bgp-types%3Aipv4-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4

diff --git a/csit/variables/bgpfunctional/mvpn/intra_vrf/rib/location.uri b/csit/variables/bgpfunctional/mvpn/intra_vrf/rib/location.uri
index 1256403496e017b7d6597cabf267dd90c0f4b6d5..721b2919ca0c9d257f92ea412f1b6fe0b6cb3166 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/intra_vrf/rib/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/intra_vrf/rib/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv4-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4

diff --git a/csit/variables/bgpfunctional/mvpn/leaf_ad/app/location.uri b/csit/variables/bgpfunctional/mvpn/leaf_ad/app/location.uri
index df3068157ced106561e9d95c547ea9d551047dba..bd0408f4147a2535804ff4a47279e5d676fd3c22 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/leaf_ad/app/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/leaf_ad/app/location.uri
@@ -1 +1 @@
-/restconf/config/bgp-rib:application-rib/$IP/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4
+/rests/data/bgp-rib:application-rib=$IP/tables=bgp-types%3Aipv4-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4

diff --git a/csit/variables/bgpfunctional/mvpn/leaf_ad/rib/location.uri b/csit/variables/bgpfunctional/mvpn/leaf_ad/rib/location.uri
index 1256403496e017b7d6597cabf267dd90c0f4b6d5..721b2919ca0c9d257f92ea412f1b6fe0b6cb3166 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/leaf_ad/rib/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/leaf_ad/rib/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv4-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4

diff --git a/csit/variables/bgpfunctional/mvpn/shared_tree_join/app/location.uri b/csit/variables/bgpfunctional/mvpn/shared_tree_join/app/location.uri
index df3068157ced106561e9d95c547ea9d551047dba..bd0408f4147a2535804ff4a47279e5d676fd3c22 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/shared_tree_join/app/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/shared_tree_join/app/location.uri
@@ -1 +1 @@
-/restconf/config/bgp-rib:application-rib/$IP/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4
+/rests/data/bgp-rib:application-rib=$IP/tables=bgp-types%3Aipv4-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4

diff --git a/csit/variables/bgpfunctional/mvpn/shared_tree_join/rib/location.uri b/csit/variables/bgpfunctional/mvpn/shared_tree_join/rib/location.uri
index 1256403496e017b7d6597cabf267dd90c0f4b6d5..721b2919ca0c9d257f92ea412f1b6fe0b6cb3166 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/shared_tree_join/rib/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/shared_tree_join/rib/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv4-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4

diff --git a/csit/variables/bgpfunctional/mvpn/source_active_ad/app/location.uri b/csit/variables/bgpfunctional/mvpn/source_active_ad/app/location.uri
index df3068157ced106561e9d95c547ea9d551047dba..bd0408f4147a2535804ff4a47279e5d676fd3c22 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/source_active_ad/app/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/source_active_ad/app/location.uri
@@ -1 +1 @@
-/restconf/config/bgp-rib:application-rib/$IP/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4
+/rests/data/bgp-rib:application-rib=$IP/tables=bgp-types%3Aipv4-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4

diff --git a/csit/variables/bgpfunctional/mvpn/source_active_ad/rib/location.uri b/csit/variables/bgpfunctional/mvpn/source_active_ad/rib/location.uri
index 1256403496e017b7d6597cabf267dd90c0f4b6d5..721b2919ca0c9d257f92ea412f1b6fe0b6cb3166 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/source_active_ad/rib/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/source_active_ad/rib/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv4-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4

diff --git a/csit/variables/bgpfunctional/mvpn/source_tree_join/app/location.uri b/csit/variables/bgpfunctional/mvpn/source_tree_join/app/location.uri
index df3068157ced106561e9d95c547ea9d551047dba..bd0408f4147a2535804ff4a47279e5d676fd3c22 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/source_tree_join/app/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/source_tree_join/app/location.uri
@@ -1 +1 @@
-/restconf/config/bgp-rib:application-rib/$IP/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4
+/rests/data/bgp-rib:application-rib=$IP/tables=bgp-types%3Aipv4-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4

diff --git a/csit/variables/bgpfunctional/mvpn/source_tree_join/rib/location.uri b/csit/variables/bgpfunctional/mvpn/source_tree_join/rib/location.uri
index 1256403496e017b7d6597cabf267dd90c0f4b6d5..721b2919ca0c9d257f92ea412f1b6fe0b6cb3166 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/source_tree_join/rib/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/source_tree_join/rib/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv4-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4

diff --git a/csit/variables/bgpfunctional/mvpn/spmsi_ad/app/location.uri b/csit/variables/bgpfunctional/mvpn/spmsi_ad/app/location.uri
index df3068157ced106561e9d95c547ea9d551047dba..bd0408f4147a2535804ff4a47279e5d676fd3c22 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/spmsi_ad/app/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/spmsi_ad/app/location.uri
@@ -1 +1 @@
-/restconf/config/bgp-rib:application-rib/$IP/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4
+/rests/data/bgp-rib:application-rib=$IP/tables=bgp-types%3Aipv4-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4

diff --git a/csit/variables/bgpfunctional/mvpn/spmsi_ad/rib/location.uri b/csit/variables/bgpfunctional/mvpn/spmsi_ad/rib/location.uri
index 1256403496e017b7d6597cabf267dd90c0f4b6d5..721b2919ca0c9d257f92ea412f1b6fe0b6cb3166 100644 (file)
--- a/csit/variables/bgpfunctional/mvpn/spmsi_ad/rib/location.uri
+++ b/csit/variables/bgpfunctional/mvpn/spmsi_ad/rib/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-mvpn:mcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv4-address-family,bgp-mvpn%3Amcast-vpn-subsequent-address-family/bgp-mvpn-ipv4:mvpn-routes-ipv4

diff --git a/csit/variables/bgpfunctional/openconfig_peer_delete/location.uri b/csit/variables/bgpfunctional/openconfig_peer_delete/location.uri
index 12be97a98a535f28bd283e41ee6e3891ed7aa671..0442ab82eee36faabd132048ae1c2e1775116782 100644 (file)
--- a/csit/variables/bgpfunctional/openconfig_peer_delete/location.uri
+++ b/csit/variables/bgpfunctional/openconfig_peer_delete/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB/bgp/neighbors/neighbors
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB/bgp-openconfig-extensions:bgp/neighbors/neighbors

diff --git a/csit/variables/bgpfunctional/route_refresh/location.uri b/csit/variables/bgpfunctional/route_refresh/location.uri
index 1ee5ce2270305d7ccee2d2e299969fba7ed9c895..e7e3b0fb205cb6aa9ef5d88c88d5264a5a419967 100644 (file)
--- a/csit/variables/bgpfunctional/route_refresh/location.uri
+++ b/csit/variables/bgpfunctional/route_refresh/location.uri
@@ -1 +1 @@
-/restconf/operations/bgp-peer-rpc:route-refresh-request
+/rests/operations/bgp-peer-rpc:route-refresh-request

diff --git a/csit/variables/bgpfunctional/route_refresh/operational_state/data.json b/csit/variables/bgpfunctional/route_refresh/operational_state/data.json
index b392cb7ccd336e60491841120211a0fb0c71cf53..9d0b8949b9c8766840fc547cb7996cb5a6175c7b 100644 (file)
--- a/csit/variables/bgpfunctional/route_refresh/operational_state/data.json
+++ b/csit/variables/bgpfunctional/route_refresh/operational_state/data.json
@@ -2,12 +2,12 @@
     "bgp-openconfig-extensions:state": {
         "messages": {
             "received": {
-                "NOTIFICATION": $NOT_COUNT,
-                "UPDATE": $RECV_COUNT
+                "NOTIFICATION": "$NOT_COUNT",
+                "UPDATE": "$RECV_COUNT"
             },
             "sent": {
-                "NOTIFICATION": 0,
-                "UPDATE": $SEND_COUNT
+                "NOTIFICATION": "0",
+                "UPDATE": "$SEND_COUNT"
             }
         },
         "session-state": "ESTABLISHED",

diff --git a/csit/variables/bgpfunctional/route_refresh/operational_state/location.uri b/csit/variables/bgpfunctional/route_refresh/operational_state/location.uri
index f4c1c29ce4cb13c971acb6665b922294a1d9e8da..34174155993dad53cb95b4fa0ba2b7ddc94becec 100644 (file)
--- a/csit/variables/bgpfunctional/route_refresh/operational_state/location.uri
+++ b/csit/variables/bgpfunctional/route_refresh/operational_state/location.uri
@@ -1 +1 @@
-restconf/operational/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$RIB_INSTANCE_NAME/bgp/neighbors/neighbor/$IP/state
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$RIB_INSTANCE_NAME/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP/state

diff --git a/csit/variables/bgpfunctional/route_refresh/route.oxygen/location.uri b/csit/variables/bgpfunctional/route_refresh/route.oxygen/location.uri
deleted file mode 100644 (file)
index 778b65c..0000000
--- a/csit/variables/bgpfunctional/route_refresh/route.oxygen/location.uri
+++ /dev/null
@@ -1 +0,0 @@
-/restconf/config/bgp-rib:application-rib/$APP_RIB/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes/

diff --git a/csit/variables/bgpfunctional/route_refresh/route.oxygen/post_data.xml b/csit/variables/bgpfunctional/route_refresh/route.oxygen/post_data.xml
deleted file mode 100644 (file)
index e42c260..0000000
--- a/csit/variables/bgpfunctional/route_refresh/route.oxygen/post_data.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-  <ipv4-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-inet">
-   <prefix>$PREFIX</prefix>
-   <path-id>0</path-id>
-   <attributes>
-    <ipv4-next-hop>
-     <global>199.20.160.41</global>
-    </ipv4-next-hop>
-    <as-path/>
-    <multi-exit-disc>
-     <med>0</med>
-    </multi-exit-disc>
-    <local-pref>
-     <pref>100</pref>
-    </local-pref>
-    <originator-id>
-     <originator>41.41.41.41</originator>
-    </originator-id>
-    <origin>
-     <value>igp</value>
-    </origin>
-    <cluster-id>
-     <cluster>40.40.40.40</cluster>
-    </cluster-id>
-   </attributes>
-  </ipv4-route>

diff --git a/csit/variables/bgpfunctional/route_refresh/route/location.uri b/csit/variables/bgpfunctional/route_refresh/route/location.uri
index 778b65c69c78b1e9373ef961180b801a7b0bf183..6304e3a69974ea7037acdc7eb25bd98af3e22369 100644 (file)
--- a/csit/variables/bgpfunctional/route_refresh/route/location.uri
+++ b/csit/variables/bgpfunctional/route_refresh/route/location.uri
@@ -1 +1,2 @@
-/restconf/config/bgp-rib:application-rib/$APP_RIB/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes/
+/rests/data/bgp-rib:application-rib=$APP_RIB/tables=bgp-types%3Aipv4-address-family,bgp-types%3Aunicast-subsequent-address-family/bgp-inet:ipv4-routes
+

diff --git a/csit/variables/bgpfunctional/rt_constrain/app_peer/location.uri b/csit/variables/bgpfunctional/rt_constrain/app_peer/location.uri
index 2e9bef729577a72e45906d65379b937eb44bcc21..a64f3658c46198469a14b33f9cf5c990ae64018b 100644 (file)
--- a/csit/variables/bgpfunctional/rt_constrain/app_peer/location.uri
+++ b/csit/variables/bgpfunctional/rt_constrain/app_peer/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpfunctional/rt_constrain/bgp_peer/location.uri b/csit/variables/bgpfunctional/rt_constrain/bgp_peer/location.uri
index 2e9bef729577a72e45906d65379b937eb44bcc21..a64f3658c46198469a14b33f9cf5c990ae64018b 100644 (file)
--- a/csit/variables/bgpfunctional/rt_constrain/bgp_peer/location.uri
+++ b/csit/variables/bgpfunctional/rt_constrain/bgp_peer/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpfunctional/rt_constrain/empty_l3vpn/location.uri b/csit/variables/bgpfunctional/rt_constrain/empty_l3vpn/location.uri
index 08fb5603d5854418fa1648a6a48cb94a0d092b39..6441da53654e1e748c6a348fccc77c359b5dd3cd 100644 (file)
--- a/csit/variables/bgpfunctional/rt_constrain/empty_l3vpn/location.uri
+++ b/csit/variables/bgpfunctional/rt_constrain/empty_l3vpn/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-types:mpls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv4-address-family,bgp-types%3Ampls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes

diff --git a/csit/variables/bgpfunctional/rt_constrain/empty_route/data.json b/csit/variables/bgpfunctional/rt_constrain/empty_route/data.json
index 3566ea931f8120ef8cd45a63b8a8ab1b81631372..a0c23c6d2d0893bcf45cf2851f6725f4cf7ff7dd 100644 (file)
--- a/csit/variables/bgpfunctional/rt_constrain/empty_route/data.json
+++ b/csit/variables/bgpfunctional/rt_constrain/empty_route/data.json
@@ -1,5 +1,5 @@
 {
-    "tables": [
+    "bgp-rib:tables": [
         {
             "afi": "bgp-types:ipv4-address-family",
             "safi": "bgp-types:mpls-labeled-vpn-subsequent-address-family",

diff --git a/csit/variables/bgpfunctional/rt_constrain/empty_route/location.uri b/csit/variables/bgpfunctional/rt_constrain/empty_route/location.uri
index 08fb5603d5854418fa1648a6a48cb94a0d092b39..6441da53654e1e748c6a348fccc77c359b5dd3cd 100644 (file)
--- a/csit/variables/bgpfunctional/rt_constrain/empty_route/location.uri
+++ b/csit/variables/bgpfunctional/rt_constrain/empty_route/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-types:mpls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv4-address-family,bgp-types%3Ampls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes

diff --git a/csit/variables/bgpfunctional/rt_constrain/empty_routes/ipv4.fluorine/data.json b/csit/variables/bgpfunctional/rt_constrain/empty_routes/ipv4.fluorine/data.json
deleted file mode 100644 (file)
index 6ca559a..0000000
--- a/csit/variables/bgpfunctional/rt_constrain/empty_routes/ipv4.fluorine/data.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "bgp-route-target-constrain:route-target-constrain-routes": {}
-}

diff --git a/csit/variables/bgpfunctional/rt_constrain/empty_routes/ipv4.fluorine/location.uri b/csit/variables/bgpfunctional/rt_constrain/empty_routes/ipv4.fluorine/location.uri
deleted file mode 100644 (file)
index 6dbb985..0000000
--- a/csit/variables/bgpfunctional/rt_constrain/empty_routes/ipv4.fluorine/location.uri
+++ /dev/null
@@ -1 +0,0 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-route-target-constrain:route-target-constrain-subsequent-address-family/bgp-route-target-constrain:route-target-constrain-routes

diff --git a/csit/variables/bgpfunctional/rt_constrain/empty_routes/ipv4.oxygen/data.json b/csit/variables/bgpfunctional/rt_constrain/empty_routes/ipv4.oxygen/data.json
deleted file mode 100644 (file)
index 6ca559a..0000000
--- a/csit/variables/bgpfunctional/rt_constrain/empty_routes/ipv4.oxygen/data.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "bgp-route-target-constrain:route-target-constrain-routes": {}
-}

diff --git a/csit/variables/bgpfunctional/rt_constrain/empty_routes/ipv4.oxygen/location.uri b/csit/variables/bgpfunctional/rt_constrain/empty_routes/ipv4.oxygen/location.uri
deleted file mode 100644 (file)
index 6dbb985..0000000
--- a/csit/variables/bgpfunctional/rt_constrain/empty_routes/ipv4.oxygen/location.uri
+++ /dev/null
@@ -1 +0,0 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-route-target-constrain:route-target-constrain-subsequent-address-family/bgp-route-target-constrain:route-target-constrain-routes

diff --git a/csit/variables/bgpfunctional/rt_constrain/empty_routes/ipv4/data.json b/csit/variables/bgpfunctional/rt_constrain/empty_routes/ipv4/data.json
index 9dec9e972d75b3ccbb4b7e226791fe4de3f8daa6..126e82fb48829beae88377c762ee9ebd34d39783 100644 (file)
--- a/csit/variables/bgpfunctional/rt_constrain/empty_routes/ipv4/data.json
+++ b/csit/variables/bgpfunctional/rt_constrain/empty_routes/ipv4/data.json
@@ -1,5 +1,5 @@
 {
-  "tables": [
+  "bgp-rib:tables": [
     {
       "afi": "bgp-types:ipv4-address-family",
       "safi": "bgp-route-target-constrain:route-target-constrain-subsequent-address-family",

diff --git a/csit/variables/bgpfunctional/rt_constrain/empty_routes/ipv4/location.uri b/csit/variables/bgpfunctional/rt_constrain/empty_routes/ipv4/location.uri
index f6e4d665efa500153cf108b8e17e6d4467430bb4..3b37d05f6eae8a70ec0854c418ac8387cd9bd0a1 100644 (file)
--- a/csit/variables/bgpfunctional/rt_constrain/empty_routes/ipv4/location.uri
+++ b/csit/variables/bgpfunctional/rt_constrain/empty_routes/ipv4/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-route-target-constrain:route-target-constrain-subsequent-address-family/
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv4-address-family,bgp-route-target-constrain%3Aroute-target-constrain-subsequent-address-family

diff --git a/csit/variables/bgpfunctional/rt_constrain/ext_l3vpn_rt_arg/rib/location.uri b/csit/variables/bgpfunctional/rt_constrain/ext_l3vpn_rt_arg/rib/location.uri
index 08fb5603d5854418fa1648a6a48cb94a0d092b39..6441da53654e1e748c6a348fccc77c359b5dd3cd 100644 (file)
--- a/csit/variables/bgpfunctional/rt_constrain/ext_l3vpn_rt_arg/rib/location.uri
+++ b/csit/variables/bgpfunctional/rt_constrain/ext_l3vpn_rt_arg/rib/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-types:mpls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv4-address-family,bgp-types%3Ampls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes

diff --git a/csit/variables/bgpfunctional/rt_constrain/l3vpn_rt_arg/app/location.uri b/csit/variables/bgpfunctional/rt_constrain/l3vpn_rt_arg/app/location.uri
index 77394ca8e6eba5f1ff8202b89517ba656837d888..0ea3dda10b554170e73036ef06d869ae96e8096b 100644 (file)
--- a/csit/variables/bgpfunctional/rt_constrain/l3vpn_rt_arg/app/location.uri
+++ b/csit/variables/bgpfunctional/rt_constrain/l3vpn_rt_arg/app/location.uri
@@ -1 +1 @@
-/restconf/config/bgp-rib:application-rib/$IP/tables/bgp-types:ipv4-address-family/bgp-types:mpls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes
+/rests/data/bgp-rib:application-rib=$IP/tables=bgp-types%3Aipv4-address-family,bgp-types%3Ampls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes

diff --git a/csit/variables/bgpfunctional/rt_constrain/l3vpn_rt_arg/rib/location.uri b/csit/variables/bgpfunctional/rt_constrain/l3vpn_rt_arg/rib/location.uri
index 08fb5603d5854418fa1648a6a48cb94a0d092b39..6441da53654e1e748c6a348fccc77c359b5dd3cd 100644 (file)
--- a/csit/variables/bgpfunctional/rt_constrain/l3vpn_rt_arg/rib/location.uri
+++ b/csit/variables/bgpfunctional/rt_constrain/l3vpn_rt_arg/rib/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-types:mpls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv4-address-family,bgp-types%3Ampls-labeled-vpn-subsequent-address-family/bgp-vpn-ipv4:vpn-ipv4-routes

diff --git a/csit/variables/bgpfunctional/rt_constrain/rt_constrain_default/app/location.uri b/csit/variables/bgpfunctional/rt_constrain/rt_constrain_default/app/location.uri
index 4d626ff7c0bf8be3f07a3a43a2b25c5388dfe4ee..beebd671186f03cc59c6c7c8a9c493b607acffc9 100644 (file)
--- a/csit/variables/bgpfunctional/rt_constrain/rt_constrain_default/app/location.uri
+++ b/csit/variables/bgpfunctional/rt_constrain/rt_constrain_default/app/location.uri
@@ -1 +1 @@
-/restconf/config/bgp-rib:application-rib/$IP/tables/bgp-types:ipv4-address-family/bgp-route-target-constrain:route-target-constrain-subsequent-address-family/bgp-route-target-constrain:route-target-constrain-routes
+/rests/data/bgp-rib:application-rib=$IP/tables=bgp-types%3Aipv4-address-family,bgp-route-target-constrain%3Aroute-target-constrain-subsequent-address-family/bgp-route-target-constrain:route-target-constrain-routes

diff --git a/csit/variables/bgpfunctional/rt_constrain/rt_constrain_default/rib/location.uri b/csit/variables/bgpfunctional/rt_constrain/rt_constrain_default/rib/location.uri
index 6dbb9858713bf51b3447d117d54d9b0473541da6..c839e87c905948339dd127ba2cb2dcd9a379e91a 100644 (file)
--- a/csit/variables/bgpfunctional/rt_constrain/rt_constrain_default/rib/location.uri
+++ b/csit/variables/bgpfunctional/rt_constrain/rt_constrain_default/rib/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-route-target-constrain:route-target-constrain-subsequent-address-family/bgp-route-target-constrain:route-target-constrain-routes
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv4-address-family,bgp-route-target-constrain%3Aroute-target-constrain-subsequent-address-family/bgp-route-target-constrain:route-target-constrain-routes

diff --git a/csit/variables/bgpfunctional/rt_constrain/rt_constrain_type_0/app/location.uri b/csit/variables/bgpfunctional/rt_constrain/rt_constrain_type_0/app/location.uri
index 4d626ff7c0bf8be3f07a3a43a2b25c5388dfe4ee..beebd671186f03cc59c6c7c8a9c493b607acffc9 100644 (file)
--- a/csit/variables/bgpfunctional/rt_constrain/rt_constrain_type_0/app/location.uri
+++ b/csit/variables/bgpfunctional/rt_constrain/rt_constrain_type_0/app/location.uri
@@ -1 +1 @@
-/restconf/config/bgp-rib:application-rib/$IP/tables/bgp-types:ipv4-address-family/bgp-route-target-constrain:route-target-constrain-subsequent-address-family/bgp-route-target-constrain:route-target-constrain-routes
+/rests/data/bgp-rib:application-rib=$IP/tables=bgp-types%3Aipv4-address-family,bgp-route-target-constrain%3Aroute-target-constrain-subsequent-address-family/bgp-route-target-constrain:route-target-constrain-routes

diff --git a/csit/variables/bgpfunctional/rt_constrain/rt_constrain_type_0/rib/location.uri b/csit/variables/bgpfunctional/rt_constrain/rt_constrain_type_0/rib/location.uri
index 6dbb9858713bf51b3447d117d54d9b0473541da6..c839e87c905948339dd127ba2cb2dcd9a379e91a 100644 (file)
--- a/csit/variables/bgpfunctional/rt_constrain/rt_constrain_type_0/rib/location.uri
+++ b/csit/variables/bgpfunctional/rt_constrain/rt_constrain_type_0/rib/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-route-target-constrain:route-target-constrain-subsequent-address-family/bgp-route-target-constrain:route-target-constrain-routes
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv4-address-family,bgp-route-target-constrain%3Aroute-target-constrain-subsequent-address-family/bgp-route-target-constrain:route-target-constrain-routes

diff --git a/csit/variables/bgpfunctional/rt_constrain/rt_constrain_type_1/app/location.uri b/csit/variables/bgpfunctional/rt_constrain/rt_constrain_type_1/app/location.uri
index 4d626ff7c0bf8be3f07a3a43a2b25c5388dfe4ee..beebd671186f03cc59c6c7c8a9c493b607acffc9 100644 (file)
--- a/csit/variables/bgpfunctional/rt_constrain/rt_constrain_type_1/app/location.uri
+++ b/csit/variables/bgpfunctional/rt_constrain/rt_constrain_type_1/app/location.uri
@@ -1 +1 @@
-/restconf/config/bgp-rib:application-rib/$IP/tables/bgp-types:ipv4-address-family/bgp-route-target-constrain:route-target-constrain-subsequent-address-family/bgp-route-target-constrain:route-target-constrain-routes
+/rests/data/bgp-rib:application-rib=$IP/tables=bgp-types%3Aipv4-address-family,bgp-route-target-constrain%3Aroute-target-constrain-subsequent-address-family/bgp-route-target-constrain:route-target-constrain-routes

diff --git a/csit/variables/bgpfunctional/rt_constrain/rt_constrain_type_1/rib/location.uri b/csit/variables/bgpfunctional/rt_constrain/rt_constrain_type_1/rib/location.uri
index 6dbb9858713bf51b3447d117d54d9b0473541da6..c839e87c905948339dd127ba2cb2dcd9a379e91a 100644 (file)
--- a/csit/variables/bgpfunctional/rt_constrain/rt_constrain_type_1/rib/location.uri
+++ b/csit/variables/bgpfunctional/rt_constrain/rt_constrain_type_1/rib/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-route-target-constrain:route-target-constrain-subsequent-address-family/bgp-route-target-constrain:route-target-constrain-routes
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv4-address-family,bgp-route-target-constrain%3Aroute-target-constrain-subsequent-address-family/bgp-route-target-constrain:route-target-constrain-routes

diff --git a/csit/variables/bgpfunctional/rt_constrain/rt_constrain_type_2/app/location.uri b/csit/variables/bgpfunctional/rt_constrain/rt_constrain_type_2/app/location.uri
index 4d626ff7c0bf8be3f07a3a43a2b25c5388dfe4ee..beebd671186f03cc59c6c7c8a9c493b607acffc9 100644 (file)
--- a/csit/variables/bgpfunctional/rt_constrain/rt_constrain_type_2/app/location.uri
+++ b/csit/variables/bgpfunctional/rt_constrain/rt_constrain_type_2/app/location.uri
@@ -1 +1 @@
-/restconf/config/bgp-rib:application-rib/$IP/tables/bgp-types:ipv4-address-family/bgp-route-target-constrain:route-target-constrain-subsequent-address-family/bgp-route-target-constrain:route-target-constrain-routes
+/rests/data/bgp-rib:application-rib=$IP/tables=bgp-types%3Aipv4-address-family,bgp-route-target-constrain%3Aroute-target-constrain-subsequent-address-family/bgp-route-target-constrain:route-target-constrain-routes

diff --git a/csit/variables/bgpfunctional/rt_constrain/rt_constrain_type_2/rib/location.uri b/csit/variables/bgpfunctional/rt_constrain/rt_constrain_type_2/rib/location.uri
index 6dbb9858713bf51b3447d117d54d9b0473541da6..c839e87c905948339dd127ba2cb2dcd9a379e91a 100644 (file)
--- a/csit/variables/bgpfunctional/rt_constrain/rt_constrain_type_2/rib/location.uri
+++ b/csit/variables/bgpfunctional/rt_constrain/rt_constrain_type_2/rib/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB/$PATH/tables/bgp-types:ipv4-address-family/bgp-route-target-constrain:route-target-constrain-subsequent-address-family/bgp-route-target-constrain:route-target-constrain-routes
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB/$PATH/tables=bgp-types%3Aipv4-address-family,bgp-route-target-constrain%3Aroute-target-constrain-subsequent-address-family/bgp-route-target-constrain:route-target-constrain-routes

diff --git a/csit/variables/bgpuser/bgp_application_peer/location.uri b/csit/variables/bgpuser/bgp_application_peer/location.uri
index d713ddf1ec1b5c4cad75036a6e246354cfc1faae..3b3a11f883e9a40842af36bceb6ce5cab039bf9a 100644 (file)
--- a/csit/variables/bgpuser/bgp_application_peer/location.uri
+++ b/csit/variables/bgpuser/bgp_application_peer/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpuser/bgp_peer/location.uri b/csit/variables/bgpuser/bgp_peer/location.uri
index d713ddf1ec1b5c4cad75036a6e246354cfc1faae..3b3a11f883e9a40842af36bceb6ce5cab039bf9a 100644 (file)
--- a/csit/variables/bgpuser/bgp_peer/location.uri
+++ b/csit/variables/bgpuser/bgp_peer/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpuser/bgp_peer_group/location.uri b/csit/variables/bgpuser/bgp_peer_group/location.uri
index d713ddf1ec1b5c4cad75036a6e246354cfc1faae..3b3a11f883e9a40842af36bceb6ce5cab039bf9a 100644 (file)
--- a/csit/variables/bgpuser/bgp_peer_group/location.uri
+++ b/csit/variables/bgpuser/bgp_peer_group/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpuser/change_counter/location.uri b/csit/variables/bgpuser/change_counter/location.uri
index b6db7b739974b1e8f290151520364363dd73eb3b..a0468478adc9661115879f228b1f63a8a496a348 100644 (file)
--- a/csit/variables/bgpuser/change_counter/location.uri
+++ b/csit/variables/bgpuser/change_counter/location.uri
@@ -1 +1 @@
-restconf/config/odl-data-change-counter-config:data-change-counter-config/data-change-counter
+rests/data/odl-data-change-counter-config:data-change-counter-config/data-change-counter

diff --git a/csit/variables/bgpuser/cluster_id/ibgp_peer/location.uri b/csit/variables/bgpuser/cluster_id/ibgp_peer/location.uri
index d713ddf1ec1b5c4cad75036a6e246354cfc1faae..3b3a11f883e9a40842af36bceb6ce5cab039bf9a 100644 (file)
--- a/csit/variables/bgpuser/cluster_id/ibgp_peer/location.uri
+++ b/csit/variables/bgpuser/cluster_id/ibgp_peer/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpuser/cluster_id/peer_rib_out/location.uri b/csit/variables/bgpuser/cluster_id/peer_rib_out/location.uri
index add56d0ec83138e8a86eeeef5ed9a663ee02939d..010bfdc83e4b7a58e7699f09c10e4584487d40c3 100644 (file)
--- a/csit/variables/bgpuser/cluster_id/peer_rib_out/location.uri
+++ b/csit/variables/bgpuser/cluster_id/peer_rib_out/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB_OPENCONFIG/peer/bgp:%2F%2F$IP/adj-rib-out/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB_OPENCONFIG/peer=bgp%3A%2F%2F$IP/adj-rib-out/tables=bgp-types%3Aipv4-address-family,bgp-types%3Aunicast-subsequent-address-family/bgp-inet:ipv4-routes?content=nonconfig

diff --git a/csit/variables/bgpuser/ebgp_peers/location.uri b/csit/variables/bgpuser/ebgp_peers/location.uri
index d713ddf1ec1b5c4cad75036a6e246354cfc1faae..3b3a11f883e9a40842af36bceb6ce5cab039bf9a 100644 (file)
--- a/csit/variables/bgpuser/ebgp_peers/location.uri
+++ b/csit/variables/bgpuser/ebgp_peers/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpuser/empty_topology/data.json b/csit/variables/bgpuser/empty_topology/data.json
index e9b7b9022657e10f4dc32b6fd1f7d4521940941d..2eeb763d1b7d9a5ffdf6cb423def54bab3b965cc 100644 (file)
--- a/csit/variables/bgpuser/empty_topology/data.json
+++ b/csit/variables/bgpuser/empty_topology/data.json
@@ -1,5 +1,5 @@
 {
- "topology": [
+ "network-topology:topology": [
   {
    "server-provided": true,
    "topology-id": "example-ipv4-topology",

diff --git a/csit/variables/bgpuser/empty_topology/location.uri b/csit/variables/bgpuser/empty_topology/location.uri
index 69f1f7b97f40f1d7ae1337d43d9d66b4e3186087..bb2cdfd2da85eb38b5f1894207bf8bfec5885e34 100644 (file)
--- a/csit/variables/bgpuser/empty_topology/location.uri
+++ b/csit/variables/bgpuser/empty_topology/location.uri
@@ -1 +1 @@
-restconf/operational/network-topology:network-topology/topology/example-ipv4-topology
+rests/data/network-topology:network-topology/topology=example-ipv4-topology?content=nonconfig

diff --git a/csit/variables/bgpuser/filled_topology/data.json b/csit/variables/bgpuser/filled_topology/data.json
index f9eb25669d67683c0bc7370c1b2d4b2cb7270993..5fe6937c868b11e159fd5404945ca5deafb256d6 100644 (file)
--- a/csit/variables/bgpuser/filled_topology/data.json
+++ b/csit/variables/bgpuser/filled_topology/data.json
@@ -1,5 +1,5 @@
 {
- "topology": [
+ "network-topology:topology": [
   {
    "node": [
     {

diff --git a/csit/variables/bgpuser/filled_topology/location.uri b/csit/variables/bgpuser/filled_topology/location.uri
index 69f1f7b97f40f1d7ae1337d43d9d66b4e3186087..bb2cdfd2da85eb38b5f1894207bf8bfec5885e34 100644 (file)
--- a/csit/variables/bgpuser/filled_topology/location.uri
+++ b/csit/variables/bgpuser/filled_topology/location.uri
@@ -1 +1 @@
-restconf/operational/network-topology:network-topology/topology/example-ipv4-topology
+rests/data/network-topology:network-topology/topology=example-ipv4-topology?content=nonconfig

diff --git a/csit/variables/bgpuser/ibgp_local_address/location.uri b/csit/variables/bgpuser/ibgp_local_address/location.uri
index d713ddf1ec1b5c4cad75036a6e246354cfc1faae..3b3a11f883e9a40842af36bceb6ce5cab039bf9a 100644 (file)
--- a/csit/variables/bgpuser/ibgp_local_address/location.uri
+++ b/csit/variables/bgpuser/ibgp_local_address/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpuser/ibgp_peers/location.uri b/csit/variables/bgpuser/ibgp_peers/location.uri
index d713ddf1ec1b5c4cad75036a6e246354cfc1faae..3b3a11f883e9a40842af36bceb6ce5cab039bf9a 100644 (file)
--- a/csit/variables/bgpuser/ibgp_peers/location.uri
+++ b/csit/variables/bgpuser/ibgp_peers/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpuser/local_as/adj_rib_out/location.uri b/csit/variables/bgpuser/local_as/adj_rib_out/location.uri
index add56d0ec83138e8a86eeeef5ed9a663ee02939d..010bfdc83e4b7a58e7699f09c10e4584487d40c3 100644 (file)
--- a/csit/variables/bgpuser/local_as/adj_rib_out/location.uri
+++ b/csit/variables/bgpuser/local_as/adj_rib_out/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/$BGP_RIB_OPENCONFIG/peer/bgp:%2F%2F$IP/adj-rib-out/tables/bgp-types:ipv4-address-family/bgp-types:unicast-subsequent-address-family/bgp-inet:ipv4-routes
+rests/data/bgp-rib:bgp-rib/rib=$BGP_RIB_OPENCONFIG/peer=bgp%3A%2F%2F$IP/adj-rib-out/tables=bgp-types%3Aipv4-address-family,bgp-types%3Aunicast-subsequent-address-family/bgp-inet:ipv4-routes?content=nonconfig

diff --git a/csit/variables/bgpuser/local_as/ebgp_peer/location.uri b/csit/variables/bgpuser/local_as/ebgp_peer/location.uri
index d713ddf1ec1b5c4cad75036a6e246354cfc1faae..3b3a11f883e9a40842af36bceb6ce5cab039bf9a 100644 (file)
--- a/csit/variables/bgpuser/local_as/ebgp_peer/location.uri
+++ b/csit/variables/bgpuser/local_as/ebgp_peer/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/neighbors/neighbor/$IP
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/neighbors/neighbor=$IP

diff --git a/csit/variables/bgpuser/lsp/effective_rib_in.oxygen/location.uri b/csit/variables/bgpuser/lsp/effective_rib_in.oxygen/location.uri
index ab37ad60d6577d94704e9e70435728aeed798a3c..b8ea30dc9c2d0528efc552055fe20c182091a828 100644 (file)
--- a/csit/variables/bgpuser/lsp/effective_rib_in.oxygen/location.uri
+++ b/csit/variables/bgpuser/lsp/effective_rib_in.oxygen/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/peer/bgp:%2F%2F$IP/effective-rib-in/tables/bgp-linkstate:linkstate-address-family/bgp-linkstate:linkstate-subsequent-address-family/bgp-linkstate:linkstate-routes
+rests/data/bgp-rib:bgp-rib/rib=example-bgp-rib/peer=bgp%3A%2F%2F$IP/effective-rib-in/tables=bgp-linkstate%3Alinkstate-address-family,bgp-linkstate%3Alinkstate-subsequent-address-family/bgp-linkstate:linkstate-routes?content=nonconfig

diff --git a/csit/variables/bgpuser/lsp/effective_rib_in/data.json b/csit/variables/bgpuser/lsp/effective_rib_in/data.json
index f603da25a8320d08be0d4e3cd28269153ced864f..319b7ae7019cff7eeca64e5de93679f71dad4994 100644 (file)
--- a/csit/variables/bgpuser/lsp/effective_rib_in/data.json
+++ b/csit/variables/bgpuser/lsp/effective_rib_in/data.json
@@ -28,7 +28,7 @@
                         "pref": 100
                     }
                 },
-                "identifier": 1,
+                "identifier": "1",
                 "protocol-id": "bgp-epe"
             }
         ]

diff --git a/csit/variables/bgpuser/lsp/effective_rib_in/location.uri b/csit/variables/bgpuser/lsp/effective_rib_in/location.uri
index ab37ad60d6577d94704e9e70435728aeed798a3c..b8ea30dc9c2d0528efc552055fe20c182091a828 100644 (file)
--- a/csit/variables/bgpuser/lsp/effective_rib_in/location.uri
+++ b/csit/variables/bgpuser/lsp/effective_rib_in/location.uri
@@ -1 +1 @@
-restconf/operational/bgp-rib:bgp-rib/rib/example-bgp-rib/peer/bgp:%2F%2F$IP/effective-rib-in/tables/bgp-linkstate:linkstate-address-family/bgp-linkstate:linkstate-subsequent-address-family/bgp-linkstate:linkstate-routes
+rests/data/bgp-rib:bgp-rib/rib=example-bgp-rib/peer=bgp%3A%2F%2F$IP/effective-rib-in/tables=bgp-linkstate%3Alinkstate-address-family,bgp-linkstate%3Alinkstate-subsequent-address-family/bgp-linkstate:linkstate-routes?content=nonconfig

diff --git a/csit/variables/bgpuser/peer_group/location.uri b/csit/variables/bgpuser/peer_group/location.uri
index 97f2db7eddd719d542403cfc5e93de002e46a3a9..fafdcc835bf6e3ebf3225e0930d09830d6b76bf5 100644 (file)
--- a/csit/variables/bgpuser/peer_group/location.uri
+++ b/csit/variables/bgpuser/peer_group/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/peer-groups/peer-group/$PEER_GROUP_NAME
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/peer-groups/peer-group=$PEER_GROUP_NAME

diff --git a/csit/variables/bgpuser/peer_group_without_ipv4/location.uri b/csit/variables/bgpuser/peer_group_without_ipv4/location.uri
index 97f2db7eddd719d542403cfc5e93de002e46a3a9..fafdcc835bf6e3ebf3225e0930d09830d6b76bf5 100644 (file)
--- a/csit/variables/bgpuser/peer_group_without_ipv4/location.uri
+++ b/csit/variables/bgpuser/peer_group_without_ipv4/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/peer-groups/peer-group/$PEER_GROUP_NAME
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/peer-groups/peer-group=$PEER_GROUP_NAME

diff --git a/csit/variables/bgpuser/verify_peer_group/data.json b/csit/variables/bgpuser/verify_peer_group/data.json
index 17f23ae4c4cc91ac6a49caf098ba59b2d109902d..62a6c10cfa6638674a91f8a44dd4b02a173431b0 100644 (file)
--- a/csit/variables/bgpuser/verify_peer_group/data.json
+++ b/csit/variables/bgpuser/verify_peer_group/data.json
@@ -25,8 +25,8 @@
             },
             "timers": {
                 "config": {
-                    "hold-time": 180,
-                    "connect-retry": 5
+                    "hold-time": "180",
+                    "connect-retry": "5"
                 }
             },
             "route-reflector": {

diff --git a/csit/variables/bgpuser/verify_peer_group/location.uri b/csit/variables/bgpuser/verify_peer_group/location.uri
index 97f2db7eddd719d542403cfc5e93de002e46a3a9..9a762b3144270ceed2b7889d7456500e6d89644b 100644 (file)
--- a/csit/variables/bgpuser/verify_peer_group/location.uri
+++ b/csit/variables/bgpuser/verify_peer_group/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/peer-groups/peer-group/$PEER_GROUP_NAME
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/peer-groups/peer-group=$PEER_GROUP_NAME?content=config

diff --git a/csit/variables/bgpuser/verify_peer_group_without_ipv4/data.json b/csit/variables/bgpuser/verify_peer_group_without_ipv4/data.json
index 7c53ede6a2b8d84f4fd42540aae877e832519dc1..a15c9f73448fc21bb310888b5155f90761d0fdf9 100644 (file)
--- a/csit/variables/bgpuser/verify_peer_group_without_ipv4/data.json
+++ b/csit/variables/bgpuser/verify_peer_group_without_ipv4/data.json
@@ -22,8 +22,8 @@
             },
             "timers": {
                 "config": {
-                    "hold-time": 180,
-                    "connect-retry": 5
+                    "hold-time": "180",
+                    "connect-retry": "5"
                 }
             },
             "route-reflector": {

diff --git a/csit/variables/bgpuser/verify_peer_group_without_ipv4/location.uri b/csit/variables/bgpuser/verify_peer_group_without_ipv4/location.uri
index 97f2db7eddd719d542403cfc5e93de002e46a3a9..9a762b3144270ceed2b7889d7456500e6d89644b 100644 (file)
--- a/csit/variables/bgpuser/verify_peer_group_without_ipv4/location.uri
+++ b/csit/variables/bgpuser/verify_peer_group_without_ipv4/location.uri
@@ -1 +1 @@
-restconf/config/openconfig-network-instance:network-instances/network-instance/global-bgp/openconfig-network-instance:protocols/protocol/openconfig-policy-types:BGP/$BGP_RIB_OPENCONFIG/bgp/peer-groups/peer-group/$PEER_GROUP_NAME
+rests/data/openconfig-network-instance:network-instances/network-instance=global-bgp/openconfig-network-instance:protocols/protocol=openconfig-policy-types%3ABGP,$BGP_RIB_OPENCONFIG/bgp-openconfig-extensions:bgp/peer-groups/peer-group=$PEER_GROUP_NAME?content=config

diff --git a/csit/variables/pcepuser/aluminium/node_session_state/location.uri b/csit/variables/pcepuser/aluminium/node_session_state/location.uri
index 8582d4ca75ba5ad94ec9e264d7483b796eebd8c5..0348c3ec21ec0fc727be781d678d1a3fda17bf00 100644 (file)
--- a/csit/variables/pcepuser/aluminium/node_session_state/location.uri
+++ b/csit/variables/pcepuser/aluminium/node_session_state/location.uri
@@ -1 +1 @@
-restconf/operational/network-topology:network-topology/topology/pcep-topology/node/pcc:%2F%2F$IP/pcep-session-state
+rests/data/network-topology:network-topology/topology=pcep-topology/node=pcc%3A%2F%2F$IP/pcep-session-state?content=nonconfig

diff --git a/csit/variables/pcepuser/aluminium/node_speaker_entity_identifier/location.uri b/csit/variables/pcepuser/aluminium/node_speaker_entity_identifier/location.uri
index 814155494d5f33f423eaf20bbcc1fcca1e36f0f3..b2a98688950851926ce69deab71d95f2e491aca4 100644 (file)
--- a/csit/variables/pcepuser/aluminium/node_speaker_entity_identifier/location.uri
+++ b/csit/variables/pcepuser/aluminium/node_speaker_entity_identifier/location.uri
@@ -1 +1 @@
-restconf/config/network-topology:network-topology/topology/pcep-topology/node/$IP
+rests/data/network-topology:network-topology/topology=pcep-topology/node=$IP

diff --git a/csit/variables/pcepuser/aluminium/pcep_topology/location.uri b/csit/variables/pcepuser/aluminium/pcep_topology/location.uri
index 7a4b1bf20d86d50e6563012360981ea292e58622..8e7a122a40e62a138b658da4bafe817f698f8de8 100644 (file)
--- a/csit/variables/pcepuser/aluminium/pcep_topology/location.uri
+++ b/csit/variables/pcepuser/aluminium/pcep_topology/location.uri
@@ -1 +1 @@
-restconf/operational/network-topology:network-topology/topology/pcep-topology
+rests/data/network-topology:network-topology/topology=pcep-topology?content=nonconfig