Migrate netconf suites restconf calls to rfc8040

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

diff --git a/csit/libraries/NetconfKeywords.robot b/csit/libraries/NetconfKeywords.robot
index 5725284b76cbeab7b50969cd0b5e2a2e3c2a8108..868d09f6e07d4e82e241e5da8da9ae1e861cfcd3 100644 (file)
--- a/csit/libraries/NetconfKeywords.robot
+++ b/csit/libraries/NetconfKeywords.robot
@@ -123,7 +123,7 @@ Remove_Device_From_Netconf
     [Arguments]    ${device_name}    ${session}=default    ${location}=location
     [Documentation]    Tell Netconf to deconfigure the specified device
     ${device_type}=    Collections.Pop_From_Dictionary    ${NetconfKeywords__mounted_device_types}    ${device_name}
-    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}'}
+    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}
     TemplatedRequests.Delete_Templated    ${DIRECTORY_WITH_DEVICE_TEMPLATES}${/}${device_type}    ${template_as_string}    session=${session}    location=${location}
 
 Deconfigure_Device

diff --git a/csit/suites/netconf/CRUD-ACTION/CRUD-ACTION.robot b/csit/suites/netconf/CRUD-ACTION/CRUD-ACTION.robot
index 5f79140f3e64714dac30bdc8508a486c7169e1f6..308e284e000887cb4b6d23ce8482f09608eae76d 100644 (file)
--- a/csit/suites/netconf/CRUD-ACTION/CRUD-ACTION.robot
+++ b/csit/suites/netconf/CRUD-ACTION/CRUD-ACTION.robot
@@ -64,22 +64,22 @@ Check_Device_Data_Is_Empty
 
 Invoke_Yang1.1_Action_Via_Xml_Post
     [Documentation]    Send a sample test data label into the device and check that the request went OK.
-    ${template_as_string} =    BuiltIn.Set_Variable    {'DEVICE_NAME': '${DEVICE_NAME}'}
+    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}
     TemplatedRequests.Post_As_Xml_Templated    ${DIRECTORY_WITH_TEMPLATE_FOLDERS}${/}dataorigaction    ${template_as_string}
 
 Invoke_Yang1.1_Action_Via_Json_Post
     [Documentation]    Send a sample test data label into the device and check that the request went OK.
-    ${template_as_string} =    BuiltIn.Set_Variable    {'DEVICE_NAME': '${DEVICE_NAME}'}
+    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}
     TemplatedRequests.Post_As_Json_RFC8040_Templated    ${DIRECTORY_WITH_TEMPLATE_FOLDERS}${/}dataorigaction    ${template_as_string}
 
 Invoke_Yang1.1_Augmentation_Via_Xml_Post
     [Documentation]    Send a sample test data label into the device and check that the request went OK.
-    ${template_as_string} =    BuiltIn.Set_Variable    {'DEVICE_NAME': '${DEVICE_NAME}'}
+    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}
     TemplatedRequests.Post_As_Xml_Templated    ${DIRECTORY_WITH_TEMPLATE_FOLDERS}${/}augment    ${template_as_string}
 
 Invoke_Yang1.1_Augmentation_Via_Json_Post
     [Documentation]    Send a sample test data label into the device and check that the request went OK.
-    ${template_as_string} =    BuiltIn.Set_Variable    {'DEVICE_NAME': '${DEVICE_NAME}'}
+    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}
     TemplatedRequests.Post_As_Json_RFC8040_Templated    ${DIRECTORY_WITH_TEMPLATE_FOLDERS}${/}augment    ${template_as_string}
 
 Deconfigure_Device_From_Netconf
@@ -105,7 +105,7 @@ Check_Device_Going_To_Be_Gone_After_Deconfiguring
 Setup_Everything
     [Documentation]    Initialize SetupUtils. Setup everything needed for the test cases.
     SetupUtils.Setup_Utils_For_Setup_And_Teardown
-    RequestsLibrary.Create_Session    operational    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${OPERATIONAL_API}    auth=${AUTH}
+    RequestsLibrary.Create_Session    operational    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${REST_API}    auth=${AUTH}
     NetconfKeywords.Setup_Netconf_Keywords
     ${DEVICE_TYPE_RPC} =    BuiltIn.Set_Variable_If    """${USE_NETCONF_CONNECTOR}""" == """True"""    default    ${DEVICE_TYPE_RPC}
     ${DEVICE_TYPE} =    CompareStream.Set_Variable_If_At_Most_Nitrogen    ${DEVICE_TYPE_RPC}    ${DEVICE_TYPE_RPC_CREATE}
@@ -120,7 +120,7 @@ Teardown_Everything
 
 Get_Config_Data
     [Documentation]    Get and return the config data from the device.
-    ${url} =    Builtin.Set_Variable    ${CONFIG_API}/network-topology:network-topology/topology/topology-netconf/node/${DEVICE_NAME}/yang-ext:mount
+    ${url} =    Builtin.Set_Variable    ${REST_API}/network-topology:network-topology/topology=topology-netconf/node=${DEVICE_NAME}/yang-ext:mount?content=config
     ${data} =    TemplatedRequests.Get_As_Xml_From_Uri    ${url}
     [Return]    ${data}
 

diff --git a/csit/suites/netconf/CRUD/CRUD-RPC.robot b/csit/suites/netconf/CRUD/CRUD-RPC.robot
index ae5b22ed29f65458515ac9249945f2b3788bada6..1830a0a95de28a4fd75425a0ad0f5a3c3ae8c8ef 100644 (file)
--- a/csit/suites/netconf/CRUD/CRUD-RPC.robot
+++ b/csit/suites/netconf/CRUD/CRUD-RPC.robot
@@ -74,7 +74,7 @@ Check_Device_Data_Is_Empty
 
 Create_Device_Data_Label_Via_Xml
     [Documentation]    Send a sample test data label into the device and check that the request went OK.
-    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}'}
+    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}
     TemplatedRequests.Post_As_Xml_Templated    ${directory_with_template_folders}${/}dataorig    ${template_as_string}
 
 Check_Device_Data_Label_Is_Created
@@ -83,7 +83,7 @@ Check_Device_Data_Label_Is_Created
 
 Modify_Device_Data_Label_Via_Xml
     [Documentation]    Send a request to change the sample test data label and check that the request went OK.
-    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}'}
+    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}
     TemplatedRequests.Put_As_Xml_Templated    ${directory_with_template_folders}${/}datamod1    ${template_as_string}
 
 Check_Device_Data_Label_Is_Modified
@@ -120,7 +120,7 @@ Check_Modified_Device_Data_Is_Still_There
 
 Modify_Device_Data_Again
     [Documentation]    Send a request to change the sample test data and check that the request went OK.
-    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}'}
+    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}
     TemplatedRequests.Put_As_Xml_Templated    ${DIRECTORY_WITH_TEMPLATE_FOLDERS}${/}datamod2    ${template_as_string}
 
 Check_Device_Data_Is_Modified_Again
@@ -129,7 +129,7 @@ Check_Device_Data_Is_Modified_Again
 
 Modify_Device_Data_Label_Via_Json
     [Documentation]    Send a JSON request to change the sample test data label and check that the request went OK.
-    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}'}
+    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}
     TemplatedRequests.Put_As_Json_Templated    ${directory_with_template_folders}${/}datamodjson    ${template_as_string}
 
 Check_Device_Data_Label_Is_Modified_Via_Json
@@ -138,7 +138,7 @@ Check_Device_Data_Label_Is_Modified_Via_Json
 
 Create_Car_List
     [Documentation]    Send a request to create a list of cars in the sample test data label and check that the request went OK.
-    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}'}
+    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}
     TemplatedRequests.Post_As_Xml_Templated    ${directory_with_template_folders}${/}cars    ${template_as_string}
 
 Check_Car_List_Created
@@ -158,7 +158,7 @@ Check_Car_List_Created
 
 Add_Device_Data_Item_1_Via_XML_Post
     [Documentation]    Send a request to create a data item in the test list and check that the request went OK.
-    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}'}
+    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}
     TemplatedRequests.Post_As_Xml_Templated    ${directory_with_template_folders}${/}item1    ${template_as_string}
 
 Check_Item1_Is_Created
@@ -177,7 +177,7 @@ Check_Item1_Is_Created
 
 Add_Device_Data_Item_2_Via_JSON_Post
     [Documentation]    Send a JSON request to change the sample test data and check that the request went OK.
-    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}'}
+    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}
     TemplatedRequests.Post_As_Json_Templated    ${directory_with_template_folders}${/}item2    ${template_as_string}
 
 Check_Item2_Is_Created
@@ -196,7 +196,7 @@ Check_Item2_Is_Created
 
 Delete_Device_Data
     [Documentation]    Send a request to delete the sample test data on the device and check that the request went OK.
-    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}'}
+    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}
     TemplatedRequests.Delete_Templated    ${directory_with_template_folders}${/}datamod1    ${template_as_string}
     TemplatedRequests.Delete_Templated    ${directory_with_template_folders}${/}item1    ${template_as_string}
 
@@ -229,7 +229,7 @@ Setup_Everything
     [Documentation]    Initialize SetupUtils. Setup everything needed for the test cases.
     # Setup resources used by the suite.
     SetupUtils.Setup_Utils_For_Setup_And_Teardown
-    RequestsLibrary.Create_Session    operational    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${OPERATIONAL_API}    auth=${AUTH}
+    RequestsLibrary.Create_Session    operational    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${REST_API}    auth=${AUTH}
     NetconfKeywords.Setup_Netconf_Keywords
     ${device_type_rpc}=    BuiltIn.Set_Variable_If    """${USE_NETCONF_CONNECTOR}""" == """True"""    default    ${device_type_rpc}
     ${device_type}    CompareStream.Set_Variable_If_At_Most_Nitrogen    ${device_type_rpc}    ${device_type_rpc_create}
@@ -242,7 +242,7 @@ Teardown_Everything
 
 Get_Config_Data
     [Documentation]    Get and return the config data from the device.
-    ${url}=    Builtin.Set_Variable    ${CONFIG_API}/network-topology:network-topology/topology/topology-netconf/node/${device_name}/yang-ext:mount
+    ${url}=    Builtin.Set_Variable    ${REST_API}/network-topology:network-topology/topology=topology-netconf/node=${device_name}/yang-ext:mount?content=config
     ${data}=    TemplatedRequests.Get_As_Xml_From_Uri    ${url}
     [Return]    ${data}
 

diff --git a/csit/suites/netconf/CRUD/CRUD.robot b/csit/suites/netconf/CRUD/CRUD.robot
index 9d1e485f0f078ac46791bb81f0e59cc13fc073ed..4551ec10059d944fb4dbbdb84c9b250e0c98c8a5 100644 (file)
--- a/csit/suites/netconf/CRUD/CRUD.robot
+++ b/csit/suites/netconf/CRUD/CRUD.robot
@@ -69,7 +69,7 @@ Check_Device_Data_Is_Empty
 
 Create_Device_Data_Label_Via_Xml
     [Documentation]    Send a sample test data label into the device and check that the request went OK.
-    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}'}
+    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}
     TemplatedRequests.Post_As_Xml_Templated    ${directory_with_template_folders}${/}dataorig    ${template_as_string}
 
 Check_Device_Data_Label_Is_Created
@@ -78,7 +78,7 @@ Check_Device_Data_Label_Is_Created
 
 Modify_Device_Data_Label_Via_Xml
     [Documentation]    Send a request to change the sample test data label and check that the request went OK.
-    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}'}
+    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}
     TemplatedRequests.Put_As_Xml_Templated    ${directory_with_template_folders}${/}datamod1    ${template_as_string}
 
 Check_Device_Data_Label_Is_Modified
@@ -114,7 +114,7 @@ Check_Modified_Device_Data_Is_Still_There
 
 Modify_Device_Data_Again
     [Documentation]    Send a request to change the sample test data and check that the request went OK.
-    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}'}
+    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}
     TemplatedRequests.Put_As_Xml_Templated    ${DIRECTORY_WITH_TEMPLATE_FOLDERS}${/}datamod2    ${template_as_string}
 
 Check_Device_Data_Is_Modified_Again
@@ -123,7 +123,7 @@ Check_Device_Data_Is_Modified_Again
 
 Modify_Device_Data_Label_Via_Json
     [Documentation]    Send a JSON request to change the sample test data label and check that the request went OK.
-    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}'}
+    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}
     TemplatedRequests.Put_As_Json_Templated    ${directory_with_template_folders}${/}datamodjson    ${template_as_string}
 
 Check_Device_Data_Label_Is_Modified_Via_Json
@@ -132,7 +132,7 @@ Check_Device_Data_Label_Is_Modified_Via_Json
 
 Create_Car_List
     [Documentation]    Send a request to create a list of cars in the sample test data label and check that the request went OK.
-    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}'}
+    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}
     TemplatedRequests.Post_As_Xml_Templated    ${directory_with_template_folders}${/}cars    ${template_as_string}
 
 Check_Car_List_Created
@@ -152,7 +152,7 @@ Check_Car_List_Created
 
 Add_Device_Data_Item_1_Via_XML_Post
     [Documentation]    Send a request to create a data item in the test list and check that the request went OK.
-    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}'}
+    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}
     TemplatedRequests.Post_As_Xml_Templated    ${directory_with_template_folders}${/}item1    ${template_as_string}
 
 Check_Item1_Is_Created
@@ -171,7 +171,7 @@ Check_Item1_Is_Created
 
 Add_Device_Data_Item_2_Via_JSON_Post
     [Documentation]    Send a JSON request to change the sample test data and check that the request went OK.
-    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}'}
+    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}
     TemplatedRequests.Post_As_Json_Templated    ${directory_with_template_folders}${/}item2    ${template_as_string}
 
 Check_Item2_Is_Created
@@ -190,7 +190,7 @@ Check_Item2_Is_Created
 
 Delete_Device_Data
     [Documentation]    Send a request to delete the sample test data on the device and check that the request went OK.
-    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}'}
+    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}
     TemplatedRequests.Delete_Templated    ${directory_with_template_folders}${/}datamod1    ${template_as_string}
     TemplatedRequests.Delete_Templated    ${directory_with_template_folders}${/}item1    ${template_as_string}
 
@@ -222,7 +222,7 @@ Setup_Everything
     [Documentation]    Initialize SetupUtils. Setup everything needed for the test cases.
     # Setup resources used by the suite.
     SetupUtils.Setup_Utils_For_Setup_And_Teardown
-    RequestsLibrary.Create_Session    operational    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${OPERATIONAL_API}    auth=${AUTH}
+    RequestsLibrary.Create_Session    operational    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${REST_API}    auth=${AUTH}
     NetconfKeywords.Setup_Netconf_Keywords
     ${device_type}=    BuiltIn.Set_Variable_If    """${USE_NETCONF_CONNECTOR}""" == """True"""    default    ${device_type}
     BuiltIn.Set_Suite_Variable    ${device_type}
@@ -234,7 +234,7 @@ Teardown_Everything
 
 Get_Config_Data
     [Documentation]    Get and return the config data from the device.
-    ${url}=    Builtin.Set_Variable    ${CONFIG_API}/network-topology:network-topology/topology/topology-netconf/node/${device_name}/yang-ext:mount
+    ${url}=    Builtin.Set_Variable    ${REST_API}/network-topology:network-topology/topology=topology-netconf/node=${device_name}/yang-ext:mount?content=config
     ${data}=    TemplatedRequests.Get_As_Xml_From_Uri    ${url}
     [Return]    ${data}
 

diff --git a/csit/suites/netconf/MDSAL/northbound.robot b/csit/suites/netconf/MDSAL/northbound.robot
index 57198539cc404ebd6626c84e063e6cb918a44b11..5ebaecd01d8e7fb5b72bfbdb8c0ccb1c2a5d2f3a 100644 (file)
--- a/csit/suites/netconf/MDSAL/northbound.robot
+++ b/csit/suites/netconf/MDSAL/northbound.robot
@@ -423,7 +423,7 @@ Close_ODL_Netconf_Connection_Gracefully
 Setup_Everything
     [Documentation]    Setup resources and create session for Restconf checking.
     SetupUtils.Setup_Utils_For_Setup_And_Teardown
-    RequestsLibrary.Create_Session    config    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${CONFIG_API}    auth=${AUTH}
+    RequestsLibrary.Create_Session    config    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${REST_API}    auth=${AUTH}
 
 Teardown_Everything
     [Documentation]    Close the Netconf connection and destroy all sessions in the requests library.

diff --git a/csit/suites/netconf/clustering/CRUD.robot b/csit/suites/netconf/clustering/CRUD.robot
index 7cf3f6637cc351c802bfba04f195772f716e1d96..5cf95e0d15ab9c6e2a0f6933cb333616c1f01d6c 100644 (file)
--- a/csit/suites/netconf/clustering/CRUD.robot
+++ b/csit/suites/netconf/clustering/CRUD.robot
@@ -209,7 +209,7 @@ Check_Device_Instance_Count
 
 Check_Config_Data
     [Arguments]    ${node}    ${expected}    ${contains}=False
-    ${url}=    Builtin.Set_Variable    ${CONFIG_API}/network-topology:network-topology/topology/topology-netconf/node/${DEVICE_NAME}/yang-ext:mount
+    ${url}=    Builtin.Set_Variable    ${REST_API}/network-topology:network-topology/topology=topology-netconf/node=${DEVICE_NAME}/yang-ext:mount?content=config
     ${data}=    TemplatedRequests.Get_As_Xml_From_Uri    ${url}    session=${node}
     BuiltIn.Run_Keyword_Unless    ${contains}    BuiltIn.Should_Be_Equal_As_Strings    ${data}    ${expected}
     BuiltIn.Run_Keyword_If    ${contains}    BuiltIn.Should_Contain    ${data}    ${expected}

diff --git a/csit/suites/netconf/clustering/bug8086.robot b/csit/suites/netconf/clustering/bug8086.robot
index 982553d85822f59a8600ee79ec8c93e9dd103eb8..3482c2c097fcdde85d9c97b2c570ff7116f209eb 100644 (file)
--- a/csit/suites/netconf/clustering/bug8086.robot
+++ b/csit/suites/netconf/clustering/bug8086.robot
@@ -200,7 +200,7 @@ Check_Device_Instance_Count
 Check_Config_Data
     [Arguments]    ${node}    ${expected}    ${contains}=False
     [Documentation]    Get device data from ${node}. Match against ${expected}, strictness given by ${contains}.
-    ${url}=    Builtin.Set_Variable    ${CONFIG_API}/network-topology:network-topology/topology/topology-netconf/node/${DEVICE_NAME}/yang-ext:mount
+    ${url}=    Builtin.Set_Variable    ${REST_API}/network-topology:network-topology/topology/topology-netconf/node/${DEVICE_NAME}/yang-ext:mount?content=config
     ${data}=    TemplatedRequests.Get_As_Xml_From_Uri    ${url}    session=${node}
     BuiltIn.Run_Keyword_Unless    ${contains}    BuiltIn.Should_Be_Equal_As_Strings    ${data}    ${expected}
     BuiltIn.Run_Keyword_If    ${contains}    BuiltIn.Should_Contain    ${data}    ${expected}

diff --git a/csit/suites/netconf/clustering/entity-isolation-rejoin.robot b/csit/suites/netconf/clustering/entity-isolation-rejoin.robot
index 1133999ee556a0c7cff4ed62824efb1b4bcf9189..5f84bc7a9816cb1050a11adfaecc8225b8291591 100644 (file)
--- a/csit/suites/netconf/clustering/entity-isolation-rejoin.robot
+++ b/csit/suites/netconf/clustering/entity-isolation-rejoin.robot
@@ -192,7 +192,7 @@ Check_Config_Data
     ...    TODO: Needs to be extracted into a suitable Resource as there is
     ...    the same code in at least two other suites (CRUD and clustered
     ...    CRUD).
-    ${url}=    Builtin.Set_Variable    ${CONFIG_API}/network-topology:network-topology/topology/topology-netconf/node/${DEVICE_NAME}/yang-ext:mount
+    ${url}=    Builtin.Set_Variable    ${REST_API}/network-topology:network-topology/topology=topology-netconf/node=${DEVICE_NAME}/yang-ext:mount?content=config
     ${data}=    TemplatedRequests.Get_As_Xml_From_Uri    ${url}    session=${session}
     BuiltIn.Run_Keyword_Unless    ${contains}    BuiltIn.Should_Be_Equal_As_Strings    ${data}    ${expected}
     BuiltIn.Run_Keyword_If    ${contains}    BuiltIn.Should_Contain    ${data}    ${expected}

diff --git a/csit/suites/netconf/clustering/entity.robot b/csit/suites/netconf/clustering/entity.robot
index e6f2f8b4495c70cd49309eeb0a2f14d462b0a0e7..e101345d7bd1ba86236ad13e363894a0a15c2cd9 100644 (file)
--- a/csit/suites/netconf/clustering/entity.robot
+++ b/csit/suites/netconf/clustering/entity.robot
@@ -196,7 +196,7 @@ Check_Config_Data
     ...    TODO: Needs to be extracted into a suitable Resource as there is
     ...    the same code in at least two other suites (CRUD and clustered
     ...    CRUD).
-    ${url}=    Builtin.Set_Variable    ${CONFIG_API}/network-topology:network-topology/topology/topology-netconf/node/${DEVICE_NAME}/yang-ext:mount
+    ${url}=    Builtin.Set_Variable    ${REST_API}/network-topology:network-topology/topology=topology-netconf/node=${DEVICE_NAME}/yang-ext:mount?content=config
     ${data}=    TemplatedRequests.Get_As_Xml_From_Uri    ${url}    session=${session}
     BuiltIn.Run_Keyword_Unless    ${contains}    BuiltIn.Should_Be_Equal_As_Strings    ${data}    ${expected}
     BuiltIn.Run_Keyword_If    ${contains}    BuiltIn.Should_Contain    ${data}    ${expected}

diff --git a/csit/suites/netconf/clustering/outages.robot b/csit/suites/netconf/clustering/outages.robot
index ae87311ca462c739e65179c27076126da065072e..631ac2e063da3f29946ba33be0e24e0eb9362c5a 100644 (file)
--- a/csit/suites/netconf/clustering/outages.robot
+++ b/csit/suites/netconf/clustering/outages.robot
@@ -192,9 +192,9 @@ Setup_Everything
     BuiltIn.Set_Suite_Variable    ${empty_data}    <data xmlns="${ODL_NETCONF_NAMESPACE}"></data>
     BuiltIn.Set_Suite_Variable    ${original_data}    <data xmlns="${ODL_NETCONF_NAMESPACE}"><cont xmlns="urn:opendaylight:test:netconf:crud"><l>Content</l></cont></data>
     BuiltIn.Set_Suite_Variable    ${modified_data}    <data xmlns="${ODL_NETCONF_NAMESPACE}"><cont xmlns="urn:opendaylight:test:netconf:crud"><l>Modified Content</l></cont></data>
-    ${url}=    Builtin.Set_Variable    /network-topology:network-topology/topology/topology-netconf
-    BuiltIn.Set_Suite_Variable    ${config_topology_url}    ${CONFIG_API}${url}
-    BuiltIn.Set_Suite_Variable    ${operational_topology_url}    ${OPERATIONAL_API}${url}
+    ${url}=    Builtin.Set_Variable    /network-topology:network-topology/topology=topology-netconf
+    BuiltIn.Set_Suite_Variable    ${config_topology_url}    ${REST_API}${url}
+    BuiltIn.Set_Suite_Variable    ${operational_topology_url}    ${REST_API}${url}
 
 Get_Topology_Core
     [Arguments]    ${session}
@@ -225,7 +225,7 @@ Check_Device_Instance_Count
 Check_Config_Data
     [Arguments]    ${node}    ${expected}    ${contains}=False
     [Documentation]    Check that the specified session sees the specified data in the test tool device.
-    ${url}=    Builtin.Set_Variable    ${CONFIG_API}/network-topology:network-topology/topology/topology-netconf/node/${DEVICE_NAME}/yang-ext:mount
+    ${url}=    Builtin.Set_Variable    ${REST_API}/network-topology:network-topology/topology=topology-netconf/node=${DEVICE_NAME}/yang-ext:mount?content=config
     ${data}=    TemplatedRequests.Get_As_Xml_From_Uri    ${url}    session=${node}
     BuiltIn.Run_Keyword_Unless    ${contains}    BuiltIn.Should_Be_Equal_As_Strings    ${data}    ${expected}
     BuiltIn.Run_Keyword_If    ${contains}    BuiltIn.Should_Contain    ${data}    ${expected}

diff --git a/csit/suites/netconf/clusteringscale/performance.robot b/csit/suites/netconf/clusteringscale/performance.robot
index 5f11c435cdbabb0272755970276e76bed3f863fb..38f67170bfc9bedb0ffb038e0c09352cfa3d84f0 100644 (file)
--- a/csit/suites/netconf/clusteringscale/performance.robot
+++ b/csit/suites/netconf/clusteringscale/performance.robot
@@ -66,13 +66,13 @@ Wait_For_Device_Data_To_Be_Seen
 
 Create_Device_Data
     [Documentation]    Send some sample test data into the device through node 2 and check that the request went OK.
-    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}'}
+    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}
     TemplatedRequests.Post_As_Xml_Templated    ${directory_with_crud_templates}${/}cars    ${template_as_string}    session=node2
 
 Run_Restperfclient
     [Documentation]    Deploy and execute restperfclient, asking it to send the specified amount of requests to the netconf connector of the device through node 3.
     ...    The duration of this test case is the main performance metric.
-    ${url}=    BuiltIn.Set_Variable    /restconf/config/network-topology:network-topology/topology/topology-netconf/node/${DEVICE_NAME}/yang-ext:mount/car:cars
+    ${url}=    BuiltIn.Set_Variable    /rests/data/network-topology:network-topology/topology\=topology-netconf/node\=${DEVICE_NAME}/yang-ext:mount/car:cars
     RestPerfClient.Invoke_Restperfclient    ${TESTTOOL_DEVICE_TIMEOUT}    ${url}    ip=${ODL_SYSTEM_3_IP}
 
 Check_For_Failed_Requests
@@ -113,7 +113,7 @@ Setup_Everything
     RequestsLibrary.Create_Session    node2    http://${ODL_SYSTEM_2_IP}:${RESTCONFPORT}    headers=${HEADERS_XML}    auth=${AUTH}
 
 Check_Data_Present
-    ${url}=    Builtin.Set_Variable    ${CONFIG_API}/network-topology:network-topology/topology/topology-netconf/node/${DEVICE_NAME}/yang-ext:mount
+    ${url}=    Builtin.Set_Variable    ${REST_API}/network-topology:network-topology/topology=topology-netconf/node=${DEVICE_NAME}/yang-ext:mount?content=config
     ${data}=    TemplatedRequests.Get_As_Xml_From_Uri    ${url}    session=node2
     BuiltIn.Should_Be_Equal_As_Strings    ${data}    <data xmlns="${ODL_NETCONF_NAMESPACE}"></data>
 

diff --git a/csit/suites/netconf/clusteringscale/topology_leader_ha.robot b/csit/suites/netconf/clusteringscale/topology_leader_ha.robot
index 3200e1492adac4d8a247bd426698a2da38fdbde5..6506918d90219baa5db01069a9dea88da3b07b67 100644 (file)
--- a/csit/suites/netconf/clusteringscale/topology_leader_ha.robot
+++ b/csit/suites/netconf/clusteringscale/topology_leader_ha.robot
@@ -147,12 +147,12 @@ Count_Substring_Occurence
 
 Get_Config_Device_Count
     [Documentation]    Count number of items in config netconf topology matching ${DEVICE_BASE_NAME}
-    ${item_data} =    TemplatedRequests.Get_As_Json_From_Uri    ${CONFIG_API}/network-topology:network-topology/topology/topology-netconf    session=${entity_ownership_leader_http_session}
+    ${item_data} =    TemplatedRequests.Get_As_Json_From_Uri    ${REST_API}/network-topology:network-topology/topology=topology-netconf    session=${entity_ownership_leader_http_session}
     BuiltIn.Run_Keyword_And_Return    Count_Substring_Occurence    substring=${DEVICE_BASE_NAME}    main_string=${item_data}
 
 Get_Operational_Device_Count
     [Documentation]    Count number of items in operational netconf topology matching ${DEVICE_BASE_NAME}
-    ${item_data} =    TemplatedRequests.Get_As_Json_From_Uri    ${OPERATIONAL_API}/network-topology:network-topology/topology/topology-netconf    session=${entity_ownership_leader_http_session}
+    ${item_data} =    TemplatedRequests.Get_As_Json_From_Uri    ${REST_API}/network-topology:network-topology/topology=topology-netconf?content=nonconfig    session=${entity_ownership_leader_http_session}
     BuiltIn.Run_Keyword_And_Return    Count_Substring_Occurence    substring=${DEVICE_BASE_NAME}    main_string=${item_data}
 
 Check_Config_Items_Lower_Bound

diff --git a/csit/suites/netconf/clusteringscale/topology_owner_ha.robot b/csit/suites/netconf/clusteringscale/topology_owner_ha.robot
index ddde3a9dbcc744d2dce9a5c269fbdfeed3c085e7..e9ecd425ab53418d7584b5c52b29d2b759d453f1 100644 (file)
--- a/csit/suites/netconf/clusteringscale/topology_owner_ha.robot
+++ b/csit/suites/netconf/clusteringscale/topology_owner_ha.robot
@@ -171,12 +171,12 @@ Count_Substring_Occurence
 
 Get_Config_Device_Count
     [Documentation]    Count number of items in config netconf topology matching ${DEVICE_BASE_NAME}
-    ${item_data} =    TemplatedRequests.Get_As_Json_From_Uri    ${CONFIG_API}/network-topology:network-topology/topology/topology-netconf    session=${topology_config_leader_http_session}
+    ${item_data} =    TemplatedRequests.Get_As_Json_From_Uri    ${REST_API}/network-topology:network-topology/topology=topology-netconf    session=${topology_config_leader_http_session}
     BuiltIn.Run_Keyword_And_Return    Count_Substring_Occurence    substring=${DEVICE_BASE_NAME}    main_string=${item_data}
 
 Get_Operational_Device_Count
     [Documentation]    Count number of items in operational netconf topology matching ${DEVICE_BASE_NAME}
-    ${item_data} =    TemplatedRequests.Get_As_Json_From_Uri    ${OPERATIONAL_API}/network-topology:network-topology/topology/topology-netconf    session=${topology_config_leader_http_session}
+    ${item_data} =    TemplatedRequests.Get_As_Json_From_Uri    ${REST_API}/network-topology:network-topology/topology=topology-netconf?content=nonconfig    session=${topology_config_leader_http_session}
     BuiltIn.Run_Keyword_And_Return    Count_Substring_Occurence    substring=${DEVICE_BASE_NAME}    main_string=${item_data}
 
 Check_Config_Items_Lower_Bound

diff --git a/csit/suites/netconf/ready/netconfready.robot b/csit/suites/netconf/ready/netconfready.robot
index 7b0f2e85d90b4796af270ce27749960ecc3b4307..266e52ab8d6bd0b98e58fee52d19ed1956a674e0 100644 (file)
--- a/csit/suites/netconf/ready/netconfready.robot
+++ b/csit/suites/netconf/ready/netconfready.robot
@@ -195,7 +195,7 @@ Wait_Netconf_Device_Mounted
 Check_Netconf_Up_And_Running
     [Arguments]    ${pretty_print}=${EMPTY}
     [Documentation]    Make a request to netconf connector's list of mounted devices and check that the request was successful.
-    ${response}=    RequestsLibrary.Get_Request    ses    restconf/config/network-topology:network-topology/topology/topology-netconf${netconf_connector}${pretty_print}
+    ${response}=    RequestsLibrary.Get_Request    ses    rests/data/network-topology:network-topology/topology\=topology-netconf${netconf_connector}${pretty_print}
     BuiltIn.Log    ${response.text}
     ${status}=    BuiltIn.Run_Keyword_And_Return_Status    BuiltIn.Should_Contain    ${response.text}    data model content does not exist
     BuiltIn.Run_Keyword_If    ${status}    BuiltIn.Set_Suite_Variable    ${netconf_not_ready_cause}    5832

diff --git a/csit/suites/netconf/restperfclient/mdsal.robot b/csit/suites/netconf/restperfclient/mdsal.robot
index 1932c928b13b7ae37adac2a1c86607e746309164..601db748bedfe4a1ed4674c9ebd27720e68ed357 100644 (file)
--- a/csit/suites/netconf/restperfclient/mdsal.robot
+++ b/csit/suites/netconf/restperfclient/mdsal.robot
@@ -44,7 +44,7 @@ Create_Test_Data_For_Direct_Access
 
 Run_RestPerfClient_Directly_On_MDSAL
     [Documentation]    Deploy and execute restperfclient, asking it to send the specified amount of requests to the MDSAL via Restconf.
-    ${url}=    BuiltIn.Set_Variable    /restconf/config/car:cars
+    ${url}=    BuiltIn.Set_Variable    /rests/data/car:cars
     RestPerfClient.Invoke_Restperfclient    ${DIRECT_MDSAL_TIMEOUT}    ${url}    testcase=direct
 
 Check_For_Failed_Direct_MDSAL_Requests
@@ -78,7 +78,7 @@ Configure_ODL_As_A_Device_On_Netconf
 
 Run_RestPerfClient_Through_Netconf_Connector
     [Documentation]    Ask RestPerfClient to send the requests to the MDSAL mapped via netconf topology device.
-    ${url}=    BuiltIn.Set_Variable    /restconf/config/network-topology:network-topology/topology/topology-netconf/node/${test_device}/yang-ext:mount/car:cars
+    ${url}=    BuiltIn.Set_Variable    /rests/data/network-topology:network-topology/topology\=topology-netconf/node\=${test_device}/yang-ext:mount/car:cars
     RestPerfClient.Invoke_Restperfclient    ${NETCONF_CONNECTOR_MDSAL_TIMEOUT}    ${url}    testcase=netconf-connector
 
 Check_For_Failed_Netconf_Connector_Requests

diff --git a/csit/suites/netconf/restperfclient/performance.robot b/csit/suites/netconf/restperfclient/performance.robot
index 3ec646a4d9234cd0caa01cc7f6db3c2d73838d11..80eb4a1fdf5f67055e8eb91e14f280c243963c2a 100644 (file)
--- a/csit/suites/netconf/restperfclient/performance.robot
+++ b/csit/suites/netconf/restperfclient/performance.robot
@@ -57,12 +57,12 @@ Wait_For_Device_To_Become_Connected
 
 Create_Device_Data
     [Documentation]    Send some sample test data into the device and check that the request went OK.
-    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}'}
+    ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${device_name}
     TemplatedRequests.Post_As_Xml_Templated    ${directory_with_crud_templates}${/}cars    ${template_as_string}
 
 Run_Restperfclient
     [Documentation]    Deploy and execute restperfclient, asking it to send the specified amount of requests to the netconf connector of the device.
-    ${url}=    BuiltIn.Set_Variable    /restconf/config/network-topology:network-topology/topology/topology-netconf/node/${DEVICE_NAME}/yang-ext:mount/car:cars
+    ${url}=    BuiltIn.Set_Variable    /rests/data/network-topology:network-topology/topology\=topology-netconf/node\=${DEVICE_NAME}/yang-ext:mount/car:cars
     RestPerfClient.Invoke_Restperfclient    ${TESTTOOL_DEVICE_TIMEOUT}    ${url}    async=false
 
 Check_For_Failed_Requests

diff --git a/csit/suites/netconf/scale/getmulti.robot b/csit/suites/netconf/scale/getmulti.robot
index 60f6a2043fca2c6f6db12772b245bec6f97ded22..97b544e3a257631a1d28958fd89aa7b3b6658211 100644 (file)
--- a/csit/suites/netconf/scale/getmulti.robot
+++ b/csit/suites/netconf/scale/getmulti.robot
@@ -79,7 +79,7 @@ Check_Devices_Are_Deconfigured
 Setup_Everything
     [Documentation]    Setup everything needed for the test cases.
     # Setup resources used by the suite.
-    RequestsLibrary.Create_Session    operational    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${OPERATIONAL_API}    auth=${AUTH}
+    RequestsLibrary.Create_Session    operational    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${REST_API}    auth=${AUTH}
     SSHLibrary.Set_Default_Configuration    prompt=${TOOLS_SYSTEM_PROMPT}
     SetupUtils.Setup_Utils_For_Setup_And_Teardown
     NetconfKeywords.Setup_Netconf_Keywords

diff --git a/csit/suites/netconf/scale/getsingle.robot b/csit/suites/netconf/scale/getsingle.robot
index 1402f66a89ec512800b6f2d5dde8af499f7e2cfa..6588c30178b19b82a271e8ccfb8f8626bdf36835 100644 (file)
--- a/csit/suites/netconf/scale/getsingle.robot
+++ b/csit/suites/netconf/scale/getsingle.robot
@@ -56,8 +56,8 @@ Deconfigure_Devices_From_Netconf
 Setup_Everything
     [Documentation]    Setup everything needed for the test cases.
     # Setup resources used by the suite.
-    RequestsLibrary.Create_Session    config    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${CONFIG_API}    auth=${AUTH}
-    RequestsLibrary.Create_Session    operational    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${OPERATIONAL_API}    auth=${AUTH}
+    RequestsLibrary.Create_Session    config    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${REST_API}    auth=${AUTH}
+    RequestsLibrary.Create_Session    operational    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${REST_API}    auth=${AUTH}
     SSHLibrary.Set_Default_Configuration    prompt=${TOOLS_SYSTEM_PROMPT}
     SetupUtils.Setup_Utils_For_Setup_And_Teardown
     NetconfKeywords.Setup_Netconf_Keywords

diff --git a/csit/suites/netconf/scale/max_devices.robot b/csit/suites/netconf/scale/max_devices.robot
index d2853ef6fe2911b91ad1edc6ed21f51185634041..da2d30d49fd0190ddcdb479e037b37d2c10b4eae 100644 (file)
--- a/csit/suites/netconf/scale/max_devices.robot
+++ b/csit/suites/netconf/scale/max_devices.robot
@@ -99,7 +99,7 @@ Issue_Requests_On_Devices
 Setup_Everything
     [Documentation]    Setup everything needed for the test cases.
     # Setup resources used by the suite.
-    RequestsLibrary.Create_Session    operational    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${OPERATIONAL_API}    auth=${AUTH}
+    RequestsLibrary.Create_Session    operational    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}${REST_API}    auth=${AUTH}
     SSHLibrary.Set_Default_Configuration    prompt=${TOOLS_SYSTEM_PROMPT}
     SetupUtils.Setup_Utils_For_Setup_And_Teardown
     NetconfKeywords.Setup_Netconf_Keywords

diff --git a/csit/variables/Variables.robot b/csit/variables/Variables.robot
index 7f4621416c2747986463366c2336fd972218aff7..0db8d0ede6a966e0b20149e422cbbb3555319618 100644 (file)
--- a/csit/variables/Variables.robot
+++ b/csit/variables/Variables.robot
@@ -171,6 +171,7 @@ ${REGISTER_TENANT_URI}    /restconf/operations/nemo-intent:register-user    # FI
 ${RESTCONFPORT}    8181    # Primary port for ODL RESTCONF, although 8080 should also work.
 ${RESTCONFPORT_TLS}    8443    # Port for ODL RESTCONF Secure (TLS) operations
 ${RESTPORT}       8282    # Deprecated. Restconf port used by AD-SAL services. FIXME: Eradicate.
+${REST_API}       /rests/data
 ${REVOKE_TOKEN_API}    /oauth2/revoke    # FIXME: Move to a separate AAA-related Resource and add description.
 ${SCOPE}          sdn    # Scope, used for some types of HTTP requests agains ODL RESTCONF. TODO: Migrate most suites to TemplatedRequests or AuthStandalone, then chose a more descriptive name.
 &{SEND_ACCEPT_XML_HEADERS}    Content-Type=application/xml    Accept=application/xml    # Accept and Content type for XML data. TODO: Hide into more specific Resource if possible.

diff --git a/csit/variables/netconf/CRUD/augment/location.uri b/csit/variables/netconf/CRUD/augment/location.uri
index c54ed99e921933d38b23dab0f9d15a4164a50f1e..a08b06311f279717cfc01ffd489d58f4a35573a6 100644 (file)
--- a/csit/variables/netconf/CRUD/augment/location.uri
+++ b/csit/variables/netconf/CRUD/augment/location.uri
@@ -1 +1 @@
-rests/data/network-topology:network-topology/topology=topology-netconf/node=$DEVICE_NAME/yang-ext:mount/main:cont/cont1/reset
+rests/data/network-topology:network-topology/topology=topology-netconf/node=$DEVICE_NAME/yang-ext:mount/main:cont/augment-main-a:cont1/reset

diff --git a/csit/variables/netconf/CRUD/cars/location.uri b/csit/variables/netconf/CRUD/cars/location.uri
index 178b4a986616b1cb39c401c7942798ff8cd522b4..34fc59a82314a68b4c07d034cf79607953688b6a 100644 (file)
--- a/csit/variables/netconf/CRUD/cars/location.uri
+++ b/csit/variables/netconf/CRUD/cars/location.uri
@@ -1 +1 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME/yang-ext:mount
+rests/data/network-topology:network-topology/topology=topology-netconf/node=$DEVICE_NAME/yang-ext:mount

diff --git a/csit/variables/netconf/CRUD/datamod1/location.uri b/csit/variables/netconf/CRUD/datamod1/location.uri
index 08a49b2d6d6b19f0a676d96cca6a2e8dea936fc7..3d99af641674a11ba21facaaafe012279a8528d4 100644 (file)
--- a/csit/variables/netconf/CRUD/datamod1/location.uri
+++ b/csit/variables/netconf/CRUD/datamod1/location.uri
@@ -1 +1 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME/yang-ext:mount/test:cont
+rests/data/network-topology:network-topology/topology=topology-netconf/node=$DEVICE_NAME/yang-ext:mount/test:cont

diff --git a/csit/variables/netconf/CRUD/datamod2/location.uri b/csit/variables/netconf/CRUD/datamod2/location.uri
index 08a49b2d6d6b19f0a676d96cca6a2e8dea936fc7..3d99af641674a11ba21facaaafe012279a8528d4 100644 (file)
--- a/csit/variables/netconf/CRUD/datamod2/location.uri
+++ b/csit/variables/netconf/CRUD/datamod2/location.uri
@@ -1 +1 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME/yang-ext:mount/test:cont
+rests/data/network-topology:network-topology/topology=topology-netconf/node=$DEVICE_NAME/yang-ext:mount/test:cont

diff --git a/csit/variables/netconf/CRUD/datamod3/location.uri b/csit/variables/netconf/CRUD/datamod3/location.uri
index 08a49b2d6d6b19f0a676d96cca6a2e8dea936fc7..3d99af641674a11ba21facaaafe012279a8528d4 100644 (file)
--- a/csit/variables/netconf/CRUD/datamod3/location.uri
+++ b/csit/variables/netconf/CRUD/datamod3/location.uri
@@ -1 +1 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME/yang-ext:mount/test:cont
+rests/data/network-topology:network-topology/topology=topology-netconf/node=$DEVICE_NAME/yang-ext:mount/test:cont

diff --git a/csit/variables/netconf/CRUD/datamodjson/location.uri b/csit/variables/netconf/CRUD/datamodjson/location.uri
index 08a49b2d6d6b19f0a676d96cca6a2e8dea936fc7..3d99af641674a11ba21facaaafe012279a8528d4 100644 (file)
--- a/csit/variables/netconf/CRUD/datamodjson/location.uri
+++ b/csit/variables/netconf/CRUD/datamodjson/location.uri
@@ -1 +1 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME/yang-ext:mount/test:cont
+rests/data/network-topology:network-topology/topology=topology-netconf/node=$DEVICE_NAME/yang-ext:mount/test:cont

diff --git a/csit/variables/netconf/CRUD/dataorig/location.uri b/csit/variables/netconf/CRUD/dataorig/location.uri
index 178b4a986616b1cb39c401c7942798ff8cd522b4..34fc59a82314a68b4c07d034cf79607953688b6a 100644 (file)
--- a/csit/variables/netconf/CRUD/dataorig/location.uri
+++ b/csit/variables/netconf/CRUD/dataorig/location.uri
@@ -1 +1 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME/yang-ext:mount
+rests/data/network-topology:network-topology/topology=topology-netconf/node=$DEVICE_NAME/yang-ext:mount

diff --git a/csit/variables/netconf/CRUD/item1/location.uri b/csit/variables/netconf/CRUD/item1/location.uri
index 648baed14ddbb33f844c1a3aefbc6d07d3349fd6..f08c7c607a379ecb07fa9d02a3dc16bf4a0064ab 100644 (file)
--- a/csit/variables/netconf/CRUD/item1/location.uri
+++ b/csit/variables/netconf/CRUD/item1/location.uri
@@ -1 +1 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME/yang-ext:mount/car:cars
+rests/data/network-topology:network-topology/topology=topology-netconf/node=$DEVICE_NAME/yang-ext:mount/car:cars

diff --git a/csit/variables/netconf/CRUD/item2/location.uri b/csit/variables/netconf/CRUD/item2/location.uri
index 648baed14ddbb33f844c1a3aefbc6d07d3349fd6..f08c7c607a379ecb07fa9d02a3dc16bf4a0064ab 100644 (file)
--- a/csit/variables/netconf/CRUD/item2/location.uri
+++ b/csit/variables/netconf/CRUD/item2/location.uri
@@ -1 +1 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME/yang-ext:mount/car:cars
+rests/data/network-topology:network-topology/topology=topology-netconf/node=$DEVICE_NAME/yang-ext:mount/car:cars

diff --git a/csit/variables/netconf/KeyAuth/location.uri b/csit/variables/netconf/KeyAuth/location.uri
index 9d3f09af4bb0badc5614ab82f9d6d259ade747c8..1d67c47729887f1a19a6676c3ee240232b5f7932 100644 (file)
--- a/csit/variables/netconf/KeyAuth/location.uri
+++ b/csit/variables/netconf/KeyAuth/location.uri
@@ -1 +1 @@
-restconf/operations/netconf-keystore:add-keystore-entry
+rests/operations/netconf-keystore:add-keystore-entry

diff --git a/csit/variables/netconf/RestPerfClient/cars-delete/location.uri b/csit/variables/netconf/RestPerfClient/cars-delete/location.uri
index 09038c8a8feac0e6775f286eca27ca8a7bfe0fc3..3222aa8e9809eea6146c9a0e8453f36cd35651c1 100644 (file)
--- a/csit/variables/netconf/RestPerfClient/cars-delete/location.uri
+++ b/csit/variables/netconf/RestPerfClient/cars-delete/location.uri
@@ -1 +1 @@
-restconf/config/car:cars
+rests/data/car:cars

diff --git a/csit/variables/netconf/RestPerfClient/cars/location.uri b/csit/variables/netconf/RestPerfClient/cars/location.uri
index b0220ee26cc7b87d5402aa0dfc35005de34442b6..02337373b72f822c41cd6cb2bb533574c86cda6b 100644 (file)
--- a/csit/variables/netconf/RestPerfClient/cars/location.uri
+++ b/csit/variables/netconf/RestPerfClient/cars/location.uri
@@ -1 +1 @@
-restconf/config
+rests/data

diff --git a/csit/variables/netconf/device/bug8086/location.uri b/csit/variables/netconf/device/bug8086/location.uri
index cbacc6993dbf4bdc5f9321483ec8480628c3fa45..58e2540229cbe41ffe306fcf9550b287b8873c31 100644 (file)
--- a/csit/variables/netconf/device/bug8086/location.uri
+++ b/csit/variables/netconf/device/bug8086/location.uri
@@ -1 +1 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME
+rests/data/network-topology:network-topology/topology=topology-netconf/node=$DEVICE_NAME

diff --git a/csit/variables/netconf/device/configure-via-topology/location.uri b/csit/variables/netconf/device/configure-via-topology/location.uri
index cbacc6993dbf4bdc5f9321483ec8480628c3fa45..58e2540229cbe41ffe306fcf9550b287b8873c31 100644 (file)
--- a/csit/variables/netconf/device/configure-via-topology/location.uri
+++ b/csit/variables/netconf/device/configure-via-topology/location.uri
@@ -1 +1 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME
+rests/data/network-topology:network-topology/topology=topology-netconf/node=$DEVICE_NAME

diff --git a/csit/variables/netconf/device/full-uri-device-key/location.uri b/csit/variables/netconf/device/full-uri-device-key/location.uri
index cbacc6993dbf4bdc5f9321483ec8480628c3fa45..58e2540229cbe41ffe306fcf9550b287b8873c31 100644 (file)
--- a/csit/variables/netconf/device/full-uri-device-key/location.uri
+++ b/csit/variables/netconf/device/full-uri-device-key/location.uri
@@ -1 +1 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME
+rests/data/network-topology:network-topology/topology=topology-netconf/node=$DEVICE_NAME

diff --git a/csit/variables/netconf/device/full-uri-device/location.uri b/csit/variables/netconf/device/full-uri-device/location.uri
index cbacc6993dbf4bdc5f9321483ec8480628c3fa45..58e2540229cbe41ffe306fcf9550b287b8873c31 100644 (file)
--- a/csit/variables/netconf/device/full-uri-device/location.uri
+++ b/csit/variables/netconf/device/full-uri-device/location.uri
@@ -1 +1 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME
+rests/data/network-topology:network-topology/topology=topology-netconf/node=$DEVICE_NAME

diff --git a/csit/variables/netconf/device/full-uri-mount/location.uri b/csit/variables/netconf/device/full-uri-mount/location.uri
index 178b4a986616b1cb39c401c7942798ff8cd522b4..34fc59a82314a68b4c07d034cf79607953688b6a 100644 (file)
--- a/csit/variables/netconf/device/full-uri-mount/location.uri
+++ b/csit/variables/netconf/device/full-uri-mount/location.uri
@@ -1 +1 @@
-restconf/config/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME/yang-ext:mount
+rests/data/network-topology:network-topology/topology=topology-netconf/node=$DEVICE_NAME/yang-ext:mount

diff --git a/csit/variables/netconf/device/netconf-state/location.uri b/csit/variables/netconf/device/netconf-state/location.uri
index 838d1f91830fa0e5968c043a843d67a7ea176ad3..42fb973289e7f56ca2eeff93be240b1959d94d72 100644 (file)
--- a/csit/variables/netconf/device/netconf-state/location.uri
+++ b/csit/variables/netconf/device/netconf-state/location.uri
@@ -1 +1 @@
-restconf/operational/network-topology:network-topology/topology/topology-netconf/node/$DEVICE_NAME/yang-ext:mount/ietf-netconf-monitoring:netconf-state
+rests/data/network-topology:network-topology/topology=topology-netconf/node=$DEVICE_NAME/yang-ext:mount/ietf-netconf-monitoring:netconf-state?content=nonconfig

diff --git a/csit/variables/netconf/device/rpc-create-device/location.uri b/csit/variables/netconf/device/rpc-create-device/location.uri
index b5cdab69d670c7e3db1298b0dc166461dedd9be0..14b59e65ef3f1844a833c99983e05cd41839504c 100644 (file)
--- a/csit/variables/netconf/device/rpc-create-device/location.uri
+++ b/csit/variables/netconf/device/rpc-create-device/location.uri
@@ -1 +1 @@
-restconf/operations/netconf-node-topology:create-device
+rests/operations/netconf-node-topology:create-device

diff --git a/csit/variables/netconf/device/rpc-delete-device/location.uri b/csit/variables/netconf/device/rpc-delete-device/location.uri
index 87ca05d7cf46d7deae7cfa3dcf1f02d5edc9234f..e1b982b3c3a78b2380bbecac333b2837e3618038 100644 (file)
--- a/csit/variables/netconf/device/rpc-delete-device/location.uri
+++ b/csit/variables/netconf/device/rpc-delete-device/location.uri
@@ -1 +1 @@
-restconf/operations/netconf-node-topology:delete-device
+rests/operations/netconf-node-topology:delete-device

diff --git a/csit/variables/netconf/device/rpc-device/location.uri b/csit/variables/netconf/device/rpc-device/location.uri
index 2d154007e0e15f1f9e9ceacff83eb74a227e56e3..8b0a475b6d44f8508d45956dabf49732dda3b7ec 100644 (file)
--- a/csit/variables/netconf/device/rpc-device/location.uri
+++ b/csit/variables/netconf/device/rpc-device/location.uri
@@ -1 +1 @@
-restconf/operations/netconf-node-topology:add-netconf-node
+rests/operations/netconf-node-topology:add-netconf-node