tyler.durden
/
centreon-plugins
mirror of https://github.com/centreon/centreon-plugins.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix velocloud api

This commit is contained in:
Colin Gagnaire 2019-07-01 18:23:44 +02:00
parent d911a4b7db
commit be5ca0d75a
2 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
cloud/vmware/velocloud/restapi/custom/api.pm
View File

@ -142,7 +142,7 @@ sub get_session_cookie {
my $form_post = { username => $self->{username}, password => $self->{password} }; my $form_post = { username => $self->{username}, password => $self->{password} };
my $encoded; my $encoded;
eval { eval {
$encoded = encode_json($form_post); $encoded = JSON::XS->new->utf8->encode($form_post);
}; };
if ($@) { if ($@) {
$self->{output}->add_option_msg(short_msg => "Cannot encode json request"); $self->{output}->add_option_msg(short_msg => "Cannot encode json request");
@ -157,13 +157,14 @@ sub get_session_cookie {
url_path => $self->{api_path} . $login_url, url_path => $self->{api_path} . $login_url,
query_form_post => $encoded query_form_post => $encoded
); );
my ($cookies) = $self->{http}->get_header(name => 'Set-Cookie'); my (@cookies) = $self->{http}->get_header(name => 'Set-Cookie');
my $message = ''; my $message = '';
my $session = ''; my $session = '';
foreach my $cookie (@{$cookies}) {
$message = $1 if ($cookie =~ /velocloud.message=(.*);/); foreach my $cookie (@cookies) {
$session = $1 if ($cookie =~ /velocloud.session=(.*);/); $message = $1 if ($cookie =~ /^velocloud\.message=(.+?);/);
$session = $1 if ($cookie =~ /^velocloud\.session=(.+?);/);
} }
if (!defined($session)) { if (!defined($session)) {
@ -184,10 +185,9 @@ sub get_entreprise_id {
my $decoded; my $decoded;
eval { eval {
$decoded = decode_json($content); $decoded = JSON::XS->new->utf8->decode($content);
}; };
if ($@) { if ($@) {
$self->{output}->output_add(long_msg => $content, debug => 1);
$self->{output}->add_option_msg(short_msg => "Cannot decode json response"); $self->{output}->add_option_msg(short_msg => "Cannot decode json response");
$self->{output}->option_exit(); $self->{output}->option_exit();
} }
@ -197,20 +197,10 @@ sub get_entreprise_id {
sub request_api { sub request_api {
my ($self, %options) = @_; my ($self, %options) = @_;
if (!defined($self->{session_cookie})) {
$self->get_session_cookie();
}
$self->settings();
if (!defined($self->{entreprise_id})) {
$self->get_entreprise_id();
}
my $encoded_form_post; my $encoded_form_post;
eval { eval {
$encoded_form_post = encode_json($options{query_form_post}); $encoded_form_post = JSON::XS->new->utf8->encode($options{query_form_post});
}; };
if ($@) { if ($@) {
$self->{output}->add_option_msg(short_msg => "Cannot encode json request"); $self->{output}->add_option_msg(short_msg => "Cannot encode json request");
@ -229,10 +219,9 @@ sub request_api {
my $decoded; my $decoded;
eval { eval {
$decoded = decode_json($content); $decoded = JSON::XS->new->utf8->decode($content);
}; };
if ($@) { if ($@) {
$self->{output}->output_add(long_msg => $content, debug => 1);
$self->{output}->add_option_msg(short_msg => "Cannot decode json response"); $self->{output}->add_option_msg(short_msg => "Cannot decode json response");
$self->{output}->option_exit(); $self->{output}->option_exit();
} }
@ -242,10 +231,20 @@ sub request_api {
sub list_edges { sub list_edges {
my ($self, %options) = @_; my ($self, %options) = @_;
if (!defined($self->{session_cookie})) {
$self->get_session_cookie();
}
$self->settings();
if (!defined($self->{entreprise_id})) {
$self->get_entreprise_id();
}
my $response = $self->request_api( my $response = $self->request_api(
method => 'POST', method => 'POST',
url_path => '/enterprise/getEnterpriseEdges', url_path => $self->{api_path} . '/enterprise/getEnterpriseEdges',
query_form_post => { enterpriseId => $self->{entreprise_id} } query_form_post => { enterpriseId => $self->{entreprise_id} }
); );
@ -256,7 +255,7 @@ sub DESTROY {
my $self = shift; my $self = shift;
if (defined($self->{session_cookie})) { if (defined($self->{session_cookie})) {
$self->request_api(method => 'POST', url_path => $self->{api_path} . '/logout'); $self->{http}->request(method => 'POST', url_path => $self->{api_path} . '/logout');
} }
} }

2
cloud/vmware/velocloud/restapi/mode/listedges.pm
View File

@ -52,7 +52,7 @@ sub run {
$self->manage_selection(%options); $self->manage_selection(%options);
foreach my $edge (@{$self->{edges}}) { foreach my $edge (@{$self->{edges}}) {
$self->{output}->output_add(long_msg => sprintf("[id = %s][name = %s][edge_state = %s][service_state = %s][ha_state = %s][activation_state = %s]", $self->{output}->output_add(long_msg => sprintf("[id = %s][name = %s][edge_state = %s][service_state = %s][ha_state = %s][activation_state = %s]",
$edge->{id}, $edge->{name}, $edge->{edgeState}, $edge->{serviceState}, $edge->{haState}, $edge->{activationState}); $edge->{id}, $edge->{name}, $edge->{edgeState}, $edge->{serviceState}, $edge->{haState}, $edge->{activationState}));
} }
$self->{output}->output_add(severity => 'OK', $self->{output}->output_add(severity => 'OK',