Merge pull request #117 from centreon/MON-13004-add-discovery-tags2

change tags path for packaging

Author: garnier-quentin

centreon/class/cisTags.pm centreon/vmware/cisTags.pmcentreon/class/cisTags.pm renamed to centreon/vmware/cisTags.pm

@@ -18,11 +18,11 @@
 # limitations under the License.
 #
 
-package centreon::class::cisTags;
+package centreon::vmware::cisTags;
 
 use strict;
 use warnings;
-use centreon::class::http::http;
+use centreon::vmware::http::http;
 use JSON::XS;
 
 # https://developer.vmware.com/apis/vsphere-automation/v7.0U2/cis/
@@ -91,7 +91,7 @@ sub configuration {
         $self->{curl_opts} = $curl_opts;
     }
 
-    $self->{http} = centreon::class::http::http->new(logger => $options{logger});
+    $self->{http} = centreon::vmware::http::http->new(logger => $options{logger});
     $self->{is_error} = 0;
     return 0;
 }

centreon/vmware/cmddiscovery.pm

@@ -25,7 +25,7 @@ use base qw(centreon::vmware::cmdbase);
 use strict;
 use warnings;
 use centreon::vmware::common;
-use centreon::class::cisTags;
+use centreon::vmware::cisTags;
 
 sub new {
     my ($class, %options) = @_;
@@ -92,7 +92,7 @@ sub run {
         }
 
         if (defined($self->{tags})) {
-            my $cisTags = centreon::class::cisTags->new();
+            my $cisTags = centreon::vmware::cisTags->new();
             $cisTags->configuration(
                 url => $self->{connector}->{config_vsphere_url},
                 username => $self->{connector}->{config_vsphere_user},

centreon/class/http/backend/curl.pm centreon/vmware/http/backend/curl.pmcentreon/class/http/backend/curl.pm renamed to centreon/vmware/http/backend/curl.pm

@@ -18,13 +18,13 @@
 # limitations under the License.
 #
 
-package centreon::class::http::backend::curl;
+package centreon::vmware::http::backend::curl;
 
 use strict;
 use warnings;
 use URI;
 use Net::Curl::Easy;
-use centreon::class::http::backend::curlconstants;
+use centreon::vmware::http::backend::curlconstants;
 
 sub new {
     my ($class, %options) = @_;
@@ -39,7 +39,7 @@ sub new {
 sub check_options {
     my ($self, %options) = @_;
 
-    $self->{constant_cb} = \&centreon::class::http::backend::curlconstants::get_constant_value;
+    $self->{constant_cb} = \&centreon::vmware::http::backend::curlconstants::get_constant_value;
 
     if (!defined($options{request}->{curl_opt})) {
         $options{request}->{curl_opt} = [];

…reon/class/http/backend/curlconstants.pm …eon/vmware/http/backend/curlconstants.pmcentreon/class/http/backend/curlconstants.pm renamed to centreon/vmware/http/backend/curlconstants.pm centreon/class/http/backend/curlconstants.pm renamed to centreon/vmware/http/backend/curlconstants.pm

@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-package centreon::class::http::backend::curlconstants;
+package centreon::vmware::http::backend::curlconstants;
 
 use strict;
 use warnings;

centreon/class/http/backend/lwp.pm centreon/vmware/http/backend/lwp.pmcentreon/class/http/backend/lwp.pm renamed to centreon/vmware/http/backend/lwp.pm

@@ -18,11 +18,11 @@
 # limitations under the License.
 #
 
-package centreon::class::http::backend::lwp;
+package centreon::vmware::http::backend::lwp;
 
 use strict;
 use warnings;
-use centreon::class::http::backend::useragent;
+use centreon::vmware::http::backend::useragent;
 use URI;
 use IO::Socket::SSL;
 

centreon/class/http/backend/useragent.pm centreon/vmware/http/backend/useragent.pmcentreon/class/http/backend/useragent.pm renamed to centreon/vmware/http/backend/useragent.pm

@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-package centreon::class::http::backend::useragent;
+package centreon::vmware::http::backend::useragent;
 
 use strict;
 use warnings;
@@ -30,7 +30,7 @@ sub new {
     bless $self, $class;
 
     $self = LWP::UserAgent::new(@_);
-    $self->agent('centreon::class::http::backend::useragent');
+    $self->agent('centreon::vmware::http::backend::useragent');
 
     $self->{credentials} = $options{credentials} if defined($options{credentials});
     $self->{username} = $options{username} if defined($options{username});

centreon/class/http/http.pm centreon/vmware/http/http.pmcentreon/class/http/http.pm renamed to centreon/vmware/http/http.pm

@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-package centreon::class::http::http;
+package centreon::vmware::http::http;
 
 use strict;
 use warnings;
@@ -86,17 +86,17 @@ sub check_options {
 
     if (!defined($self->{backend_lwp}) && !defined($self->{backend_curl})) {
         if ($options{request}->{http_backend} eq 'lwp' && $self->mymodule_load(
-            logger => $options{logger}, module => 'centreon::class::http::backend::lwp',
-            error_msg => "Cannot load module 'centreon::class::http::backend::lwp'."
+            logger => $options{logger}, module => 'centreon::vmware::http::backend::lwp',
+            error_msg => "Cannot load module 'centreon::vmware::http::backend::lwp'."
             ) == 0) {
-            $self->{backend_lwp} = centreon::class::http::backend::lwp->new(%options, logger => $self->{logger});
+            $self->{backend_lwp} = centreon::vmware::http::backend::lwp->new(%options, logger => $self->{logger});
         }
 
         if ($options{request}->{http_backend} eq 'curl' && $self->mymodule_load(
-            logger => $options{logger}, module => 'centreon::class::http::backend::curl',
-            error_msg => "Cannot load module 'centreon::class::http::backend::curl'."
+            logger => $options{logger}, module => 'centreon::vmware::http::backend::curl',
+            error_msg => "Cannot load module 'centreon::vmware::http::backend::curl'."
             ) == 0) {
-            $self->{backend_curl} = centreon::class::http::backend::curl->new(%options, logger => $self->{logger});
+            $self->{backend_curl} = centreon::vmware::http::backend::curl->new(%options, logger => $self->{logger});
         }
     }