fix(various): DataDomain --> datadomain + fixed tests

centreon · Nov 5, 2024 · 1e064e3 · 1e064e3
1 parent 2b85516
commit 1e064e3
Show file tree

Hide file tree

Showing 32 changed files with 83 additions and 80 deletions.
diff --git a/packaging/centreon-plugin-Hardware-Storage-Emc-Datadomain-Snmp/pkg.json b/packaging/centreon-plugin-Hardware-Storage-Emc-Datadomain-Snmp/pkg.json
@@ -6,6 +6,6 @@
         "centreon/plugins/script_custom.pm",
         "centreon/plugins/script_snmp.pm",
         "centreon/plugins/snmp.pm",
-        "storage/emc/DataDomain/snmp/"
+        "storage/emc/datadomain/snmp/"
     ]
-}
+}
diff --git a/...rage/emc/DataDomain/snmp/lib/functions.pm → ...rage/emc/datadomain/snmp/lib/functions.pm b/...rage/emc/DataDomain/snmp/lib/functions.pm → ...rage/emc/datadomain/snmp/lib/functions.pm
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-package storage::emc::DataDomain::snmp::lib::functions;
+package storage::emc::datadomain::snmp::lib::functions;
 
 sub get_version {
     my (%options) = @_;

diff --git a/...torage/emc/DataDomain/snmp/mode/alerts.pm → ...torage/emc/datadomain/snmp/mode/alerts.pm b/...torage/emc/DataDomain/snmp/mode/alerts.pm → ...torage/emc/datadomain/snmp/mode/alerts.pm
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-package storage::emc::DataDomain::snmp::mode::alerts;
+package storage::emc::datadomain::snmp::mode::alerts;
 
 use base qw(centreon::plugins::templates::counter);
 

diff --git a/...rage/emc/DataDomain/snmp/mode/cleaning.pm → ...rage/emc/datadomain/snmp/mode/cleaning.pm b/...rage/emc/DataDomain/snmp/mode/cleaning.pm → ...rage/emc/datadomain/snmp/mode/cleaning.pm
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-package storage::emc::DataDomain::snmp::mode::cleaning;
+package storage::emc::datadomain::snmp::mode::cleaning;
 
 use base qw(centreon::plugins::templates::counter);
 

diff --git a/...ataDomain/snmp/mode/components/battery.pm → ...atadomain/snmp/mode/components/battery.pm b/...ataDomain/snmp/mode/components/battery.pm → ...atadomain/snmp/mode/components/battery.pm
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-package storage::emc::DataDomain::snmp::mode::components::battery;
+package storage::emc::datadomain::snmp::mode::components::battery;
 
 use strict;
 use warnings;

diff --git a/...c/DataDomain/snmp/mode/components/disk.pm → ...c/datadomain/snmp/mode/components/disk.pm b/...c/DataDomain/snmp/mode/components/disk.pm → ...c/datadomain/snmp/mode/components/disk.pm
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-package storage::emc::DataDomain::snmp::mode::components::disk;
+package storage::emc::datadomain::snmp::mode::components::disk;
 
 use strict;
 use warnings;

diff --git a/...mc/DataDomain/snmp/mode/components/fan.pm → ...mc/datadomain/snmp/mode/components/fan.pm b/...mc/DataDomain/snmp/mode/components/fan.pm → ...mc/datadomain/snmp/mode/components/fan.pm
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-package storage::emc::DataDomain::snmp::mode::components::fan;
+package storage::emc::datadomain::snmp::mode::components::fan;
 
 use strict;
 use warnings;

diff --git a/...mc/DataDomain/snmp/mode/components/psu.pm → ...mc/datadomain/snmp/mode/components/psu.pm b/...mc/DataDomain/snmp/mode/components/psu.pm → ...mc/datadomain/snmp/mode/components/psu.pm
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-package storage::emc::DataDomain::snmp::mode::components::psu;
+package storage::emc::datadomain::snmp::mode::components::psu;
 
 use strict;
 use warnings;

diff --git a/...omain/snmp/mode/components/temperature.pm → ...omain/snmp/mode/components/temperature.pm b/...omain/snmp/mode/components/temperature.pm → ...omain/snmp/mode/components/temperature.pm
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-package storage::emc::DataDomain::snmp::mode::components::temperature;
+package storage::emc::datadomain::snmp::mode::components::temperature;
 
 use strict;
 use warnings;

diff --git a/...e/emc/DataDomain/snmp/mode/filesystems.pm → ...e/emc/datadomain/snmp/mode/filesystems.pm b/...e/emc/DataDomain/snmp/mode/filesystems.pm → ...e/emc/datadomain/snmp/mode/filesystems.pm
@@ -18,13 +18,13 @@
 # limitations under the License.
 #
 
-package storage::emc::DataDomain::snmp::mode::filesystems;
+package storage::emc::datadomain::snmp::mode::filesystems;
 
 use base qw(centreon::plugins::templates::counter);
 
 use strict;
 use warnings;
-use storage::emc::DataDomain::snmp::lib::functions;
+use storage::emc::datadomain::snmp::lib::functions;
 
 sub custom_disk_usage_output {
     my ($self, %options) = @_;
@@ -166,7 +166,7 @@ sub manage_selection {
         oids => [ $oid_sysDescr ],
         nothing_quit => 1
     );
-    if (!($self->{os_version} = storage::emc::DataDomain::snmp::lib::functions::get_version(value => $snmp_result->{$oid_sysDescr}))) {
+    if (!($self->{os_version} = storage::emc::datadomain::snmp::lib::functions::get_version(value => $snmp_result->{$oid_sysDescr}))) {
         $self->{output}->output_add(
             severity => 'UNKNOWN',
             short_msg => 'Cannot get DataDomain OS version.'

diff --git a/...rage/emc/DataDomain/snmp/mode/hardware.pm → ...rage/emc/datadomain/snmp/mode/hardware.pm b/...rage/emc/DataDomain/snmp/mode/hardware.pm → ...rage/emc/datadomain/snmp/mode/hardware.pm
@@ -18,13 +18,13 @@
 # limitations under the License.
 #
 
-package storage::emc::DataDomain::snmp::mode::hardware;
+package storage::emc::datadomain::snmp::mode::hardware;
 
 use base qw(centreon::plugins::templates::hardware);
 
 use strict;
 use warnings;
-use storage::emc::DataDomain::snmp::lib::functions;
+use storage::emc::datadomain::snmp::lib::functions;
 
 sub set_system {
     my ($self, %options) = @_;
@@ -75,7 +75,7 @@ sub set_system {
         ]
     };
 
-    $self->{components_path} = 'storage::emc::DataDomain::snmp::mode::components';
+    $self->{components_path} = 'storage::emc::datadomain::snmp::mode::components';
     $self->{components_module} = ['fan', 'temperature', 'psu', 'disk', 'battery'];
 }
 
@@ -101,7 +101,7 @@ sub get_version {
 
     my $oid_sysDescr = '.1.3.6.1.2.1.1.1.0'; # 'Data Domain OS 5.4.1.1-411752'
     my $result = $options{snmp}->get_leef(oids => [ $oid_sysDescr ]);
-    if (!($self->{os_version} = storage::emc::DataDomain::snmp::lib::functions::get_version(value => $result->{$oid_sysDescr}))) {
+    if (!($self->{os_version} = storage::emc::datadomain::snmp::lib::functions::get_version(value => $result->{$oid_sysDescr}))) {
         $self->{output}->output_add(
             severity => 'UNKNOWN',
             short_msg => 'Cannot get DataDomain OS version.'

diff --git a/...ge/emc/DataDomain/snmp/mode/interfaces.pm → ...ge/emc/datadomain/snmp/mode/interfaces.pm b/...ge/emc/DataDomain/snmp/mode/interfaces.pm → ...ge/emc/datadomain/snmp/mode/interfaces.pm
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-package storage::emc::DataDomain::snmp::mode::interfaces;
+package storage::emc::datadomain::snmp::mode::interfaces;
 
 use base qw(snmp_standard::mode::interfaces);
 

diff --git a/...c/DataDomain/snmp/mode/listfilesystems.pm → ...c/datadomain/snmp/mode/listfilesystems.pm b/...c/DataDomain/snmp/mode/listfilesystems.pm → ...c/datadomain/snmp/mode/listfilesystems.pm
@@ -18,13 +18,13 @@
 # limitations under the License.
 #
 
-package storage::emc::DataDomain::snmp::mode::listfilesystems;
+package storage::emc::datadomain::snmp::mode::listfilesystems;
 
 use base qw(centreon::plugins::mode);
 
 use strict;
 use warnings;
-use storage::emc::DataDomain::snmp::lib::functions;
+use storage::emc::datadomain::snmp::lib::functions;
 
 sub new {
     my ($class, %options) = @_;
@@ -55,7 +55,7 @@ sub manage_selection {
         oids => [ $oid_sysDescr ],
         nothing_quit => 1
     );
-    if (!($self->{os_version} = storage::emc::DataDomain::snmp::lib::functions::get_version(value => $snmp_result->{$oid_sysDescr}))) {
+    if (!($self->{os_version} = storage::emc::datadomain::snmp::lib::functions::get_version(value => $snmp_result->{$oid_sysDescr}))) {
         $self->{output}->output_add(
             severity => 'UNKNOWN',
             short_msg => 'Cannot get DataDomain OS version.'

diff --git a/...ge/emc/DataDomain/snmp/mode/listmtrees.pm → ...ge/emc/datadomain/snmp/mode/listmtrees.pm b/...ge/emc/DataDomain/snmp/mode/listmtrees.pm → ...ge/emc/datadomain/snmp/mode/listmtrees.pm
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-package storage::emc::DataDomain::snmp::mode::listmtrees;
+package storage::emc::datadomain::snmp::mode::listmtrees;
 
 use base qw(centreon::plugins::mode);
 

diff --git a/.../DataDomain/snmp/mode/listreplications.pm → .../datadomain/snmp/mode/listreplications.pm b/.../DataDomain/snmp/mode/listreplications.pm → .../datadomain/snmp/mode/listreplications.pm
@@ -18,13 +18,13 @@
 # limitations under the License.
 #
 
-package storage::emc::DataDomain::snmp::mode::listreplications;
+package storage::emc::datadomain::snmp::mode::listreplications;
 
 use base qw(centreon::plugins::mode);
 
 use strict;
 use warnings;
-use storage::emc::DataDomain::snmp::lib::functions;
+use storage::emc::datadomain::snmp::lib::functions;
 
 sub new {
     my ($class, %options) = @_;
@@ -60,7 +60,7 @@ sub manage_selection {
         nothing_quit => 1
     );
 
-    if (!($self->{os_version} = storage::emc::DataDomain::snmp::lib::functions::get_version(value => $snmp_result->{$oid_sysDescr}))) {
+    if (!($self->{os_version} = storage::emc::datadomain::snmp::lib::functions::get_version(value => $snmp_result->{$oid_sysDescr}))) {
         $self->{output}->output_add(
             severity => 'UNKNOWN',
             short_msg => 'Cannot get DataDomain OS version.'

diff --git a/...torage/emc/DataDomain/snmp/mode/mtrees.pm → ...torage/emc/datadomain/snmp/mode/mtrees.pm b/...torage/emc/DataDomain/snmp/mode/mtrees.pm → ...torage/emc/datadomain/snmp/mode/mtrees.pm
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-package storage::emc::DataDomain::snmp::mode::mtrees;
+package storage::emc::datadomain::snmp::mode::mtrees;
 
 use base qw(centreon::plugins::templates::counter);
 

diff --git a/...orage/emc/DataDomain/snmp/mode/process.pm → ...orage/emc/datadomain/snmp/mode/process.pm b/...orage/emc/DataDomain/snmp/mode/process.pm → ...orage/emc/datadomain/snmp/mode/process.pm
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-package storage::emc::DataDomain::snmp::mode::process;
+package storage::emc::datadomain::snmp::mode::process;
 
 use base qw(centreon::plugins::templates::counter);
 

diff --git a/.../emc/DataDomain/snmp/mode/replications.pm → .../emc/datadomain/snmp/mode/replications.pm b/.../emc/DataDomain/snmp/mode/replications.pm → .../emc/datadomain/snmp/mode/replications.pm
@@ -18,14 +18,14 @@
 # limitations under the License.
 #
 
-package storage::emc::DataDomain::snmp::mode::replications;
+package storage::emc::datadomain::snmp::mode::replications;
 
 use base qw(centreon::plugins::templates::counter);
 
 use strict;
 use warnings;
 use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold_ng);
-use storage::emc::DataDomain::snmp::lib::functions;
+use storage::emc::datadomain::snmp::lib::functions;
 use centreon::plugins::misc;
 use POSIX;
 
@@ -229,7 +229,7 @@ sub manage_selection {
         nothing_quit => 1
     );
 
-    if (!($self->{os_version} = storage::emc::DataDomain::snmp::lib::functions::get_version(value => $snmp_result->{$oid_sysDescr}))) {
+    if (!($self->{os_version} = storage::emc::datadomain::snmp::lib::functions::get_version(value => $snmp_result->{$oid_sysDescr}))) {
         $self->{output}->output_add(
             severity => 'UNKNOWN',
             short_msg => 'Cannot get DataDomain OS version.'

diff --git a/src/storage/emc/DataDomain/snmp/plugin.pm → src/storage/emc/datadomain/snmp/plugin.pm b/src/storage/emc/DataDomain/snmp/plugin.pm → src/storage/emc/datadomain/snmp/plugin.pm
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-package storage::emc::DataDomain::snmp::plugin;
+package storage::emc::datadomain::snmp::plugin;
 
 use strict;
 use warnings;
@@ -30,18 +30,18 @@ sub new {
     bless $self, $class;
 
     $self->{modes} = {
-        'alerts'            => 'storage::emc::DataDomain::snmp::mode::alerts',
-        'cleaning'          => 'storage::emc::DataDomain::snmp::mode::cleaning',
-        'hardware'          => 'storage::emc::DataDomain::snmp::mode::hardware',
-        'filesystems'       => 'storage::emc::DataDomain::snmp::mode::filesystems',
-        'interfaces'        => 'storage::emc::DataDomain::snmp::mode::interfaces',
-        'list-filesystems'  => 'storage::emc::DataDomain::snmp::mode::listfilesystems',
+        'alerts'            => 'storage::emc::datadomain::snmp::mode::alerts',
+        'cleaning'          => 'storage::emc::datadomain::snmp::mode::cleaning',
+        'hardware'          => 'storage::emc::datadomain::snmp::mode::hardware',
+        'filesystems'       => 'storage::emc::datadomain::snmp::mode::filesystems',
+        'interfaces'        => 'storage::emc::datadomain::snmp::mode::interfaces',
+        'list-filesystems'  => 'storage::emc::datadomain::snmp::mode::listfilesystems',
         'list-interfaces'   => 'snmp_standard::mode::listinterfaces',
-        'list-mtrees'       => 'storage::emc::DataDomain::snmp::mode::listmtrees',
-        'list-replications' => 'storage::emc::DataDomain::snmp::mode::listreplications',
-        'mtrees'            => 'storage::emc::DataDomain::snmp::mode::mtrees',
-        'process'           => 'storage::emc::DataDomain::snmp::mode::process',
-        'replications'      => 'storage::emc::DataDomain::snmp::mode::replications'
+        'list-mtrees'       => 'storage::emc::datadomain::snmp::mode::listmtrees',
+        'list-replications' => 'storage::emc::datadomain::snmp::mode::listreplications',
+        'mtrees'            => 'storage::emc::datadomain::snmp::mode::mtrees',
+        'process'           => 'storage::emc::datadomain::snmp::mode::process',
+        'replications'      => 'storage::emc::datadomain::snmp::mode::replications'
     };
 
     return $self;

diff --git a/tests/resources/resources.resource b/tests/resources/resources.resource
@@ -30,6 +30,16 @@ Start Mockoon
 Stop Mockoon
     Terminate All Processes
 
+Ctn Run Command And Check Result As Regexp
+    [Arguments]    ${command}    ${expected_result}
+    ${output}    Run    ${command}
+    ${output}    Strip String    ${output}
+    Should Match Regexp
+    ...    ${output}
+    ...    ${expected_result}
+    ...    Wrong output result for command:\n${command}\n\nObtained:\n${output}\n\nExpected regular expression:\n${expected_result}\n
+    ...    values=False
+
 Ctn Run Command And Check Result As Strings
     [Arguments]    ${command}    ${expected_result}
     ${output}    Run    ${command}

diff --git a/tests/storage/emc/datadomain/snmp/alerts.robot b/tests/storage/emc/datadomain/snmp/alerts.robot
@@ -7,7 +7,7 @@ Test Timeout        120s
 
 
 *** Variables ***
-${CMD}      ${CENTREON_PLUGINS} --plugin=storage::emc::DataDomain::snmp::plugin
+${CMD}      ${CENTREON_PLUGINS} --plugin=storage::emc::datadomain::snmp::plugin
 
 
 *** Test Cases ***

diff --git a/tests/storage/emc/datadomain/snmp/cleaning.robot b/tests/storage/emc/datadomain/snmp/cleaning.robot
@@ -7,7 +7,7 @@ Test Timeout        120s
 
 
 *** Variables ***
-${CMD}      ${CENTREON_PLUGINS} --plugin=storage::emc::DataDomain::snmp::plugin
+${CMD}      ${CENTREON_PLUGINS} --plugin=storage::emc::datadomain::snmp::plugin
 
 
 *** Test Cases ***

diff --git a/tests/storage/emc/datadomain/snmp/filesystems.robot b/tests/storage/emc/datadomain/snmp/filesystems.robot
@@ -7,7 +7,7 @@ Test Timeout        120s
 
 
 *** Variables ***
-${CMD}      ${CENTREON_PLUGINS} --plugin=storage::emc::DataDomain::snmp::plugin
+${CMD}      ${CENTREON_PLUGINS} --plugin=storage::emc::datadomain::snmp::plugin
 
 
 *** Test Cases ***

diff --git a/tests/storage/emc/datadomain/snmp/hardware.robot b/tests/storage/emc/datadomain/snmp/hardware.robot
@@ -7,11 +7,11 @@ Test Timeout        120s
 
 
 *** Variables ***
-${CMD}      ${CENTREON_PLUGINS} --plugin=storage::emc::DataDomain::snmp::plugin
+${CMD}      ${CENTREON_PLUGINS} --plugin=storage::emc::datadomain::snmp::plugin
 
 
 *** Test Cases ***
-hardware ${tc}
+Hardware ${tc}
     [Tags]    os    linux
     ${command}    Catenate
     ...    ${CMD}
@@ -23,17 +23,10 @@ hardware ${tc}
     ...    --snmp-timeout=1
     ...    ${extra_options}
 
-    ${output}    Run    ${command}
-    ${output}    Strip String    ${output}
-    Should Contain    
-    ...    ${output}    
-    ...    ${expected_result}
-    ...    Wrong output result for command:\n${command}\n\nObtained:\n${output}\n\nExpected:\n${expected_result}\n
-    ...    values=False
-    ...    collapse_spaces=True
+    Ctn Run Command And Check Result As Regexp    ${command}    ${expected_result}
 
     Examples:        tc    extra_options                                                              expected_result    --
             ...      1     --verbose                                                                  UNKNOWN: Disk '4.1' status is 'unknown' - Disk '4.2' status is 'unknown' - Disk '4.3' status is 'unknown' - Disk '4.4' status is 'unknown' - Disk '4.5' status is 'unknown' - Disk '4.6' status is 'unknown' - Disk '4.7' status is 'unknown' - Disk '4.8' status is 'unknown' - Disk '4.9' status is 'unknown' - Disk '4.10' status is 'unknown' - Disk '4.11' status is 'unknown' - Disk '4.12' status is 'unknown' - Disk '4.13' status is 'unknown' - Disk '4.14' status is 'unknown' - Disk '4.15' status is 'unknown'
             ...      2     --threshold-overload='fan,CRITICAL,^(?!(ok)$)'                             UNKNOWN: Disk '4.1' status is 'unknown' - Disk '4.2' status is 'unknown' - Disk '4.3' status is 'unknown' - Disk '4.4' status is 'unknown' - Disk '4.5' status is 'unknown' - Disk '4.6' status is 'unknown' - Disk '4.7' status is 'unknown' - Disk '4.8' status is 'unknown' - Disk '4.9' status is 'unknown' - Disk '4.10' status is 'unknown' - Disk '4.11' status is 'unknown' - Disk '4.12' status is 'unknown' - Disk '4.13' status is 'unknown' - Disk '4.14' status is 'unknown'
-            ...      3     --warning='temperature,10,27'                                              WARNING: Temperature 'Anonymized 157' is 33 degree centigrade
-            ...      4     --critical='temperature,1.1,25' --critical='battery,.*,20:'                CRITICAL: Temperature 'Anonymized 126' is 36 degree centigrade UNKNOWN: Disk '4.1' status is 'unknown' - Disk '4.2' status is 'unknown' - Disk '4.3' status is 'unknown' - Disk '4.4' status is 'unknown' - Disk '4.5' status is 'unknown' - Disk '4.6' status is 'unknown' - Disk '4.7' status is 'unknown' - Disk '4.8' status is 'unknown' - Disk '4.9' status is 'unknown' - Disk '4.10' status is 'unknown' - Disk '4.11' status is 'unknown'
+            ...      3     --warning='temperature,10,27'                                              WARNING:.*Temperature 'Anonymized 157' is 33 degree centigrade
+            ...      4     --critical='temperature,1.1,25' --critical='battery,.*,20:'                CRITICAL: Temperature 'Anonymized 126' is 36 degree centigrade UNKNOWN: Disk '4.1' status is 'unknown' - Disk '4.2' status is 'unknown' - Disk '4.3' status is 'unknown' - Disk '4.4' status is 'unknown' - Disk '4.5' status is 'unknown' - Disk '4.6' status is 'unknown' - Disk '4.7' status is 'unknown' - Disk '4.8' status is 'unknown' - Disk '4.9' status is 'unknown' - Disk '4.10' status is 'unknown' - Disk '4.11' status is 'unknown'
diff --git a/tests/storage/emc/datadomain/snmp/interfaces.robot b/tests/storage/emc/datadomain/snmp/interfaces.robot
@@ -7,7 +7,7 @@ Test Timeout        120s
 
 
 *** Variables ***
-${CMD}      ${CENTREON_PLUGINS} --plugin=storage::emc::DataDomain::snmp::plugin
+${CMD}      ${CENTREON_PLUGINS} --plugin=storage::emc::datadomain::snmp::plugin
 
 
 *** Test Cases ***

diff --git a/tests/storage/emc/datadomain/snmp/list-filesystems.robot b/tests/storage/emc/datadomain/snmp/list-filesystems.robot
@@ -7,7 +7,7 @@ Test Timeout        120s
 
 
 *** Variables ***
-${CMD}      ${CENTREON_PLUGINS} --plugin=storage::emc::DataDomain::snmp::plugin
+${CMD}      ${CENTREON_PLUGINS} --plugin=storage::emc::datadomain::snmp::plugin
 
 
 *** Test Cases ***

diff --git a/tests/storage/emc/datadomain/snmp/list-interfaces.robot b/tests/storage/emc/datadomain/snmp/list-interfaces.robot
@@ -7,7 +7,7 @@ Test Timeout        120s
 
 
 *** Variables ***
-${CMD}      ${CENTREON_PLUGINS} --plugin=storage::emc::DataDomain::snmp::plugin
+${CMD}      ${CENTREON_PLUGINS} --plugin=storage::emc::datadomain::snmp::plugin
 
 
 *** Test Cases ***