X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FCheckJVMResource.robot;h=760f0660d4d9b8066925c17fc338c919baa9aa33;hb=033387bc885c6f508c1be28ec8ae5d511a2734c7;hp=f19bbed97b4a2ee5ca303ee73c6c8e7adb22e320;hpb=599002f4d824dcca0d14c20a66d67e0b3310d8cb;p=integration%2Ftest.git

diff --git a/csit/libraries/CheckJVMResource.robot b/csit/libraries/CheckJVMResource.robot
index f19bbed97b..760f0660d4 100644
--- a/csit/libraries/CheckJVMResource.robot
+++ b/csit/libraries/CheckJVMResource.robot
@@ -5,44 +5,47 @@ 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
+    [Arguments]    ${controllers_number}=${NUM_ODL_SYSTEM}    ${elastic-port}=${ELASTICPORT}
     [Documentation]    Draw Resource usage plot using plot_points method.
-    [Arguments]     ${controller-ip}=${ODL_SYSTEM_IP}       ${elastic-port}=${ELASTICPORT}
-    ${session}    ElasticsearchAppender.Get_Connection    ${controller-ip}    ${elastic-port}
-    Log    ${session}
-    Plot Points    ${session}    JVM ThreadCount    threadcount.png    'Threading'    'TotalStartedThreadCount'
-    Plot Points    ${session}    JVM Heap Memory    heapmemory.png    'Memory'    'HeapMemoryUsage'    'used'
-    Plot Points    ${session}    JVM LoadedClassCount    class_count.png    'ClassLoading'    'TotalLoadedClassCount'
-    Plot Points    ${session}    JVM CPU Usage    cpu_usage.png    'OperatingSystem'    'ProcessCpuLoad'
+    : 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'