diff --git a/centreon-plugins/cloud/openstack/restapi/mode/floatingips.pm b/centreon-plugins/cloud/openstack/restapi/mode/hypervisor.pm
similarity index 55%
rename from centreon-plugins/cloud/openstack/restapi/mode/floatingips.pm
rename to centreon-plugins/cloud/openstack/restapi/mode/hypervisor.pm
index 940f08f82..0e0235556 100644
--- a/centreon-plugins/cloud/openstack/restapi/mode/floatingips.pm
+++ b/centreon-plugins/cloud/openstack/restapi/mode/hypervisor.pm
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-package cloud::openstack::restapi::mode::floatingips;
+package cloud::openstack::restapi::mode::hypervisor;
 
 use base qw(centreon::plugins::mode);
 
@@ -26,7 +26,13 @@ use strict;
 use warnings;
 use centreon::plugins::http;
 use JSON;
-use Data::Dumper;
+
+my $thresholds = {
+    status => [
+        ['up', 'OK'],
+        ['down', 'CRITICAL'],
+    ],
+};
 
 sub new {
     my ($class, %options) = @_;
@@ -36,26 +42,28 @@ sub new {
     $self->{version} = '1.0';
     $options{options}->add_options(arguments =>
         {
-            "data:s"                => { name => 'data' },
-            "hostname:s"            => { name => 'hostname' },
-            "http-peer-addr:s"      => { name => 'http_peer_addr' },
-            "port:s"                => { name => 'port', default => '5000' },
-            "proto:s"               => { name => 'proto' },
-            "urlpath:s"             => { name => 'url_path', default => '/v3/auth/tokens' },
-            "proxyurl:s"            => { name => 'proxyurl' },
-            "proxypac:s"            => { name => 'proxypac' },
-            "credentials"           => { name => 'credentials' },
-            "username:s"            => { name => 'username' },
-            "password:s"            => { name => 'password' },
-            "ssl:s"                 => { name => 'ssl', },
-            "header:s@"             => { name => 'header' },
-            "exclude:s"             => { name => 'exclude' },
-            "timeout:s"             => { name => 'timeout' },
-            "tenant-id:s"           => { name => 'tenant_id' },
+            "data:s"                  => { name => 'data' },
+            "hostname:s"              => { name => 'hostname' },
+            "http-peer-addr:s"        => { name => 'http_peer_addr' },
+            "port:s"                  => { name => 'port', default => '5000' },
+            "proto:s"                 => { name => 'proto' },
+            "urlpath:s"               => { name => 'url_path', default => '/v3/auth/tokens' },
+            "proxyurl:s"              => { name => 'proxyurl' },
+            "proxypac:s"              => { name => 'proxypac' },
+            "credentials"             => { name => 'credentials' },
+            "username:s"              => { name => 'username' },
+            "password:s"              => { name => 'password' },
+            "ssl:s"                   => { name => 'ssl', },
+            "header:s@"               => { name => 'header' },
+            "exclude:s"               => { name => 'exclude' },
+            "timeout:s"               => { name => 'timeout' },
+            "tenant-id:s"             => { name => 'tenant_id' },
+            "hypervisor-id:s"         => { name => 'hypervisor_id' },
+			"threshold-overload:s@"   => { name => 'threshold_overload' },
         });
 
     $self->{http} = centreon::plugins::http->new(output => $self->{output});
-    $self->{instance_infos} = ();
+    $self->{hypervisor_infos} = ();
     return $self;
 }
 
@@ -63,17 +71,22 @@ sub check_options {
     my ($self, %options) = @_;
     $self->SUPER::init(%options);
 
-    $self->{http}->set_options(%{$self->{option_results}})
-}
-
-sub check_exclude {
-    my ($self, %options) = @_;
-
-    if (defined($self->{option_results}->{exclude}) && $self->{option_results}->{exclude} =~ /(^|\s|,)${options{status}}(\s|,|$)/) {
-        $self->{output}->output_add(long_msg => sprintf("Skipping ${options{status}} instance."));
-        return 1;
+	$self->{overload_th} = {};
+    foreach my $val (@{$self->{option_results}->{threshold_overload}}) {
+        if ($val !~ /^(.*?),(.*?),(.*)$/) {
+            $self->{output}->add_option_msg(short_msg => "Wrong threshold-overload option '" . $val . "'.");
+            $self->{output}->option_exit();
+        }
+        my ($section, $status, $filter) = ($1, $2, $3);
+        if ($self->{output}->is_litteral_status(status => $status) == 0) {
+            $self->{output}->add_option_msg(short_msg => "Wrong threshold-overload status '" . $val . "'.");
+            $self->{output}->option_exit();
+        }
+        $self->{overload_th}->{$section} = [] if (!defined($self->{overload_th}->{$section}));
+        push @{$self->{overload_th}->{$section}}, {filter => $filter, status => $status};
     }
-    return 0;
+
+    $self->{http}->set_options(%{$self->{option_results}})
 }
 
 sub token_request {
@@ -95,6 +108,7 @@ sub token_request {
 
     my $response = $self->{http}->request(method => $self->{method}, query_form_post => $self->{json_request});
     my $headers = $self->{http}->get_header();
+
     eval {
         $self->{header} = $headers->header('X-Subject-Token');
     };
@@ -109,7 +123,7 @@ sub api_request {
     my ($self, %options) = @_;
 
     $self->{method} = 'GET';
-    $self->{option_results}->{url_path} = "/v2/".$self->{option_results}->{tenant_id}."/os-floating-ips";
+    $self->{option_results}->{url_path} = "/v2/".$self->{option_results}->{tenant_id}."/os-hypervisors/".$self->{option_results}->{hypervisor_id};
     $self->{option_results}->{port} = '8774';
     @{$self->{option_results}->{header}} = ('X-Auth-Token:' . $self->{header}, 'Accept:application/json');
     $self->{http}->set_options(%{$self->{option_results}});
@@ -123,8 +137,32 @@ sub api_request {
         $webcontent = $json->decode($jsoncontent);
     };
 
-    print Dumper($webcontent);
-    exit 1;
+    $self->{hypervisor_infos}->{name} = $webcontent->{hypervisor}->{hypervisor_hostname};
+    $self->{hypervisor_infos}->{state} = $webcontent->{hypervisor}->{state};
+    $self->{hypervisor_infos}->{status} = $webcontent->{hypervisor}->{status};
+}
+
+
+sub get_severity {
+    my ($self, %options) = @_;
+    my $status = 'UNKNOWN'; # default
+
+    if (defined($self->{overload_th}->{$options{section}})) {
+        foreach (@{$self->{overload_th}->{$options{section}}}) {
+            if ($options{value} =~ /$_->{filter}/i) {
+                $status = $_->{status};
+                return $status;
+            }
+        }
+    }
+    foreach (@{$thresholds->{$options{section}}}) {
+        if ($options{value} =~ /$$_[0]/i) {
+            $status = $$_[1];
+            return $status;
+        }
+    }
+
+    return $status;
 }
 
 sub run {
@@ -133,19 +171,14 @@ sub run {
     $self->token_request();
     $self->api_request();
 
-    foreach my $instancename (keys %{$self->{instance_infos}}) {
-        $self->{output}->output_add(long_msg => sprintf("%s [id = %s , compute = %s, osname = %s, state = %s]",
-                                                        $instancename,
-                                                        $self->{instance_infos}->{$instancename}->{id},
-                                                        $self->{instance_infos}->{$instancename}->{compute},
-                                                        $self->{instance_infos}->{$instancename}->{osname},
-                                                        $self->{instance_infos}->{$instancename}->{state}));
-    }
+	my $exit = $self->get_severity(section => 'status', value => $self->{hypervisor_infos}->{state});
+	$self->{output}->output_add(severity => $exit,
+    							short_msg => sprintf("Hypervisor %s is %s (status: %s)",
+                                                    $self->{hypervisor_infos}->{name},
+                                                    $self->{hypervisor_infos}->{state},
+                                                    $self->{hypervisor_infos}->{status}));
 
-    $self->{output}->output_add(severity => 'OK',
-                                short_msg => 'List instances:');
-
-    $self->{output}->display(nolabel => 1, force_ignore_perfdata => 1, force_long_output => 1);
+    $self->{output}->display();
     $self->{output}->exit();
 
     exit 0;
diff --git a/centreon-plugins/cloud/openstack/restapi/mode/instance.pm b/centreon-plugins/cloud/openstack/restapi/mode/instance.pm
new file mode 100644
index 000000000..c2d04433c
--- /dev/null
+++ b/centreon-plugins/cloud/openstack/restapi/mode/instance.pm
@@ -0,0 +1,285 @@
+#
+# Copyright 2015 Centreon (http://www.centreon.com/)
+#
+# Centreon is a full-fledged industry-strength solution that meets
+# the needs in IT infrastructure and application monitoring for
+# service performance.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+package cloud::openstack::restapi::mode::instance;
+
+use base qw(centreon::plugins::mode);
+
+use strict;
+use warnings;
+use centreon::plugins::http;
+use JSON;
+
+my $thresholds = {
+    status => [
+        ['ACTIVE', 'OK'],
+        ['PAUSED', 'WARNING'],
+		['SUSPENDED', 'WARNING'],
+        ['SHUTOFF', 'CRITICAL'],
+		['REBUILD', 'WARNING'],
+		['HARD_REBOOT', 'WARNING'],
+		['ERROR', 'CRITCAL'],
+		['BUILDING', 'OK'],
+        ['STOPPED', 'WARNING'],
+        ['DELETED', 'OK'],
+    ],
+};
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    bless $self, $class;
+
+    $self->{version} = '1.0';
+    $options{options}->add_options(arguments =>
+        {
+            "data:s"                  => { name => 'data' },
+            "hostname:s"              => { name => 'hostname' },
+            "http-peer-addr:s"        => { name => 'http_peer_addr' },
+            "port:s"                  => { name => 'port', default => '5000' },
+            "proto:s"                 => { name => 'proto' },
+            "urlpath:s"               => { name => 'url_path', default => '/v3/auth/tokens' },
+            "proxyurl:s"              => { name => 'proxyurl' },
+            "proxypac:s"              => { name => 'proxypac' },
+            "credentials"             => { name => 'credentials' },
+            "username:s"              => { name => 'username' },
+            "password:s"              => { name => 'password' },
+            "ssl:s"                   => { name => 'ssl', },
+            "header:s@"               => { name => 'header' },
+            "exclude:s"               => { name => 'exclude' },
+            "timeout:s"               => { name => 'timeout' },
+            "tenant-id:s"             => { name => 'tenant_id' },
+            "instance-id:s"           => { name => 'instance_id' },
+			"threshold-overload:s@"   => { name => 'threshold_overload' },
+        });
+
+    $self->{http} = centreon::plugins::http->new(output => $self->{output});
+    $self->{instance_infos} = ();
+    return $self;
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::init(%options);
+
+	$self->{overload_th} = {};
+    foreach my $val (@{$self->{option_results}->{threshold_overload}}) {
+        if ($val !~ /^(.*?),(.*?),(.*)$/) {
+            $self->{output}->add_option_msg(short_msg => "Wrong threshold-overload option '" . $val . "'.");
+            $self->{output}->option_exit();
+        }
+        my ($section, $status, $filter) = ($1, $2, $3);
+        if ($self->{output}->is_litteral_status(status => $status) == 0) {
+            $self->{output}->add_option_msg(short_msg => "Wrong threshold-overload status '" . $val . "'.");
+            $self->{output}->option_exit();
+        }
+        $self->{overload_th}->{$section} = [] if (!defined($self->{overload_th}->{$section}));
+        push @{$self->{overload_th}->{$section}}, {filter => $filter, status => $status};
+    }
+
+    $self->{http}->set_options(%{$self->{option_results}})
+}
+
+sub token_request {
+    my ($self, %options) = @_;
+
+    $self->{method} = 'GET';
+    if (defined($self->{option_results}->{data})) {
+        local $/ = undef;
+        if (!open(FILE, "<", $self->{option_results}->{data})) {
+            $self->{output}->output_add(severity => 'UNKNOWN',
+                                        short_msg => sprintf("Could not read file '%s': %s", $self->{option_results}->{data}, $!));
+            $self->{output}->display();
+            $self->{output}->exit();
+        }
+        $self->{json_request} = <FILE>;
+        close FILE;
+        $self->{method} = 'POST';
+    }
+
+    my $response = $self->{http}->request(method => $self->{method}, query_form_post => $self->{json_request});
+    my $headers = $self->{http}->get_header();
+
+    eval {
+        $self->{header} = $headers->header('X-Subject-Token');
+    };
+
+    if ($@) {
+        $self->{output}->add_option_msg(short_msg => "Cannot retrieve API Token");
+        $self->{output}->option_exit();
+    }
+}
+
+sub api_request {
+    my ($self, %options) = @_;
+
+    $self->{method} = 'GET';
+    $self->{option_results}->{url_path} = "/v2/".$self->{option_results}->{tenant_id}."/servers/".$self->{option_results}->{instance_id};
+    $self->{option_results}->{port} = '8774';
+    @{$self->{option_results}->{header}} = ('X-Auth-Token:' . $self->{header}, 'Accept:application/json');
+    $self->{http}->set_options(%{$self->{option_results}});
+
+    my $webcontent;
+    my $jsoncontent = $self->{http}->request(method => $self->{method});
+
+    my $json = JSON->new;
+
+    eval {
+        $webcontent = $json->decode($jsoncontent);
+    };
+
+    $self->{instance_infos}->{name} = $webcontent->{server}->{name};
+    $self->{instance_infos}->{vm_state} = $webcontent->{server}->{'OS-EXT-STS:vm_state'};
+    $self->{instance_infos}->{state} = $webcontent->{server}->{status};
+}
+
+
+sub get_severity {
+    my ($self, %options) = @_;
+    my $status = 'UNKNOWN'; # default
+
+    if (defined($self->{overload_th}->{$options{section}})) {
+        foreach (@{$self->{overload_th}->{$options{section}}}) {
+            if ($options{value} =~ /$_->{filter}/i) {
+                $status = $_->{status};
+                return $status;
+            }
+        }
+    }
+    foreach (@{$thresholds->{$options{section}}}) {
+        if ($options{value} =~ /$$_[0]/i) {
+            $status = $$_[1];
+            return $status;
+        }
+    }
+
+    return $status;
+}
+
+sub run {
+    my ($self, %options) = @_;
+
+    $self->token_request();
+    $self->api_request();
+
+	my $exit = $self->get_severity(section => 'status', value => $self->{instance_infos}->{state});
+	$self->{output}->output_add(severity => $exit,
+    							short_msg => sprintf("Instance %s is in %s state (vm_state: %s)",
+                                                    $self->{instance_infos}->{name},
+                                                    $self->{instance_infos}->{state},
+                                                    $self->{instance_infos}->{vm_state}));
+
+    $self->{output}->display();
+    $self->{output}->exit();
+
+    exit 0;
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+List OpenStack instances through Compute API V2
+
+JSON OPTIONS:
+
+=over 8
+
+=item B<--data>
+
+Set file with JSON request
+
+=back
+
+HTTP OPTIONS:
+
+=over 8
+
+=item B<--hostname>
+
+IP Addr/FQDN of OpenStack Compute's API
+
+=item B<--http-peer-addr>
+
+Set the address you want to connect (Useful if hostname is only a vhost. no ip resolve)
+
+=item B<--port>
+
+Port used by OpenStack Keystone's API (Default: '5000')
+
+=item B<--proto>
+
+Specify https if needed (Default: 'http')
+
+=item B<--urlpath>
+
+Set path to get API's Token (Default: '/v3/auth/tokens')
+
+=item B<--proxyurl>
+
+Proxy URL
+
+=item B<--proxypac>
+
+Proxy pac file (can be an url or local file)
+
+=item B<--credentials>
+
+Specify this option if you access webpage over basic authentification
+
+=item B<--username>
+
+Specify username
+
+=item B<--password>
+
+Specify password
+
+=item B<--ssl>
+
+Specify SSL version (example : 'sslv3', 'tlsv1'...)
+
+=item B<--header>
+
+Set HTTP headers (Multiple option. Example: --header='Content-Type: xxxxx')
+
+=item B<--exlude>
+
+Exclude specific instance's state (comma seperated list) (Example: --exclude=Paused,Running,Off,Exited)
+
+=item B<--timeout>
+
+Threshold for HTTP timeout (Default: 3)
+
+=back
+
+OPENSTACK OPTIONS:
+
+=over 8
+
+=item B<--tenant-id>
+
+Set Tenant's ID
+
+=back
+
+=cut
diff --git a/centreon-plugins/cloud/openstack/restapi/mode/listhypervisors.pm b/centreon-plugins/cloud/openstack/restapi/mode/listhypervisors.pm
index 5165c872e..5e0e250a9 100644
--- a/centreon-plugins/cloud/openstack/restapi/mode/listhypervisors.pm
+++ b/centreon-plugins/cloud/openstack/restapi/mode/listhypervisors.pm
@@ -125,6 +125,7 @@ sub api_request {
 
     foreach my $val (@{$webcontent->{hypervisors}}) {
         my $hypervisorname = $val->{hypervisor_hostname};
+        $self->{hypervisor_infos}->{$hypervisorname}->{id} = $val->{id};
         $self->{hypervisor_infos}->{$hypervisorname}->{ipaddress} = $val->{host_ip};
         $self->{hypervisor_infos}->{$hypervisorname}->{type} = $val->{hypervisor_type};
         $self->{hypervisor_infos}->{$hypervisorname}->{status} = $val->{status};
@@ -147,9 +148,10 @@ sub disco_show {
 
     foreach my $hypervisorname (keys %{$self->{hypervisor_infos}}) {
         $self->{output}->add_disco_entry(name => $hypervisorname,
+                                         id => $self->{hypervisor_infos}->{$hypervisorname}->{id},
                                          ip => $self->{hypervisor_infos}->{$hypervisorname}->{ipaddress},
                                          type => $self->{hypervisor_infos}->{$hypervisorname}->{type},
-                                         status => $self->{hypervisor_infos}->{$hypervisorname}->{statuse},
+                                         status => $self->{hypervisor_infos}->{$hypervisorname}->{status},
                                          state => $self->{hypervisor_infos}->{$hypervisorname}->{state},
                                         );
     }
@@ -162,8 +164,9 @@ sub run {
     $self->api_request();
 
     foreach my $hypervisorname (keys %{$self->{hypervisor_infos}}) {
-        $self->{output}->output_add(long_msg => sprintf("%s [ip = %s, type = %s, status = %s, state = %s]",
+        $self->{output}->output_add(long_msg => sprintf("%s [id = %s, ip = %s, type = %s, status = %s, state = %s]",
                                                         $hypervisorname,
+                                                        $self->{hypervisor_infos}->{$hypervisorname}->{id},
                                                         $self->{hypervisor_infos}->{$hypervisorname}->{ipaddress},
                                                         $self->{hypervisor_infos}->{$hypervisorname}->{type},
                                                         $self->{hypervisor_infos}->{$hypervisorname}->{status},
diff --git a/centreon-plugins/cloud/openstack/restapi/mode/network.pm b/centreon-plugins/cloud/openstack/restapi/mode/network.pm
new file mode 100644
index 000000000..71dde5f42
--- /dev/null
+++ b/centreon-plugins/cloud/openstack/restapi/mode/network.pm
@@ -0,0 +1,278 @@
+#
+# Copyright 2015 Centreon (http://www.centreon.com/)
+#
+# Centreon is a full-fledged industry-strength solution that meets
+# the needs in IT infrastructure and application monitoring for
+# service performance.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+package cloud::openstack::restapi::mode::network;
+
+use base qw(centreon::plugins::mode);
+
+use strict;
+use warnings;
+use centreon::plugins::http;
+use JSON;
+
+my $thresholds = {
+    status => [
+        ['ACTIVE', 'OK'],
+        ['BUILD', 'OK'],
+		['DOWN', 'CRITICAL'],
+        ['ERROR', 'CRITICAL'],
+    ],
+};
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    bless $self, $class;
+
+    $self->{version} = '1.0';
+    $options{options}->add_options(arguments =>
+        {
+            "data:s"                  => { name => 'data' },
+            "hostname:s"              => { name => 'hostname' },
+            "http-peer-addr:s"        => { name => 'http_peer_addr' },
+            "port:s"                  => { name => 'port', default => '5000' },
+            "proto:s"                 => { name => 'proto' },
+            "urlpath:s"               => { name => 'url_path', default => '/v3/auth/tokens' },
+            "proxyurl:s"              => { name => 'proxyurl' },
+            "proxypac:s"              => { name => 'proxypac' },
+            "credentials"             => { name => 'credentials' },
+            "username:s"              => { name => 'username' },
+            "password:s"              => { name => 'password' },
+            "ssl:s"                   => { name => 'ssl', },
+            "header:s@"               => { name => 'header' },
+            "exclude:s"               => { name => 'exclude' },
+            "timeout:s"               => { name => 'timeout' },
+            "network-id:s"            => { name => 'network_id' },
+			"threshold-overload:s@"   => { name => 'threshold_overload' },
+        });
+
+    $self->{http} = centreon::plugins::http->new(output => $self->{output});
+    $self->{network_infos} = ();
+    return $self;
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::init(%options);
+
+	$self->{overload_th} = {};
+    foreach my $val (@{$self->{option_results}->{threshold_overload}}) {
+        if ($val !~ /^(.*?),(.*?),(.*)$/) {
+            $self->{output}->add_option_msg(short_msg => "Wrong threshold-overload option '" . $val . "'.");
+            $self->{output}->option_exit();
+        }
+        my ($section, $status, $filter) = ($1, $2, $3);
+        if ($self->{output}->is_litteral_status(status => $status) == 0) {
+            $self->{output}->add_option_msg(short_msg => "Wrong threshold-overload status '" . $val . "'.");
+            $self->{output}->option_exit();
+        }
+        $self->{overload_th}->{$section} = [] if (!defined($self->{overload_th}->{$section}));
+        push @{$self->{overload_th}->{$section}}, {filter => $filter, status => $status};
+    }
+
+    $self->{http}->set_options(%{$self->{option_results}})
+}
+
+sub token_request {
+    my ($self, %options) = @_;
+
+    $self->{method} = 'GET';
+    if (defined($self->{option_results}->{data})) {
+        local $/ = undef;
+        if (!open(FILE, "<", $self->{option_results}->{data})) {
+            $self->{output}->output_add(severity => 'UNKNOWN',
+                                        short_msg => sprintf("Could not read file '%s': %s", $self->{option_results}->{data}, $!));
+            $self->{output}->display();
+            $self->{output}->exit();
+        }
+        $self->{json_request} = <FILE>;
+        close FILE;
+        $self->{method} = 'POST';
+    }
+
+    my $response = $self->{http}->request(method => $self->{method}, query_form_post => $self->{json_request});
+    my $headers = $self->{http}->get_header();
+
+    eval {
+        $self->{header} = $headers->header('X-Subject-Token');
+    };
+
+    if ($@) {
+        $self->{output}->add_option_msg(short_msg => "Cannot retrieve API Token");
+        $self->{output}->option_exit();
+    }
+}
+
+sub api_request {
+    my ($self, %options) = @_;
+
+    $self->{method} = 'GET';
+    $self->{option_results}->{url_path} = "/v2.0/networks/".$self->{option_results}->{network_id};
+    $self->{option_results}->{port} = '9696';
+    @{$self->{option_results}->{header}} = ('X-Auth-Token:' . $self->{header}, 'Accept:application/json');
+    $self->{http}->set_options(%{$self->{option_results}});
+
+    my $webcontent;
+    my $jsoncontent = $self->{http}->request(method => $self->{method});
+
+    my $json = JSON->new;
+
+    eval {
+        $webcontent = $json->decode($jsoncontent);
+    };
+
+    $self->{network_infos}->{name} = $webcontent->{network}->{name};
+    $self->{network_infos}->{admin_state} = $webcontent->{network}->{admin_state_up};
+    $self->{network_infos}->{status} = $webcontent->{network}->{status};
+}
+
+
+sub get_severity {
+    my ($self, %options) = @_;
+    my $status = 'UNKNOWN'; # default
+
+    if (defined($self->{overload_th}->{$options{section}})) {
+        foreach (@{$self->{overload_th}->{$options{section}}}) {
+            if ($options{value} =~ /$_->{filter}/i) {
+                $status = $_->{status};
+                return $status;
+            }
+        }
+    }
+    foreach (@{$thresholds->{$options{section}}}) {
+        if ($options{value} =~ /$$_[0]/i) {
+            $status = $$_[1];
+            return $status;
+        }
+    }
+
+    return $status;
+}
+
+sub run {
+    my ($self, %options) = @_;
+
+    $self->token_request();
+    $self->api_request();
+
+	my $exit = $self->get_severity(section => 'status', value => $self->{network_infos}->{status});
+	$self->{output}->output_add(severity => $exit,
+    							short_msg => sprintf("Network %s is in %s state (admin_state: %s)",
+                                                    $self->{network_infos}->{name},
+                                                    $self->{network_infos}->{status},
+                                                    $self->{network_infos}->{admin_state}));
+
+    $self->{output}->display();
+    $self->{output}->exit();
+
+    exit 0;
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+List OpenStack instances through Compute API V2
+
+JSON OPTIONS:
+
+=over 8
+
+=item B<--data>
+
+Set file with JSON request
+
+=back
+
+HTTP OPTIONS:
+
+=over 8
+
+=item B<--hostname>
+
+IP Addr/FQDN of OpenStack Compute's API
+
+=item B<--http-peer-addr>
+
+Set the address you want to connect (Useful if hostname is only a vhost. no ip resolve)
+
+=item B<--port>
+
+Port used by OpenStack Keystone's API (Default: '5000')
+
+=item B<--proto>
+
+Specify https if needed (Default: 'http')
+
+=item B<--urlpath>
+
+Set path to get API's Token (Default: '/v3/auth/tokens')
+
+=item B<--proxyurl>
+
+Proxy URL
+
+=item B<--proxypac>
+
+Proxy pac file (can be an url or local file)
+
+=item B<--credentials>
+
+Specify this option if you access webpage over basic authentification
+
+=item B<--username>
+
+Specify username
+
+=item B<--password>
+
+Specify password
+
+=item B<--ssl>
+
+Specify SSL version (example : 'sslv3', 'tlsv1'...)
+
+=item B<--header>
+
+Set HTTP headers (Multiple option. Example: --header='Content-Type: xxxxx')
+
+=item B<--exlude>
+
+Exclude specific instance's state (comma seperated list) (Example: --exclude=Paused,Running,Off,Exited)
+
+=item B<--timeout>
+
+Threshold for HTTP timeout (Default: 3)
+
+=back
+
+OPENSTACK OPTIONS:
+
+=over 8
+
+=item B<--tenant-id>
+
+Set Tenant's ID
+
+=back
+
+=cut
diff --git a/centreon-plugins/cloud/openstack/restapi/mode/infoinstance.pm b/centreon-plugins/cloud/openstack/restapi/mode/port.pm
similarity index 53%
rename from centreon-plugins/cloud/openstack/restapi/mode/infoinstance.pm
rename to centreon-plugins/cloud/openstack/restapi/mode/port.pm
index 58b05eab0..fe5265924 100644
--- a/centreon-plugins/cloud/openstack/restapi/mode/infoinstance.pm
+++ b/centreon-plugins/cloud/openstack/restapi/mode/port.pm
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-package cloud::openstack::restapi::mode::infoinstance;
+package cloud::openstack::restapi::mode::port;
 
 use base qw(centreon::plugins::mode);
 
@@ -26,7 +26,14 @@ use strict;
 use warnings;
 use centreon::plugins::http;
 use JSON;
-use Data::Dumper;
+
+my $thresholds = {
+    status => [
+        ['ACTIVE', 'OK'],
+		['DOWN', 'CRITICAL'],
+		['N/A', 'UNKNOWN'],
+    ],
+};
 
 sub new {
     my ($class, %options) = @_;
@@ -36,28 +43,27 @@ sub new {
     $self->{version} = '1.0';
     $options{options}->add_options(arguments =>
         {
-            "data:s"                => { name => 'data' },
-            "hostname:s"            => { name => 'hostname' },
-            "http-peer-addr:s"      => { name => 'http_peer_addr' },
-            "port:s"                => { name => 'port', default => '5000' },
-            "proto:s"               => { name => 'proto' },
-            "urlpath:s"             => { name => 'url_path', default => '/v3/auth/tokens' },
-            "proxyurl:s"            => { name => 'proxyurl' },
-            "proxypac:s"            => { name => 'proxypac' },
-            "credentials"           => { name => 'credentials' },
-            "username:s"            => { name => 'username' },
-            "password:s"            => { name => 'password' },
-            "ssl:s"                 => { name => 'ssl', },
-            "header:s@"             => { name => 'header' },
-            "exclude:s"             => { name => 'exclude' },
-            "timeout:s"             => { name => 'timeout' },
-            "server-response:s"     => { name => 'server_response', default => 'full' },
-            "tenant-id:s"           => { name => 'tenant_id' },
-            "server-id:s"           => { name => 'server_id' },
+            "data:s"                  => { name => 'data' },
+            "hostname:s"              => { name => 'hostname' },
+            "http-peer-addr:s"        => { name => 'http_peer_addr' },
+            "port:s"                  => { name => 'port', default => '5000' },
+            "proto:s"                 => { name => 'proto' },
+            "urlpath:s"               => { name => 'url_path', default => '/v3/auth/tokens' },
+            "proxyurl:s"              => { name => 'proxyurl' },
+            "proxypac:s"              => { name => 'proxypac' },
+            "credentials"             => { name => 'credentials' },
+            "username:s"              => { name => 'username' },
+            "password:s"              => { name => 'password' },
+            "ssl:s"                   => { name => 'ssl', },
+            "header:s@"               => { name => 'header' },
+            "exclude:s"               => { name => 'exclude' },
+            "timeout:s"               => { name => 'timeout' },
+            "port-id:s"               => { name => 'port_id' },
+			"threshold-overload:s@"   => { name => 'threshold_overload' },
         });
 
     $self->{http} = centreon::plugins::http->new(output => $self->{output});
-    $self->{instance_infos} = ();
+    $self->{port_infos} = ();
     return $self;
 }
 
@@ -65,6 +71,21 @@ sub check_options {
     my ($self, %options) = @_;
     $self->SUPER::init(%options);
 
+	$self->{overload_th} = {};
+    foreach my $val (@{$self->{option_results}->{threshold_overload}}) {
+        if ($val !~ /^(.*?),(.*?),(.*)$/) {
+            $self->{output}->add_option_msg(short_msg => "Wrong threshold-overload option '" . $val . "'.");
+            $self->{output}->option_exit();
+        }
+        my ($section, $status, $filter) = ($1, $2, $3);
+        if ($self->{output}->is_litteral_status(status => $status) == 0) {
+            $self->{output}->add_option_msg(short_msg => "Wrong threshold-overload status '" . $val . "'.");
+            $self->{output}->option_exit();
+        }
+        $self->{overload_th}->{$section} = [] if (!defined($self->{overload_th}->{$section}));
+        push @{$self->{overload_th}->{$section}}, {filter => $filter, status => $status};
+    }
+
     $self->{http}->set_options(%{$self->{option_results}})
 }
 
@@ -86,9 +107,10 @@ sub token_request {
     }
 
     my $response = $self->{http}->request(method => $self->{method}, query_form_post => $self->{json_request});
+    my $headers = $self->{http}->get_header();
 
     eval {
-        $self->{header} = $response->header('X-Subject-Token');
+        $self->{header} = $headers->header('X-Subject-Token');
     };
 
     if ($@) {
@@ -101,10 +123,9 @@ sub api_request {
     my ($self, %options) = @_;
 
     $self->{method} = 'GET';
-    $self->{option_results}->{url_path} = "/v2/".$self->{option_results}->{tenant_id}."/servers/".$self->{option_results}->{server_id};
-    $self->{option_results}->{port} = '8774';
+    $self->{option_results}->{url_path} = "/v2.0/ports/".$self->{option_results}->{port_id};
+    $self->{option_results}->{port} = '9696';
     @{$self->{option_results}->{header}} = ('X-Auth-Token:' . $self->{header}, 'Accept:application/json');
-    $self->{option_results}->{server_response} = 'content';
     $self->{http}->set_options(%{$self->{option_results}});
 
     my $webcontent;
@@ -116,13 +137,32 @@ sub api_request {
         $webcontent = $json->decode($jsoncontent);
     };
 
-    print Dumper($webcontent);
+    $self->{port_infos}->{name} = $webcontent->{port}->{name};
+    $self->{port_infos}->{admin_state} = $webcontent->{port}->{admin_state_up};
+    $self->{port_infos}->{status} = $webcontent->{port}->{status};
+}
 
-    #foreach my $val (@{$webcontent->{servers}}) {
-    #    $self->{instance_infos}->{compute} = $val->{'OS-EXT-SRV-ATTR:host'};
-    #    $self->{instance_infos}->{osname} = $val->{'OS-EXT-SRV-ATTR:instance_name'};
-    #    $self->{instance_infos}->{state} = $val->{status};
-    #}
+
+sub get_severity {
+    my ($self, %options) = @_;
+    my $status = 'UNKNOWN'; # default
+
+    if (defined($self->{overload_th}->{$options{section}})) {
+        foreach (@{$self->{overload_th}->{$options{section}}}) {
+            if ($options{value} =~ /$_->{filter}/i) {
+                $status = $_->{status};
+                return $status;
+            }
+        }
+    }
+    foreach (@{$thresholds->{$options{section}}}) {
+        if ($options{value} =~ /$$_[0]/i) {
+            $status = $$_[1];
+            return $status;
+        }
+    }
+
+    return $status;
 }
 
 sub run {
@@ -131,19 +171,14 @@ sub run {
     $self->token_request();
     $self->api_request();
 
-    #foreach my $instancename (keys %{$self->{instance_infos}}) {
-    #    $self->{output}->output_add(long_msg => sprintf("%s [id = %s , compute = %s, osname = %s, state = %s]",
-    #                                                    $instancename,
-    #                                                    $self->{instance_infos}->{$instancename}->{id},
-    #                                                    $self->{instance_infos}->{$instancename}->{compute},
-    #                                                    $self->{instance_infos}->{$instancename}->{osname},
-    #                                                    $self->{instance_infos}->{$instancename}->{state}));
-    #}
+	my $exit = $self->get_severity(section => 'status', value => $self->{port_infos}->{status});
+	$self->{output}->output_add(severity => $exit,
+    							short_msg => sprintf("Port %s is in %s state (admin_state: %s)",
+                                                    $self->{port_infos}->{name},
+                                                    $self->{port_infos}->{status},
+                                                    $self->{port_infos}->{admin_state}));
 
-    $self->{output}->output_add(severity => 'OK',
-                                short_msg => 'List instances:');
-
-    $self->{output}->display(nolabel => 1, force_ignore_perfdata => 1, force_long_output => 1);
+    $self->{output}->display();
     $self->{output}->exit();
 
     exit 0;
diff --git a/centreon-plugins/cloud/openstack/restapi/mode/volumes.pm b/centreon-plugins/cloud/openstack/restapi/mode/volume.pm
similarity index 54%
rename from centreon-plugins/cloud/openstack/restapi/mode/volumes.pm
rename to centreon-plugins/cloud/openstack/restapi/mode/volume.pm
index 7ba580f91..102c3315b 100644
--- a/centreon-plugins/cloud/openstack/restapi/mode/volumes.pm
+++ b/centreon-plugins/cloud/openstack/restapi/mode/volume.pm
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-package cloud::openstack::restapi::mode::volumes;
+package cloud::openstack::restapi::mode::volume;
 
 use base qw(centreon::plugins::mode);
 
@@ -26,7 +26,22 @@ use strict;
 use warnings;
 use centreon::plugins::http;
 use JSON;
-use Data::Dumper;
+
+my $thresholds = {
+    status => [
+        ['creating', 'OK'],
+        ['available', 'OK'],
+		['attaching', 'OK'],
+        ['in-use', 'OK'],
+		['deleting', 'OK'],
+		['backing-up', 'WARNING'],
+		['restoring-backup', 'WARNING'],
+		['error', 'CRITICAL'],
+		['error_deleting', 'CRITICAL'],
+		['error_restoring', 'CRITICAL'],
+		['error_extending', 'CRITICAL'],
+    ],
+};
 
 sub new {
     my ($class, %options) = @_;
@@ -36,26 +51,28 @@ sub new {
     $self->{version} = '1.0';
     $options{options}->add_options(arguments =>
         {
-            "data:s"                => { name => 'data' },
-            "hostname:s"            => { name => 'hostname' },
-            "http-peer-addr:s"      => { name => 'http_peer_addr' },
-            "port:s"                => { name => 'port', default => '5000' },
-            "proto:s"               => { name => 'proto' },
-            "urlpath:s"             => { name => 'url_path', default => '/v3/auth/tokens' },
-            "proxyurl:s"            => { name => 'proxyurl' },
-            "proxypac:s"            => { name => 'proxypac' },
-            "credentials"           => { name => 'credentials' },
-            "username:s"            => { name => 'username' },
-            "password:s"            => { name => 'password' },
-            "ssl:s"                 => { name => 'ssl', },
-            "header:s@"             => { name => 'header' },
-            "exclude:s"             => { name => 'exclude' },
-            "timeout:s"             => { name => 'timeout' },
-            "tenant-id:s"           => { name => 'tenant_id' },
+            "data:s"                  => { name => 'data' },
+            "hostname:s"              => { name => 'hostname' },
+            "http-peer-addr:s"        => { name => 'http_peer_addr' },
+            "port:s"                  => { name => 'port', default => '5000' },
+            "proto:s"                 => { name => 'proto' },
+            "urlpath:s"               => { name => 'url_path', default => '/v3/auth/tokens' },
+            "proxyurl:s"              => { name => 'proxyurl' },
+            "proxypac:s"              => { name => 'proxypac' },
+            "credentials"             => { name => 'credentials' },
+            "username:s"              => { name => 'username' },
+            "password:s"              => { name => 'password' },
+            "ssl:s"                   => { name => 'ssl', },
+            "header:s@"               => { name => 'header' },
+            "exclude:s"               => { name => 'exclude' },
+            "timeout:s"               => { name => 'timeout' },
+            "tenant-id:s"             => { name => 'tenant_id' },
+            "volume-id:s"             => { name => 'volume_id' },
+			"threshold-overload:s@"   => { name => 'threshold_overload' },
         });
 
     $self->{http} = centreon::plugins::http->new(output => $self->{output});
-    $self->{instance_infos} = ();
+    $self->{volume_infos} = ();
     return $self;
 }
 
@@ -63,17 +80,22 @@ sub check_options {
     my ($self, %options) = @_;
     $self->SUPER::init(%options);
 
-    $self->{http}->set_options(%{$self->{option_results}})
-}
-
-sub check_exclude {
-    my ($self, %options) = @_;
-
-    if (defined($self->{option_results}->{exclude}) && $self->{option_results}->{exclude} =~ /(^|\s|,)${options{status}}(\s|,|$)/) {
-        $self->{output}->output_add(long_msg => sprintf("Skipping ${options{status}} instance."));
-        return 1;
+	$self->{overload_th} = {};
+    foreach my $val (@{$self->{option_results}->{threshold_overload}}) {
+        if ($val !~ /^(.*?),(.*?),(.*)$/) {
+            $self->{output}->add_option_msg(short_msg => "Wrong threshold-overload option '" . $val . "'.");
+            $self->{output}->option_exit();
+        }
+        my ($section, $status, $filter) = ($1, $2, $3);
+        if ($self->{output}->is_litteral_status(status => $status) == 0) {
+            $self->{output}->add_option_msg(short_msg => "Wrong threshold-overload status '" . $val . "'.");
+            $self->{output}->option_exit();
+        }
+        $self->{overload_th}->{$section} = [] if (!defined($self->{overload_th}->{$section}));
+        push @{$self->{overload_th}->{$section}}, {filter => $filter, status => $status};
     }
-    return 0;
+
+    $self->{http}->set_options(%{$self->{option_results}})
 }
 
 sub token_request {
@@ -95,6 +117,7 @@ sub token_request {
 
     my $response = $self->{http}->request(method => $self->{method}, query_form_post => $self->{json_request});
     my $headers = $self->{http}->get_header();
+
     eval {
         $self->{header} = $headers->header('X-Subject-Token');
     };
@@ -109,7 +132,7 @@ sub api_request {
     my ($self, %options) = @_;
 
     $self->{method} = 'GET';
-    $self->{option_results}->{url_path} = "/v2/".$self->{option_results}->{tenant_id}."/volumes/detail";
+    $self->{option_results}->{url_path} = "/v2/".$self->{option_results}->{tenant_id}."/volume/".$self->{option_results}->{volume_id};
     $self->{option_results}->{port} = '8774';
     @{$self->{option_results}->{header}} = ('X-Auth-Token:' . $self->{header}, 'Accept:application/json');
     $self->{http}->set_options(%{$self->{option_results}});
@@ -123,8 +146,31 @@ sub api_request {
         $webcontent = $json->decode($jsoncontent);
     };
 
-    print Dumper($webcontent);
-    exit 1;
+    $self->{volume_infos}->{name} = $webcontent->{volume}->{name};
+    $self->{volume_infos}->{status} = $webcontent->{volume}->{status};
+}
+
+
+sub get_severity {
+    my ($self, %options) = @_;
+    my $status = 'UNKNOWN'; # default
+
+    if (defined($self->{overload_th}->{$options{section}})) {
+        foreach (@{$self->{overload_th}->{$options{section}}}) {
+            if ($options{value} =~ /$_->{filter}/i) {
+                $status = $_->{status};
+                return $status;
+            }
+        }
+    }
+    foreach (@{$thresholds->{$options{section}}}) {
+        if ($options{value} =~ /$$_[0]/i) {
+            $status = $$_[1];
+            return $status;
+        }
+    }
+
+    return $status;
 }
 
 sub run {
@@ -133,19 +179,13 @@ sub run {
     $self->token_request();
     $self->api_request();
 
-    foreach my $instancename (keys %{$self->{instance_infos}}) {
-        $self->{output}->output_add(long_msg => sprintf("%s [id = %s , compute = %s, osname = %s, state = %s]",
-                                                        $instancename,
-                                                        $self->{instance_infos}->{$instancename}->{id},
-                                                        $self->{instance_infos}->{$instancename}->{compute},
-                                                        $self->{instance_infos}->{$instancename}->{osname},
-                                                        $self->{instance_infos}->{$instancename}->{state}));
-    }
+	my $exit = $self->get_severity(section => 'status', value => $self->{volume_infos}->{status});
+	$self->{output}->output_add(severity => $exit,
+    							short_msg => sprintf("Volume %s is in %s state",
+                                                    $self->{volume_infos}->{name},
+                                                    $self->{volume_infos}->{status},
 
-    $self->{output}->output_add(severity => 'OK',
-                                short_msg => 'List instances:');
-
-    $self->{output}->display(nolabel => 1, force_ignore_perfdata => 1, force_long_output => 1);
+    $self->{output}->display();
     $self->{output}->exit();
 
     exit 0;
diff --git a/centreon-plugins/cloud/openstack/restapi/plugin.pm b/centreon-plugins/cloud/openstack/restapi/plugin.pm
index 0b0edb844..02472d562 100644
--- a/centreon-plugins/cloud/openstack/restapi/plugin.pm
+++ b/centreon-plugins/cloud/openstack/restapi/plugin.pm
@@ -32,11 +32,13 @@ sub new {
 
     $self->{version} = '0.1';
     %{$self->{modes}} = (
-                        'info-instance'    => 'cloud::openstack::restapi::mode::infoinstance',
+                        'instance'         => 'cloud::openstack::restapi::mode::instance',
                         'list-instances'   => 'cloud::openstack::restapi::mode::listinstances',
                         'list-hypervisors' => 'cloud::openstack::restapi::mode::listhypervisors',
-                        'floatingips'      => 'cloud::openstack::restapi::mode::floatingips',
-                        'volumes'          => 'cloud::openstack::restapi::mode::volumes',
+                        'volume'           => 'cloud::openstack::restapi::mode::volume',
+                        'hypervisor'       => 'cloud::openstack::restapi::mode::hypervisor',
+                        'network'          => 'cloud::openstack::restapi::mode::network',
+                        'port'             => 'cloud::openstack::restapi::mode::port',
                         );
     return $self;
 }