diff --git a/network/nokia/timos/snmp/mode/listsap.pm b/network/nokia/timos/snmp/mode/listsap.pm
new file mode 100644
index 000000000..dff5ee06a
--- /dev/null
+++ b/network/nokia/timos/snmp/mode/listsap.pm
@@ -0,0 +1,138 @@
+#
+# Copyright 2017 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 network::nokia::timos::snmp::mode::listsap;
+
+use base qw(centreon::plugins::mode);
+
+use strict;
+use warnings;
+
+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 =>
+                                {
+                                  "filter-name:s"       => { name => 'filter_name' },
+                                });
+    return $self;
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::init(%options);
+}
+
+my %map_admin_status = (1 => 'up', 2 => 'down');
+my %map_oper_status = (1 => 'up', 2 => 'down', 3 => 'ingressQosMismatch',
+    4 => 'egressQosMismatch', 5 => 'portMtuTooSmall', 6 => 'svcAdminDown',
+    7 => 'iesIfAdminDown',
+);
+my $mapping = {
+    sapDescription  => { oid => '.1.3.6.1.4.1.6527.3.1.2.4.3.2.1.5' },
+    sapAdminStatus  => { oid => '.1.3.6.1.4.1.6527.3.1.2.4.3.2.1.6', map => \%map_admin_status },
+    sapOperStatus   => { oid => '.1.3.6.1.4.1.6527.3.1.2.4.3.2.1.7', map => \%map_oper_status },
+};
+
+sub manage_selection {
+    my ($self, %options) = @_;
+
+    my $snmp_result = $options{snmp}->get_multiple_table(oids => [ 
+            { oid => $mapping->{sapDescription}->{oid} },
+            { oid => $mapping->{sapAdminStatus}->{oid} },
+            { oid => $mapping->{sapOperStatus}->{oid} },
+        ],
+        return_type => 1, nothing_quit => 1);
+    $self->{sap} = {};
+    foreach my $oid (keys %{$snmp_result}) {
+        next if ($oid !~ /^$mapping->{sapOperStatus}->{oid}\.(.*)$/);
+        my $instance = $1;
+        my $result = $options{snmp}->map_instance(mapping => $mapping, results => $snmp_result, instance => $instance);
+
+        if (!defined($result->{sapDescription}) || $result->{sapDescription} eq '') {
+            $self->{output}->output_add(long_msg => "skipping sap '$instance': cannot get a description. please set it.", debug => 1);
+            next;
+        }
+        if (defined($self->{option_results}->{filter_name}) && $self->{option_results}->{filter_name} ne '' &&
+            $result->{sapDescription} !~ /$self->{option_results}->{filter_name}/) {
+            $self->{output}->output_add(long_msg => "skipping '" . $result->{sapDescription} . "': no matching filter.", debug => 1);
+            next;
+        }
+        
+        $self->{sap}->{$instance} = { description => $result->{sapDescription}, 
+            admin_state => $result->{sapAdminStatus}, oper_state => $result->{sapOperStatus} };
+    }
+}
+
+sub run {
+    my ($self, %options) = @_;
+  
+    $self->manage_selection(%options);
+    foreach my $instance (sort keys %{$self->{sap}}) { 
+        $self->{output}->output_add(long_msg => '[description = ' . $self->{sap}->{$instance}->{description} . 
+            "] [admin = '" . $self->{sap}->{$instance}->{admin_state} . 
+            "'] [oper = '" . $self->{sap}->{$instance}->{oper_state} . '"]');
+    }
+    
+    $self->{output}->output_add(severity => 'OK',
+                                short_msg => 'List SAPs:');
+    $self->{output}->display(nolabel => 1, force_ignore_perfdata => 1, force_long_output => 1);
+    $self->{output}->exit();
+}
+
+sub disco_format {
+    my ($self, %options) = @_;
+    
+    $self->{output}->add_disco_format(elements => ['description', 'admin', 'oper']);
+}
+
+sub disco_show {
+    my ($self, %options) = @_;
+
+    $self->manage_selection(%options);
+    foreach my $instance (sort keys %{$self->{sap}}) {             
+        $self->{output}->add_disco_entry(description => $self->{sap}->{$instance}->{description},
+            admin => $self->{sap}->{$instance}->{admin_state},
+            oper => $self->{sap}->{$instance}->{oper_state},
+        );
+    }
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+List Service Access Points.
+
+=over 8
+
+=item B<--filter-name>
+
+Filter by sap description (can be a regexp).
+
+=back
+
+=cut
+    
diff --git a/network/nokia/timos/snmp/mode/sapusage.pm b/network/nokia/timos/snmp/mode/sapusage.pm
new file mode 100644
index 000000000..930305367
--- /dev/null
+++ b/network/nokia/timos/snmp/mode/sapusage.pm
@@ -0,0 +1,280 @@
+#
+# Copyright 2017 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 network::nokia::timos::snmp::mode::sapusage;
+
+use base qw(centreon::plugins::templates::counter);
+
+use strict;
+use warnings;
+use Digest::MD5 qw(md5_hex);
+
+my $instance_mode;
+
+sub custom_status_threshold {
+    my ($self, %options) = @_; 
+    my $status = 'ok';
+    my $message;
+    
+    eval {
+        local $SIG{__WARN__} = sub { $message = $_[0]; };
+        local $SIG{__DIE__} = sub { $message = $_[0]; };
+        
+        if (defined($instance_mode->{option_results}->{critical_status}) && $instance_mode->{option_results}->{critical_status} ne '' &&
+            eval "$instance_mode->{option_results}->{critical_status}") {
+            $status = 'critical';
+        } elsif (defined($instance_mode->{option_results}->{warning_status}) && $instance_mode->{option_results}->{warning_status} ne '' &&
+                 eval "$instance_mode->{option_results}->{warning_status}") {
+            $status = 'warning';
+        }
+    };
+    if (defined($message)) {
+        $self->{output}->output_add(long_msg => 'filter status issue: ' . $message);
+    }
+
+    return $status;
+}
+
+sub custom_status_output {
+    my ($self, %options) = @_;
+    
+    my $msg = 'state : ' . $self->{result_values}->{oper_state} . ' (admin: ' . $self->{result_values}->{admin_state} . ')';
+    return $msg;
+}
+
+sub custom_status_calc {
+    my ($self, %options) = @_;
+    
+    $self->{result_values}->{oper_state} = $options{new_datas}->{$self->{instance} . '_sapOperStatus'};
+    $self->{result_values}->{admin_state} = $options{new_datas}->{$self->{instance} . '_sapAdminStatus'};
+    $self->{result_values}->{display} = $options{new_datas}->{$self->{instance} . '_display'};
+    return 0;
+}
+
+sub set_counters {
+    my ($self, %options) = @_;
+    
+    $self->{maps_counters_type} = [
+        { name => 'sap', type => 1, cb_prefix_output => 'prefix_sap_output', message_multiple => 'All service access points are ok' }
+    ];
+    
+    $self->{maps_counters}->{sap} = [
+        { label => 'status', threshold => 0, set => {
+                key_values => [ { name => 'sapAdminStatus' }, { name => 'sapOperStatus' }, { name => 'display' } ],
+                closure_custom_calc => $self->can('custom_status_calc'),
+                closure_custom_output => $self->can('custom_status_output'),
+                closure_custom_perfdata => sub { return 0; },
+                closure_custom_threshold_check => $self->can('custom_status_threshold'),
+            }
+        },
+        { label => 'traffic-in-below-cir', set => {
+                key_values => [ { name => 'sapBaseStatsIngressQchipForwardedInProfOctets', diff => 1 }, { name => 'display' } ],
+                per_second => 1, output_change_bytes => 2,
+                output_template => 'Traffic In Below CIR : %s %s/s',
+                perfdatas => [
+                    { label => 'traffic_in_below_cir', value => 'sapBaseStatsIngressQchipForwardedInProfOctets_per_second', template => '%.2f',
+                      min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' },
+                ],
+            }
+        },
+        { label => 'traffic-in-above-cir', set => {
+                key_values => [ { name => 'sapBaseStatsIngressQchipForwardedOutProfOctets', diff => 1 }, { name => 'display' } ],
+                per_second => 1, output_change_bytes => 2,
+                output_template => 'Traffic In Above CIR : %s %s/s',
+                perfdatas => [
+                    { label => 'traffic_in_above_cir', value => 'sapBaseStatsIngressQchipForwardedOutProfOctets_per_second', template => '%.2f',
+                      min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' },
+                ],
+            }
+        },
+        { label => 'traffic-out-below-cir', set => {
+                key_values => [ { name => 'sapBaseStatsEgressQchipForwardedInProfOctets', diff => 1 }, { name => 'display' } ],
+                per_second => 1, output_change_bytes => 2,
+                output_template => 'Traffic Out Below CIR : %s %s/s',
+                perfdatas => [
+                    { label => 'traffic_out_below_cir', value => 'sapBaseStatsEgressQchipForwardedInProfOctets_per_second', template => '%.2f',
+                      min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' },
+                ],
+            }
+        },
+        { label => 'traffic-out-below-cir', set => {
+                key_values => [ { name => 'sapBaseStatsEgressQchipForwardedOutProfOctets', diff => 1 }, { name => 'display' } ],
+                per_second => 1, output_change_bytes => 2,
+                output_template => 'Traffic Out Above CIR : %s %s/s',
+                perfdatas => [
+                    { label => 'traffic_out_above_cir', value => 'sapBaseStatsEgressQchipForwardedOutProfOctets_per_second', template => '%.2f',
+                      min => 0, unit => 'b/s', label_extra_instance => 1, instance_use => 'display_absolute' },
+                ],
+            }
+        },
+    ];
+}
+
+sub prefix_sap_output {
+    my ($self, %options) = @_;
+    
+    return "Service Access Point '" . $options{instance_value}->{display} . "' ";
+}
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1);
+    bless $self, $class;
+    
+    $self->{version} = '1.0';
+    $options{options}->add_options(arguments =>
+                                {
+                                  "filter-name:s"       => { name => 'filter_name' },
+                                  "warning-status:s"    => { name => 'warning_status', default => '' },
+                                  "critical-status:s"   => { name => 'critical_status', default => '%{admin_state} eq "up" and %{oper_state} !~ /up/' },
+                                });
+    
+    return $self;
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::check_options(%options);
+
+    $instance_mode = $self;
+    $self->change_macros();
+}
+
+sub change_macros {
+    my ($self, %options) = @_;
+    
+    foreach (('warning_status', 'critical_status')) {
+        if (defined($self->{option_results}->{$_})) {
+            $self->{option_results}->{$_} =~ s/%\{(.*?)\}/\$self->{result_values}->{$1}/g;
+        }
+    }
+}
+
+my %map_admin_status = (1 => 'up', 2 => 'down');
+my %map_oper_status = (1 => 'up', 2 => 'down', 3 => 'ingressQosMismatch',
+    4 => 'egressQosMismatch', 5 => 'portMtuTooSmall', 6 => 'svcAdminDown',
+    7 => 'iesIfAdminDown',
+);
+my $mapping = {
+    sapDescription  => { oid => '.1.3.6.1.4.1.6527.3.1.2.4.3.2.1.5' },
+    sapAdminStatus  => { oid => '.1.3.6.1.4.1.6527.3.1.2.4.3.2.1.6', map => \%map_admin_status },
+    sapOperStatus   => { oid => '.1.3.6.1.4.1.6527.3.1.2.4.3.2.1.7', map => \%map_oper_status },
+    sapBaseStatsIngressQchipForwardedInProfOctets   => { oid => '.1.3.6.1.4.1.6527.3.1.2.4.3.6.1.12' },
+    sapBaseStatsIngressQchipForwardedOutProfOctets  => { oid => '.1.3.6.1.4.1.6527.3.1.2.4.3.6.1.14' },
+    sapBaseStatsEgressQchipForwardedInProfOctets    => { oid => '.1.3.6.1.4.1.6527.3.1.2.4.3.6.1.20' },
+    sapBaseStatsEgressQchipForwardedOutProfOctets   => { oid => '.1.3.6.1.4.1.6527.3.1.2.4.3.6.1.22' },
+};
+
+sub manage_selection {
+    my ($self, %options) = @_;
+
+    if ($options{snmp}->is_snmpv1()) {
+        $self->{output}->add_option_msg(short_msg => "Need to use SNMP v2c or v3.");
+        $self->{output}->option_exit();
+    }
+
+    my $snmp_result = $options{snmp}->get_multiple_table(oids => [
+                                                            { oid => $mapping->{sapDescription}->{oid} },
+                                                         ], return_type => 1, nothing_quit => 1);
+
+    $self->{sap} = {};
+    foreach my $oid (keys %{$snmp_result}) {
+        $oid =~ /^$mapping->{sapDescription}->{oid}\.(.*)$/;
+        my $instance = $1;
+        if (!defined($snmp_result->{$oid}) || $snmp_result->{$oid} eq '') {
+            $self->{output}->output_add(long_msg => "skipping sap '$instance': cannot get a description. please set it.", debug => 1);
+            next;
+        }
+        if (defined($self->{option_results}->{filter_name}) && $self->{option_results}->{filter_name} ne '' &&
+            $snmp_result->{$oid} !~ /$self->{option_results}->{filter_name}/) {
+            $self->{output}->output_add(long_msg => "skipping sap '" . $snmp_result->{$oid} . "'.", debug => 1);
+            next;
+        }
+        
+        $self->{sap}->{$instance} = { display => $snmp_result->{$oid} };
+    }
+    
+    $options{snmp}->load(oids => [$mapping->{sapAdminStatus}->{oid}, $mapping->{sapOperStatus}->{oid},
+        $mapping->{sapBaseStatsIngressQchipForwardedInProfOctets}->{oid}, $mapping->{sapBaseStatsIngressQchipForwardedOutProfOctets}->{oid},
+        $mapping->{sapBaseStatsEgressQchipForwardedInProfOctets}->{oid}, $mapping->{sapBaseStatsEgressQchipForwardedOutProfOctets}->{oid},
+        ], 
+        instances => [keys %{$self->{sap}}], instance_regexp => '^(.*)$');
+    $snmp_result = $options{snmp}->get_leef(nothing_quit => 1);
+    
+    foreach (keys %{$self->{sap}}) {
+        my $result = $options{snmp}->map_instance(mapping => $mapping, results => $snmp_result, instance => $_);        
+        
+        foreach my $name (('sapBaseStatsIngressQchipForwardedInProfOctets', 'sapBaseStatsIngressQchipForwardedOutProfOctets',
+                           'sapBaseStatsEgressQchipForwardedInProfOctets', 'sapBaseStatsEgressQchipForwardedOutProfOctets')) {
+            $result->{$name} *= 8;
+        }
+        
+        foreach my $name (keys %$mapping) {
+            $self->{sap}->{$_}->{$name} = $result->{$name} if (defined($result->{$name}));
+        }
+    }
+    
+    if (scalar(keys %{$self->{sap}}) <= 0) {
+        $self->{output}->add_option_msg(short_msg => "No service access point found.");
+        $self->{output}->option_exit();
+    }
+    
+    $self->{cache_name} = "nokia_timos_" . $self->{mode} . '_' . $options{snmp}->get_hostname()  . '_' . $options{snmp}->get_port() . '_' .
+        (defined($self->{option_results}->{filter_counters}) ? md5_hex($self->{option_results}->{filter_counters}) : md5_hex('all')) . '_' .
+        (defined($self->{option_results}->{filter_name}) ? md5_hex($self->{option_results}->{filter_name}) : md5_hex('all'));
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+Check service access point usage.
+
+=over 8
+
+=item B<--warning-status>
+
+Set warning threshold for status.
+Can used special variables like: %{status}, %{display}
+
+=item B<--critical-status>
+
+Set critical threshold for status (Default: '%{admin_state} eq "up" and %{oper_state} !~ /up/').
+Can used special variables like: %{status}, %{display}
+
+=item B<--warning-*>
+
+Threshold warning.
+Can be: 'traffic-in-above-cir', 'traffic-in-below-cir', 'traffic-out-above-cir', 'traffic-out-below-cir'.
+
+=item B<--critical-*>
+
+Threshold critical.
+Can be: 'traffic-in-above-cir', 'traffic-in-below-cir', 'traffic-out-above-cir', 'traffic-out-below-cir'.
+
+=item B<--filter-name>
+
+Filter by virtual server name (can be a regexp).
+
+=back
+
+=cut
diff --git a/network/nokia/timos/snmp/plugin.pm b/network/nokia/timos/snmp/plugin.pm
index 6c7c6fbc1..2e13bdccc 100644
--- a/network/nokia/timos/snmp/plugin.pm
+++ b/network/nokia/timos/snmp/plugin.pm
@@ -42,8 +42,10 @@ sub new {
                          'list-interfaces'  => 'snmp_standard::mode::listinterfaces',
                          'list-isis'        => 'network::nokia::timos::snmp::mode::listisis',
                          'list-ldp'         => 'network::nokia::timos::snmp::mode::listldp',
+                         'list-sap'         => 'network::nokia::timos::snmp::mode::listsap',
                          'list-vrtr'        => 'network::nokia::timos::snmp::mode::listvrtr',
                          'memory'           => 'network::nokia::timos::snmp::mode::memory',
+                         'sap-usage'        => 'network::nokia::timos::snmp::mode::sapusage',
                          'uptime'           => 'snmp_standard::mode::uptime',
                          );