Fix wrong mapping type for templated requests in netconf

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

diff --git a/csit/suites/netconf/clustering/CRUD.robot b/csit/suites/netconf/clustering/CRUD.robot
index d23fc6d3441bd5c6b24996a6adc05f2ee77109d0..7cf3f6637cc351c802bfba04f195772f716e1d96 100644 (file)
--- a/csit/suites/netconf/clustering/CRUD.robot
+++ b/csit/suites/netconf/clustering/CRUD.robot
@@ -41,7 +41,6 @@ Library           OperatingSystem
 Library           String
 Library           SSHLibrary    timeout=10s
 Resource          ${CURDIR}/../../../libraries/FailFast.robot
-Resource          ${CURDIR}/../../../libraries/KarafKeywords.robot
 Resource          ${CURDIR}/../../../libraries/NetconfKeywords.robot
 Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
@@ -52,7 +51,7 @@ Variables         ${CURDIR}/../../../variables/Variables.py
 ${NODE_CONFIGURER}    node1
 ${NODE_SETTER}    node2
 ${NODE_CHECKER}    node3
-${DEVICE_CHECK_TIMEOUT}    60s
+${DEVICE_CHECK_TIMEOUT}    10s
 ${DEVICE_NAME}    netconf-test-device
 ${directory_with_template_folders}    ${CURDIR}/../../../variables/netconf/CRUD
 ${empty_data}     <data xmlns="${ODL_NETCONF_NAMESPACE}"></data>
@@ -106,7 +105,7 @@ Check_Device_Data_Is_Seen_As_Empty_On_Setter
 
 Create_Device_Data
     [Documentation]    Send some sample test data 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}${/}dataorig    ${template_as_string}    session=${NODE_SETTER}
 
 Check_New_Device_Data_Is_Visible_On_Setter
@@ -123,7 +122,7 @@ Check_New_Device_Data_Is_Visible_On_Configurer
 
 Modify_Device_Data
     [Documentation]    Send a request to change the sample test data 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.Put_As_Xml_Templated    ${directory_with_template_folders}${/}datamod1    ${template_as_string}    session=${NODE_SETTER}
     [Teardown]    Utils.Report_Failure_Due_To_Bug    4968
 
@@ -144,7 +143,7 @@ Check_Modified_Device_Data_Is_Visible_On_Configurer
 
 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.Set_Variable    {'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}    session=${NODE_SETTER}
     [Teardown]    Utils.Report_Failure_Due_To_Bug    4968
 
@@ -190,7 +189,7 @@ Check_Device_Deconfigured_On_Setter
 
 *** Keywords ***
 Setup_Everything
-    [Documentation]    Setup everything needed for the test cases.
+    [Documentation]    Initialize SetupUtils, setup everything needed for the test cases.
     # Setup resources used by the suite.
     SetupUtils.Setup_Utils_For_Setup_And_Teardown
     NetconfKeywords.Setup_Netconf_Keywords    create_session_for_templated_requests=False