Migrate netconf suites restconf calls to rfc8040

[integration/test.git] / csit / suites / netconf / clustering / outages.robot

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}