Upgrade RF syntax for v3.2 compatibility

[integration/test.git] / csit / libraries / CheckJVMResource.robot

diff --git a/csit/libraries/CheckJVMResource.robot b/csit/libraries/CheckJVMResource.robot
index dcfd82f551ad211bf4964677ab1464c4356fc00b..07d24a5e06887bdc3c3ea58d8f0d1480cee5b20e 100644 (file)
--- a/csit/libraries/CheckJVMResource.robot
+++ b/csit/libraries/CheckJVMResource.robot
@@ -5,46 +5,48 @@ Variables         ${CURDIR}/../variables/Variables.py
 
 *** Keywords ***
 Get JVM Memory
+    [Arguments]    ${controller-ip}=${ODL_SYSTEM_IP}    ${elastic-port}=${ELASTICPORT}
     [Documentation]    Return latest jvm Memory object
-    [Arguments]     ${controller-ip}=${ODL_SYSTEM_IP}       ${elastic-port}=${ELASTICPORT}
     ${session}    ElasticsearchAppender.Get_Connection    ${controller-ip}    ${elastic-port}
-    ${value}=    ElasticsearchAppender.Get Jvm Memory       ${session}
+    ${value}=    ElasticsearchAppender.Get Jvm Memory    ${session}
     Log    ${value}
     [Return]    ${value}
 
 Get JVM Threading
+    [Arguments]    ${controller-ip}=${ODL_SYSTEM_IP}    ${elastic-port}=${ELASTICPORT}
     [Documentation]    Return latest jvm Threading object
-    [Arguments]     ${controller-ip}=${ODL_SYSTEM_IP}       ${elastic-port}=${ELASTICPORT}
     ${session}    ElasticsearchAppender.Get_Connection    ${controller-ip}    ${elastic-port}
-    ${value}=    ElasticsearchAppender.Get Jvm Threading       ${session}
+    ${value}=    ElasticsearchAppender.Get Jvm Threading    ${session}
     Log    ${value}
     [Return]    ${value}
 
 Get JVM Classloading
+    [Arguments]    ${controller-ip}=${ODL_SYSTEM_IP}    ${elastic-port}=${ELASTICPORT}
     [Documentation]    Return latest jvm Classloading object
-    [Arguments]     ${controller-ip}=${ODL_SYSTEM_IP}       ${elastic-port}=${ELASTICPORT}
     ${session}    ElasticsearchAppender.Get_Connection    ${controller-ip}    ${elastic-port}
-    ${value}=    ElasticsearchAppender.Get Jvm Classloading      ${session}
+    ${value}=    ElasticsearchAppender.Get Jvm Classloading    ${session}
     Log    ${value}
     [Return]    ${value}
 
 Get JVM Operatingsystem
+    [Arguments]    ${controller-ip}=${ODL_SYSTEM_IP}    ${elastic-port}=${ELASTICPORT}
     [Documentation]    Return latest jvm Operatingsystem object
-    [Arguments]     ${controller-ip}=${ODL_SYSTEM_IP}       ${elastic-port}=${ELASTICPORT}
     ${session}    ElasticsearchAppender.Get_Connection    ${controller-ip}    ${elastic-port}
-    ${value}=    ElasticsearchAppender.Get Jvm Operatingsystem      ${session}
+    ${value}=    ElasticsearchAppender.Get Jvm Operatingsystem    ${session}
     Log    ${value}
     [Return]    ${value}
 
 Create JVM Plots
-    [Documentation]    Draw Resource usage plot using plot_points method.
     [Arguments]    ${controllers_number}=${NUM_ODL_SYSTEM}    ${elastic-port}=${ELASTICPORT}
-    : FOR    ${index}    IN RANGE    1    ${controllers_number}+1
-    \    ${controller-ip}=      Builtin.Set Variable   ${ODL_SYSTEM_${index}_IP}
-    \    Log    ${controller-ip}
-    \    ${session}    ElasticsearchAppender.Get_Connection    ${controller-ip}    ${elastic-port}
-    \    Log    ${session}
-    \    ElasticsearchAppender.Plot Points    ${session}    JVM ThreadCount    threadcount_${index}.png    'Threading'    'TotalStartedThreadCount'
-    \    ElasticsearchAppender.Plot Points    ${session}    JVM Heap Memory    heapmemory_${index}.png    'Memory'    'HeapMemoryUsage'    'used'
-    \    ElasticsearchAppender.Plot Points    ${session}    JVM LoadedClassCount    class_count_${index}.png    'ClassLoading'    'TotalLoadedClassCount'
-    \    ElasticsearchAppender.Plot Points    ${session}    JVM CPU Usage    cpu_usage_${index}.png    'OperatingSystem'    'ProcessCpuLoad'
+    [Documentation]    Draw Resource usage plot using plot_points method.
+    FOR    ${index}    IN RANGE    1    ${controllers_number}+1
+        ${controller-ip}=    Builtin.Set Variable    ${ODL_SYSTEM_${index}_IP}
+        Log    ${controller-ip}
+        ${session}    ElasticsearchAppender.Get_Connection    ${controller-ip}    ${elastic-port}
+        Log    ${session}
+        ElasticsearchAppender.Plot Points    ${session}    JVM Threads    threadcount_${index}.png    'Threading'    'ThreadCount'
+        ElasticsearchAppender.Plot Points    ${session}    JVM Heap Memory    heapmemory_${index}.png    'Memory'    'HeapMemoryUsage'
+        ...    'used'
+        ElasticsearchAppender.Plot Points    ${session}    JVM Loaded Classes    class_count_${index}.png    'ClassLoading'    'TotalLoadedClassCount'
+        ElasticsearchAppender.Plot Points    ${session}    JVM CPU Usage    cpu_usage_${index}.png    'OperatingSystem'    'ProcessCpuLoad'
+    END