From 2f9b1fe43ae1f54d30a944b6a9e53e15c96e788f Mon Sep 17 00:00:00 2001 From: Sfarouq-ext Date: Fri, 5 Jul 2024 14:17:42 +0000 Subject: [PATCH 1/4] Refactor Linux SNMP DiskIO robot test to robot-example --- tests/robot/os/linux/snmp/diskio.robot | 36 +++++++++++++++ tests/robot/os/linux/snmp/os-linux-snmp.robot | 45 ------------------- 2 files changed, 36 insertions(+), 45 deletions(-) create mode 100644 tests/robot/os/linux/snmp/diskio.robot delete mode 100644 tests/robot/os/linux/snmp/os-linux-snmp.robot diff --git a/tests/robot/os/linux/snmp/diskio.robot b/tests/robot/os/linux/snmp/diskio.robot new file mode 100644 index 000000000..eb223be39 --- /dev/null +++ b/tests/robot/os/linux/snmp/diskio.robot @@ -0,0 +1,36 @@ +*** Settings *** +Documentation OS Linux SNMP plugin + +Resource ${CURDIR}${/}..${/}..${/}..${/}..${/}resources/import.resource + +Test Timeout 120s + + +*** Variables *** +${CMD} ${CENTREON_PLUGINS} --plugin=os::linux::snmp::plugin + + +*** Test Cases *** +Linux SNMP list diskio devices ${documentation} ${tc}/2 + [Tags] os linux snmp + ${command} Catenate + ... ${CMD} + ... --mode=list-diskio + ... --hostname=127.0.0.1 + ... --snmp-version=2 + ... --snmp-port=2024 + ... --disco-show + ... --snmp-community=${snmpcommunity} + ${output} Run ${command} + Log To Console ${command} + ${nb_results} Get Element Count + ... ${output} + ... label + Should Be Equal As Integers + ... ${expected_result} + ... ${nb_results} + ... Wrong output result for list diskio devices: ${snmpcommunity}.{\n}Command output:{\n}${output} + + Examples: documentation tc snmpcommunity expected_result -- + ... First run 1 os/linux/snmp/list-diskio 10 + ... Second run 2 os/linux/snmp/list-diskio-2 4 \ No newline at end of file diff --git a/tests/robot/os/linux/snmp/os-linux-snmp.robot b/tests/robot/os/linux/snmp/os-linux-snmp.robot deleted file mode 100644 index de69eb79a..000000000 --- a/tests/robot/os/linux/snmp/os-linux-snmp.robot +++ /dev/null @@ -1,45 +0,0 @@ -*** Settings *** -Documentation OS Linux SNMP plugin - -Resource ${CURDIR}${/}..${/}..${/}..${/}..${/}resources/import.resource - -Test Timeout 120s - - -*** Variables *** -${CMD} ${CENTREON_PLUGINS} --plugin=os::linux::snmp::plugin - -&{list_diskio_test1} -... snmpcommunity=os/linux/snmp/list-diskio -... nbresults=10 -&{list_diskio_test2} -... snmpcommunity=os/linux/snmp/list-diskio-2 -... nbresults=4 -@{list_diskio_tests} -... &{list_diskio_test1} -... &{list_diskio_test2} - - -*** Test Cases *** -Linux SNMP list diskio devices - [Documentation] List Linux diskio devices - [Tags] os linux snmp - FOR ${list_diskio_test} IN @{list_diskio_tests} - ${command} Catenate - ... ${CMD} - ... --mode=list-diskio - ... --hostname=127.0.0.1 - ... --snmp-version=2 - ... --snmp-port=2024 - ... --disco-show - ... --snmp-community=${list_diskio_test.snmpcommunity} - ${output} Run ${command} - Log To Console ${command} - ${nb_results} Get Element Count - ... ${output} - ... label - Should Be Equal As Integers - ... ${list_diskio_test.nbresults} - ... ${nb_results} - ... Wrong output result for list diskio devices: ${list_diskio_test}.{\n}Command output:{\n}${output} - END From 8a2fba3a2560fddee39cdefe0f061757a803b16a Mon Sep 17 00:00:00 2001 From: omercier <32134301+omercier@users.noreply.github.com> Date: Fri, 5 Jul 2024 17:28:12 +0200 Subject: [PATCH 2/4] Update diskio.pm --- src/snmp_standard/mode/diskio.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/src/snmp_standard/mode/diskio.pm b/src/snmp_standard/mode/diskio.pm index 7138101e0..9df6c1b30 100644 --- a/src/snmp_standard/mode/diskio.pm +++ b/src/snmp_standard/mode/diskio.pm @@ -297,7 +297,6 @@ sub disco_show { } } - 1; __END__ From 90f3d1427a6fe55dc48d52e3a9d3d43936f23c25 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 9 Jul 2024 13:56:18 +0000 Subject: [PATCH 3/4] refactor and renaming test --- .../snmp/{diskio.robot => list-diskio.robot} | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) rename tests/robot/os/linux/snmp/{diskio.robot => list-diskio.robot} (54%) diff --git a/tests/robot/os/linux/snmp/diskio.robot b/tests/robot/os/linux/snmp/list-diskio.robot similarity index 54% rename from tests/robot/os/linux/snmp/diskio.robot rename to tests/robot/os/linux/snmp/list-diskio.robot index eb223be39..15ba6333f 100644 --- a/tests/robot/os/linux/snmp/diskio.robot +++ b/tests/robot/os/linux/snmp/list-diskio.robot @@ -1,5 +1,5 @@ *** Settings *** -Documentation OS Linux SNMP plugin +Documentation Check the list-diskio mode Resource ${CURDIR}${/}..${/}..${/}..${/}..${/}resources/import.resource @@ -11,8 +11,9 @@ ${CMD} ${CENTREON_PLUGINS} --plugin=os::linux::snmp::plugin *** Test Cases *** -Linux SNMP list diskio devices ${documentation} ${tc}/2 - [Tags] os linux snmp +List diskio ${tc} + [Documentation] Check the number of returned disks + [Tags] os linux snmp service-disco ${command} Catenate ... ${CMD} ... --mode=list-diskio @@ -22,15 +23,14 @@ Linux SNMP list diskio devices ${documentation} ${tc}/2 ... --disco-show ... --snmp-community=${snmpcommunity} ${output} Run ${command} - Log To Console ${command} ${nb_results} Get Element Count ... ${output} ... label Should Be Equal As Integers ... ${expected_result} ... ${nb_results} - ... Wrong output result for list diskio devices: ${snmpcommunity}.{\n}Command output:{\n}${output} + ... Wrong output result for command:{\n}{\n}${command}{\n}{\n}Command output:{\n}{\n}${output} - Examples: documentation tc snmpcommunity expected_result -- - ... First run 1 os/linux/snmp/list-diskio 10 - ... Second run 2 os/linux/snmp/list-diskio-2 4 \ No newline at end of file + Examples: tc snmpcommunity expected_result -- + ... 1 os/linux/snmp/list-diskio 10 + ... 2 os/linux/snmp/list-diskio-2 4 \ No newline at end of file From c3d939ebb847027f5583c1d692c28beec638877f Mon Sep 17 00:00:00 2001 From: omercier <32134301+omercier@users.noreply.github.com> Date: Tue, 9 Jul 2024 18:02:05 +0200 Subject: [PATCH 4/4] Update diskio.pm --- src/snmp_standard/mode/diskio.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/src/snmp_standard/mode/diskio.pm b/src/snmp_standard/mode/diskio.pm index 9df6c1b30..7138101e0 100644 --- a/src/snmp_standard/mode/diskio.pm +++ b/src/snmp_standard/mode/diskio.pm @@ -297,6 +297,7 @@ sub disco_show { } } + 1; __END__