Mpls Path Visualization (#10936)

* update nokia mibs

* database migrations

* add code

* html code

* update db schema

* add test data

* add FIXME

* move mibs/nokia/MPLS-TE-MIB to mibs/MPLS-TE-MIB

LibreNMS/Interfaces/Discovery/MplsDiscovery.php

@@ -62,4 +62,14 @@ interface MplsDiscovery
      * @return Collection MplsSdpBind objects
      */
     public function discoverMplsSdpBinds($sdps, $svcs);
+
+    /**
+     * @return Collection MplsTunnelArHop objects
+     */
+    public function discoverMplsTunnelArHops($paths);
+
+    /**
+     * @return Collection MplsTunnelCHop objects
+     */
+    public function discoverMplsTunnelCHops($paths);
 }

LibreNMS/Interfaces/Polling/MplsPolling.php

@@ -62,4 +62,14 @@ interface MplsPolling
      * @return Collection MplsSdpBind objects
      */
     public function pollMplsSdpBinds($sdps, $svcs);
+
+    /**
+     * @return Collection MplsTunnelArHop objects
+     */
+    public function pollMplsTunnelArHops($paths);
+
+    /**
+     * @return Collection MplsTunnelCHop objects
+     */
+    public function pollMplsTunnelCHops($paths);
 }

LibreNMS/Modules/Mpls.php

@@ -53,7 +53,7 @@ class Mpls implements Module
 
             echo "\nMPLS LSP Paths: ";
             ModuleModelObserver::observe('\App\Models\MplsLspPath');
-            $this->syncModels($os->getDeviceModel(), 'mplsLspPaths', $os->discoverMplsPaths($lsps));
+            $paths = $this->syncModels($os->getDeviceModel(), 'mplsLspPaths', $os->discoverMplsPaths($lsps));
 
             echo "\nMPLS SDPs: ";
             ModuleModelObserver::observe('\App\Models\MplsSdp');
@@ -71,6 +71,14 @@ class Mpls implements Module
             ModuleModelObserver::observe('\App\Models\MplsSdpBind');
             $this->syncModels($os->getDeviceModel(), 'mplsSdpBinds', $os->discoverMplsSdpBinds($sdps, $svcs));
 
+            echo "\nMPLS Tunnel Active Routing Hops: ";
+            ModuleModelObserver::observe('\App\Models\MplsTunnelArHop');
+            $this->syncModels($os->getDeviceModel(), 'mplsTunnelArHops', $os->discoverMplsTunnelArHops($paths));
+
+            echo "\nMPLS Tunnel Constrained Shortest Path First Hops: ";
+            ModuleModelObserver::observe('\App\Models\MplsTunnelCHop');
+            $this->syncModels($os->getDeviceModel(), 'mplsTunnelCHops', $os->discoverMplsTunnelCHops($paths));
+
             echo PHP_EOL;
         }
     }
@@ -96,7 +104,7 @@ class Mpls implements Module
             if ($device->mplsLspPaths()->exists()) {
                 echo "\nMPLS LSP Paths: ";
                 ModuleModelObserver::observe('\App\Models\MplsLspPath');
-                $this->syncModels($device, 'mplsLspPaths', $os->pollMplsPaths($lsps));
+                $paths = $this->syncModels($device, 'mplsLspPaths', $os->pollMplsPaths($lsps));
             }
 
             if ($device->mplsSdps()->exists()) {
@@ -123,6 +131,18 @@ class Mpls implements Module
                 $this->syncModels($device, 'mplsSdpBinds', $os->pollMplsSdpBinds($sdps, $svcs));
             }
 
+            if ($device->mplsTunnelArHops()->exists()) {
+                echo "\nMPLS Tunnel Active Routing Hops: ";
+                ModuleModelObserver::observe('\App\Models\MplsTunnelArHop');
+                $this->syncModels($device, 'mplsTunnelArHops', $os->pollMplsTunnelArHops($paths));
+            }
+
+            if ($device->mplsTunnelCHops()->exists()) {
+                echo "\nMPLS Tunnel Constrained Shortest Path First Hops: ";
+                ModuleModelObserver::observe('\App\Models\MplsTunnelCHop');
+                $this->syncModels($device, 'mplsTunnelCHops', $os->pollMplsTunnelCHops($paths));
+            }
+
             echo PHP_EOL;
         }
     }
@@ -141,5 +161,7 @@ class Mpls implements Module
         $os->getDeviceModel()->mplsServices()->delete();
         $os->getDeviceModel()->mplsSaps()->delete();
         $os->getDeviceModel()->mplsSdpBinds()->delete();
+        $os->getDeviceModel()->mplsTunnelArHops()->delete();
+        $os->getDeviceModel()->mplsTunnelCHops()->delete();
     }
 }

LibreNMS/OS/Timos.php

@@ -33,6 +33,8 @@ use App\Models\MplsSdp;
 use App\Models\MplsService;
 use App\Models\MplsSap;
 use App\Models\MplsSdpBind;
+use App\Models\MplsTunnelArHop;
+use App\Models\MplsTunnelCHop;
 use Illuminate\Support\Collection;
 use LibreNMS\Interfaces\Discovery\MplsDiscovery;
 use LibreNMS\Interfaces\Polling\MplsPolling;
@@ -147,6 +149,8 @@ class Timos extends OS implements MplsDiscovery, MplsPolling
                 'mplsLspPathFailNodeAddr' => $value['vRtrMplsLspPathFailNodeAddr'],
                 'mplsLspPathMetric' => $value['vRtrMplsLspPathMetric'],
                 'mplsLspPathOperMetric' => $value['vRtrMplsLspPathOperMetric'],
+                'mplsLspPathTunnelARHopListIndex' => $value['vRtrMplsLspPathTunnelARHopListIndex'],
+                'mplsLspPathTunnelCHopListIndex' => $value['vRtrMplsLspPathTunnelCRHopListIndex'],
             ]));
         }
 
@@ -293,28 +297,112 @@ class Timos extends OS implements MplsDiscovery, MplsPolling
             $svc_oid = hexdec(substr($bind_id, 9, 16));
             $sdp_id = $sdps->firstWhere('sdp_oid', $sdp_oid)->sdp_id;
             $svc_id = $svcs->firstWhere('svc_oid', $svcId)->svc_id;
-            $binds->push(new MplsSdpBind([
+            if (isset($sdp_id, $svc_id, $sdp_oid, $svc_oid)) {
-                'sdp_id' => $sdp_id,
+                $binds->push(new MplsSdpBind([
-                'svc_id' => $svc_id,
+                    'sdp_id' => $sdp_id,
-                'sdp_oid' => $sdp_oid,
+                    'svc_id' => $svc_id,
-                'svc_oid' => $svc_oid,
+                    'sdp_oid' => $sdp_oid,
-                'device_id' => $this->getDeviceId(),
+                    'svc_oid' => $svc_oid,
-                'sdpBindRowStatus' => $value['sdpBindRowStatus'],
+                    'device_id' => $this->getDeviceId(),
-                'sdpBindAdminStatus' => $value['sdpBindAdminStatus'],
+                    'sdpBindRowStatus' => $value['sdpBindRowStatus'],
-                'sdpBindOperStatus' => $value['sdpBindOperStatus'],
+                    'sdpBindAdminStatus' => $value['sdpBindAdminStatus'],
-                'sdpBindLastMgmtChange' => round($value['sdpBindLastMgmtChange'] / 100),
+                    'sdpBindOperStatus' => $value['sdpBindOperStatus'],
-                'sdpBindLastStatusChange' => round($value['sdpBindLastStatusChange'] / 100),
+                    'sdpBindLastMgmtChange' => round($value['sdpBindLastMgmtChange'] / 100),
-                'sdpBindType' => $value['sdpBindType'],
+                    'sdpBindLastStatusChange' => round($value['sdpBindLastStatusChange'] / 100),
-                'sdpBindVcType' => $value['sdpBindVcType'],
+                    'sdpBindType' => $value['sdpBindType'],
-                'sdpBindBaseStatsIngFwdPackets' => $value['sdpBindBaseStatsIngressForwardedPackets'],
+                    'sdpBindVcType' => $value['sdpBindVcType'],
-                'sdpBindBaseStatsIngFwdOctets' => $value['sdpBindBaseStatsIngFwdOctets'],
+                    'sdpBindBaseStatsIngFwdPackets' => $value['sdpBindBaseStatsIngressForwardedPackets'],
-                'sdpBindBaseStatsEgrFwdPackets' => $value['sdpBindBaseStatsEgressForwardedPackets'],
+                    'sdpBindBaseStatsIngFwdOctets' => $value['sdpBindBaseStatsIngFwdOctets'],
-                'sdpBindBaseStatsEgrFwdOctets' => $value['sdpBindBaseStatsEgressForwardedOctets'],
+                    'sdpBindBaseStatsEgrFwdPackets' => $value['sdpBindBaseStatsEgressForwardedPackets'],
-            ]));
+                    'sdpBindBaseStatsEgrFwdOctets' => $value['sdpBindBaseStatsEgressForwardedOctets'],
+                ]));
+            }
         }
         return $binds;
     }
 
+    /**
+     * @return Collection MplsTunnelArHop objects
+     */
+    public function discoverMplsTunnelArHops($paths)
+    {
+        $mplsTunnelArHopCache = snmpwalk_cache_multi_oid($this->getDevice(), 'mplsTunnelARHopTable', [], 'MPLS-TE-MIB', 'nokia', '-OQUsbt');
+        $mplsTunnelArHopCache = snmpwalk_cache_multi_oid($this->getDevice(), 'vRtrMplsTunnelARHopTable', $mplsTunnelArHopCache, 'TIMETRA-MPLS-MIB', 'nokia', '-OQUsb');
+
+        // vRtrMplsTunnelARHopProtection Bits
+        $localAvailable     = 0b10000000;
+        $localInUse         = 0b01000000;
+        $bandwidthProtected = 0b00100000;
+        $nodeProtected      = 0b00010000;
+        $preemptionPending  = 0b00001000;
+        $nodeId             = 0b00000100;
+
+
+        $arhops = collect();
+        foreach ($mplsTunnelArHopCache as $key => $value) {
+            list($mplsTunnelARHopListIndex, $mplsTunnelARHopIndex) = explode('.', $key);
+            $lsp_path_id = $paths->firstWhere('mplsLspPathTunnelARHopListIndex', $mplsTunnelARHopListIndex)->lsp_path_id;
+            $protection = intval($value['vRtrMplsTunnelARHopProtection'], 16);
+
+            $localLinkProtection = ($protection & $localAvailable) ? "true" : "false";
+            $linkProtectionInUse = ($protection & $localInUse) ? "true" : "false";
+            $bandwidthProtection = ($protection & $bandwidthProtected) ? "true" : "false";
+            $nextNodeProtection  = ($protection & $nodeProtected) ? "true" : "false";
+
+            if (isset($mplsTunnelARHopListIndex, $mplsTunnelARHopIndex, $lsp_path_id)) {
+                $arhops->push(new MplsTunnelArHop([
+                    'mplsTunnelARHopListIndex' => $mplsTunnelARHopListIndex,
+                    'mplsTunnelARHopIndex' => $mplsTunnelARHopIndex,
+                    'lsp_path_id' => $lsp_path_id,
+                    'device_id' => $this->getDeviceId(),
+                    'mplsTunnelARHopAddrType' => $value['mplsTunnelARHopAddrType'],
+                    'mplsTunnelARHopIpv4Addr' => $value['mplsTunnelARHopIpv4Addr'],
+                    'mplsTunnelARHopIpv6Addr' => $value['mplsTunnelARHopIpv6Addr'],
+                    'mplsTunnelARHopAsNumber' => $value['mplsTunnelARHopAsNumber'],
+                    'mplsTunnelARHopStrictOrLoose' => $value['mplsTunnelARHopStrictOrLoose'],
+                    'mplsTunnelARHopRouterId' => $value['vRtrMplsTunnelARHopRouterId'],
+                    'localProtected' => $localLinkProtection,
+                    'linkProtectionInUse' => $linkProtectionInUse,
+                    'bandwidthProtected' => $bandwidthProtection,
+                    'nextNodeProtected' => $nextNodeProtection,
+                ]));
+            }
+        }
+        return $arhops;
+    }
+
+    /**
+     * @return Collection MplsTunnelCHop objects
+     */
+    public function discoverMplsTunnelCHops($paths)
+    {
+        $mplsTunnelCHopCache = snmpwalk_cache_multi_oid($this->getDevice(), 'vRtrMplsTunnelCHopTable', [], 'TIMETRA-MPLS-MIB', 'nokia', '-OQUsb');
+
+        $chops = collect();
+        d_echo($mplsTunnelCHopCache);
+        foreach ($mplsTunnelCHopCache as $key => $value) {
+            list($mplsTunnelCHopListIndex, $mplsTunnelCHopIndex) = explode('.', $key);
+            $lsp_path_id = $paths->firstWhere('mplsLspPathTunnelCHopListIndex', $mplsTunnelCHopListIndex)->lsp_path_id;
+            d_echo('mplsTunnelCHopListIndex: ' . $mplsTunnelCHopListIndex . '  mplsTunnelCHopIndex: ' . $mplsTunnelCHopIndex . '  path: ' . $paths->firstWhere('mplsLspPathTunnelCHopListIndex', $mplsTunnelCHopListIndex));
+
+#            if (isset($mplsTunnelCHopListIndex, $mplsTunnelCHopIndex, $lsp_path_id)) { 
+                $chops->push(new MplsTunnelCHop([
+                    'mplsTunnelCHopListIndex' => $mplsTunnelCHopListIndex,
+                    'mplsTunnelCHopIndex' => $mplsTunnelCHopIndex,
+                    'lsp_path_id' => $lsp_path_id,
+                    'device_id' => $this->getDeviceId(),
+                    'mplsTunnelCHopAddrType' => $value['vRtrMplsTunnelCHopAddrType'],
+                    'mplsTunnelCHopIpv4Addr' => $value['vRtrMplsTunnelCHopIpv4Addr'],
+                    'mplsTunnelCHopIpv6Addr' => $value['vRtrMplsTunnelCHopIpv6Addr'],
+                    'mplsTunnelCHopAsNumber' => $value['vRtrMplsTunnelCHopAsNumber'],
+                    'mplsTunnelCHopStrictOrLoose' => $value['vRtrMplsTunnelCHopStrictOrLoose'],
+                    'mplsTunnelCHopRouterId' => $value['vRtrMplsTunnelCHopRtrID'],
+                ]));
+#            }
+        }
+        return $chops;
+    }
+
     /**
      * @return Collection MplsLsp objects
      */
@@ -392,6 +480,8 @@ class Timos extends OS implements MplsDiscovery, MplsPolling
                 'mplsLspPathTimeUp' => abs($value['vRtrMplsLspPathTimeUp']),
                 'mplsLspPathTimeDown' => abs($value['vRtrMplsLspPathTimeDown']),
                 'mplsLspPathTransitionCount' => $value['vRtrMplsLspPathTransitionCount'],
+                'mplsLspPathTunnelARHopListIndex' => $value['vRtrMplsLspPathTunnelARHopListIndex'],
+                'mplsLspPathTunnelCHopListIndex' => $value['vRtrMplsLspPathTunnelCRHopListIndex'],
             ]));
         }
 
@@ -537,26 +627,108 @@ class Timos extends OS implements MplsDiscovery, MplsPolling
             $svc_oid = hexdec(substr($bind_id, 9, 16));
             $sdp_id = $sdps->firstWhere('sdp_oid', $sdp_oid)->sdp_id;
             $svc_id = $svcs->firstWhere('svc_oid', $svcId)->svc_id;
-            $binds->push(new MplsSdpBind([
+            if (isset($sdp_id, $svc_id, $sdp_oid, $svc_oid)) {
-                'sdp_id' => $sdp_id,
+                $binds->push(new MplsSdpBind([
-                'svc_id' => $svc_id,
+                    'sdp_id' => $sdp_id,
-                'sdp_oid' => $sdp_oid,
+                    'svc_id' => $svc_id,
-                'svc_oid' => $svc_oid,
+                    'sdp_oid' => $sdp_oid,
-                'device_id' => $this->getDeviceId(),
+                    'svc_oid' => $svc_oid,
-                'sdpBindRowStatus' => $value['sdpBindRowStatus'],
+                    'device_id' => $this->getDeviceId(),
-                'sdpBindAdminStatus' => $value['sdpBindAdminStatus'],
+                    'sdpBindRowStatus' => $value['sdpBindRowStatus'],
-                'sdpBindOperStatus' => $value['sdpBindOperStatus'],
+                    'sdpBindAdminStatus' => $value['sdpBindAdminStatus'],
-                'sdpBindLastMgmtChange' => round($value['sdpBindLastMgmtChange'] / 100),
+                    'sdpBindOperStatus' => $value['sdpBindOperStatus'],
-                'sdpBindLastStatusChange' => round($value['sdpBindLastStatusChange'] / 100),
+                    'sdpBindLastMgmtChange' => round($value['sdpBindLastMgmtChange'] / 100),
-                'sdpBindType' => $value['sdpBindType'],
+                    'sdpBindLastStatusChange' => round($value['sdpBindLastStatusChange'] / 100),
-                'sdpBindVcType' => $value['sdpBindVcType'],
+                    'sdpBindType' => $value['sdpBindType'],
-                'sdpBindBaseStatsIngFwdPackets' => $value['sdpBindBaseStatsIngressForwardedPackets'],
+                    'sdpBindVcType' => $value['sdpBindVcType'],
-                'sdpBindBaseStatsIngFwdOctets' => $value['sdpBindBaseStatsIngFwdOctets'],
+                    'sdpBindBaseStatsIngFwdPackets' => $value['sdpBindBaseStatsIngressForwardedPackets'],
-                'sdpBindBaseStatsEgrFwdPackets' => $value['sdpBindBaseStatsEgressForwardedPackets'],
+                    'sdpBindBaseStatsIngFwdOctets' => $value['sdpBindBaseStatsIngFwdOctets'],
-                'sdpBindBaseStatsEgrFwdOctets' => $value['sdpBindBaseStatsEgressForwardedOctets'],
+                    'sdpBindBaseStatsEgrFwdPackets' => $value['sdpBindBaseStatsEgressForwardedPackets'],
-            ]));
+                    'sdpBindBaseStatsEgrFwdOctets' => $value['sdpBindBaseStatsEgressForwardedOctets'],
+                ]));
+            }
         }
-
         return $binds;
     }
+
+    /**
+     * @return Collection MplsTunnelArHop objects
+     */
+    public function pollMplsTunnelArHops($paths)
+    {
+        $mplsTunnelArHopCache = snmpwalk_cache_multi_oid($this->getDevice(), 'mplsTunnelARHopTable', [], 'MPLS-TE-MIB', 'nokia', '-OQUsbt');
+        $mplsTunnelArHopCache = snmpwalk_cache_multi_oid($this->getDevice(), 'vRtrMplsTunnelARHopTable', $mplsTunnelArHopCache, 'TIMETRA-MPLS-MIB', 'nokia', '-OQUsb');
+
+        // vRtrMplsTunnelARHopProtection Bits
+        $localAvailable     = 0b10000000;
+        $localInUse         = 0b01000000;
+        $bandwidthProtected = 0b00100000;
+        $nodeProtected      = 0b00010000;
+        $preemptionPending  = 0b00001000;
+        $nodeId             = 0b00000100;
+
+
+        $arhops = collect();
+        foreach ($mplsTunnelArHopCache as $key => $value) {
+            list($mplsTunnelARHopListIndex, $mplsTunnelARHopIndex) = explode('.', $key);
+            $lsp_path_id = $paths->firstWhere('mplsLspPathTunnelARHopListIndex', $mplsTunnelARHopListIndex)->lsp_path_id;
+            $protection = intval($value['vRtrMplsTunnelARHopProtection'], 16);
+
+            $localLinkProtection = ($protection & $localAvailable) ? "true" : "false";
+            $linkProtectionInUse = ($protection & $localInUse) ? "true" : "false";
+            $bandwidthProtection = ($protection & $bandwidthProtected) ? "true" : "false";
+            $nextNodeProtection  = ($protection & $nodeProtected) ? "true" : "false";
+
+            if (isset($mplsTunnelARHopListIndex, $mplsTunnelARHopIndex, $lsp_path_id)) {
+                $arhops->push(new MplsTunnelArHop([
+                    'mplsTunnelARHopListIndex' => $mplsTunnelARHopListIndex,
+                    'mplsTunnelARHopIndex' => $mplsTunnelARHopIndex,
+                    'lsp_path_id' => $lsp_path_id,
+                    'device_id' => $this->getDeviceId(),
+                    'mplsTunnelARHopAddrType' => $value['mplsTunnelARHopAddrType'],
+                    'mplsTunnelARHopIpv4Addr' => $value['mplsTunnelARHopIpv4Addr'],
+                    'mplsTunnelARHopIpv6Addr' => $value['mplsTunnelARHopIpv6Addr'],
+                    'mplsTunnelARHopAsNumber' => $value['mplsTunnelARHopAsNumber'],
+                    'mplsTunnelARHopStrictOrLoose' => $value['mplsTunnelARHopStrictOrLoose'],
+                    'mplsTunnelARHopRouterId' => $value['vRtrMplsTunnelARHopRouterId'],
+                    'localProtected' => $localLinkProtection,
+                    'linkProtectionInUse' => $linkProtectionInUse,
+                    'bandwidthProtected' => $bandwidthProtection,
+                    'nextNodeProtected' => $nextNodeProtection,
+                ]));
+            }
+        }
+        return $arhops;
+    }
+
+    /**
+     * @return Collection MplsTunnelCHop objects
+     */
+    public function pollMplsTunnelCHops($paths)
+    {
+        $mplsTunnelCHopCache = snmpwalk_cache_multi_oid($this->getDevice(), 'vRtrMplsTunnelCHopTable', [], 'TIMETRA-MPLS-MIB', 'nokia', '-OQUsb');
+
+        $chops = collect();
+        foreach ($mplsTunnelCHopCache as $key => $value) {
+            list($mplsTunnelCHopListIndex, $mplsTunnelCHopIndex) = explode('.', $key);
+            $lsp_path_id = $paths->firstWhere('mplsLspPathTunnelCHopListIndex', $mplsTunnelCHopListIndex)->lsp_path_id;
+
+#            if (isset($mplsTunnelCHopListIndex, $mplsTunnelCHopIndex, $lsp_path_id)) { 
+                $chops->push(new MplsTunnelCHop([
+                    'mplsTunnelCHopListIndex' => $mplsTunnelCHopListIndex,
+                    'mplsTunnelCHopIndex' => $mplsTunnelCHopIndex,
+                    'lsp_path_id' => $lsp_path_id,
+                    'device_id' => $this->getDeviceId(),
+                    'mplsTunnelCHopAddrType' => $value['vRtrMplsTunnelCHopAddrType'],
+                    'mplsTunnelCHopIpv4Addr' => $value['vRtrMplsTunnelCHopIpv4Addr'],
+                    'mplsTunnelCHopIpv6Addr' => $value['vRtrMplsTunnelCHopIpv6Addr'],
+                    'mplsTunnelCHopAsNumber' => $value['vRtrMplsTunnelCHopAsNumber'],
+                    'mplsTunnelCHopStrictOrLoose' => $value['vRtrMplsTunnelCHopStrictOrLoose'],
+                    'mplsTunnelCHopRouterId' => $value['vRtrMplsTunnelCHopRtrID'],
+                ]));
+#            }
+        }
+        return $chops;
+    }
+// End Class Timos
 }

app/Models/Device.php

@@ -679,6 +679,16 @@ class Device extends BaseModel
         return $this->hasMany('App\Models\MplsSdpBind', 'device_id');
     }
 
+    public function mplsTunnelArHops()
+    {
+        return $this->hasMany('App\Models\MplsTunnelArHop', 'device_id');
+    }
+
+    public function mplsTunnelCHops()
+    {
+        return $this->hasMany('App\Models\MplsTunnelCHop', 'device_id');
+    }
+
     public function syslogs()
     {
         return $this->hasMany('App\Models\Syslog', 'device_id', 'device_id');

app/Models/MplsLspPath.php

@@ -28,6 +28,8 @@ class MplsLspPath extends Model implements Keyable
         'mplsLspPathTimeUp',
         'mplsLspPathTimeDown',
         'mplsLspPathTransitionCount',
+        'mplsLspPathTunnelARHopListIndex',
+        'mplsLspPathTunnelCHopListIndex',
     ];
 
     // ---- Helper Functions ----

app/Models/MplsTunnelArHop.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use LibreNMS\Interfaces\Models\Keyable;
+
+class MplsTunnelArHop extends Model implements Keyable
+{
+    protected $primaryKey = 'ar_hop_id';
+    public $timestamps = false;
+    protected $fillable = [
+        'ar_hop_id',
+        'mplsTunnelARHopListIndex',
+        'mplsTunnelARHopIndex',
+        'lsp_path_id',
+        'device_id',
+        'mplsTunnelARHopAddrType',
+        'mplsTunnelARHopIpv4Addr',
+        'mplsTunnelARHopIpv6Addr',
+        'mplsTunnelARHopAsNumber',
+        'mplsTunnelARHopStrictOrLoose',
+        'mplsTunnelARHopRouterId',
+        'localProtected',
+        'linkProtectionInUse',
+        'bandwidthProtected',
+        'nextNodeProtected',
+    ];
+
+    // ---- Helper Functions ----
+
+    /**
+     * Get a string that can identify a unique instance of this model
+     * @return string
+     */
+    public function getCompositeKey()
+    {
+        return $this->mplsTunnelARHopListIndex . '-' . $this->mplsTunnelARHopIndex;
+    }
+}

app/Models/MplsTunnelCHop.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use LibreNMS\Interfaces\Models\Keyable;
+
+class MplsTunnelCHop extends Model implements Keyable
+{
+    protected $primaryKey = 'c_hop_id';
+    public $timestamps = false;
+    protected $fillable = [
+        'c_hop_id',
+        'mplsTunnelCHopListIndex',
+        'mplsTunnelCHopIndex',
+        'lsp_path_id',
+        'device_id',
+        'mplsTunnelCHopAddrType',
+        'mplsTunnelCHopIpv4Addr',
+        'mplsTunnelCHopIpv6Addr',
+        'mplsTunnelCHopAsNumber',
+        'mplsTunnelCHopStrictOrLoose',
+        'mplsTunnelCHopRouterId',
+    ];
+
+    // ---- Helper Functions ----
+
+    /**
+     * Get a string that can identify a unique instance of this model
+     * @return string
+     */
+    public function getCompositeKey()
+    {
+        return $this->mplsTunnelCHopListIndex . '-' . $this->mplsTunnelCHopIndex;
+    }
+}

database/migrations/2019_11_30_191013_create_mpls_tunnel_ar_hops_table.php

@@ -0,0 +1,44 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateMplsTunnelArHopsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('mpls_tunnel_ar_hops', function (Blueprint $table) {
+            $table->increments('ar_hop_id');
+            $table->unsignedInteger('mplsTunnelARHopListIndex');
+            $table->unsignedInteger('mplsTunnelARHopIndex');
+            $table->unsignedInteger('device_id')->index('device_id');
+            $table->unsignedInteger('lsp_path_id');
+            $table->enum('mplsTunnelARHopAddrType', array('unknown','ipV4','ipV6','asNumber','lspid','unnum'))->nullable();
+            $table->string('mplsTunnelARHopIpv4Addr', 15)->nullable();
+            $table->string('mplsTunnelARHopIpv6Addr', 45)->nullable();
+            $table->unsignedInteger('mplsTunnelARHopAsNumber')->nullable();
+            $table->enum('mplsTunnelARHopStrictOrLoose', array('strict','loose'))->nullable();
+            $table->string('mplsTunnelARHopRouterId', 15)->nullable();
+            $table->enum('localProtected', array('false','true'))->default('false');
+            $table->enum('linkProtectionInUse', array('false','true'))->default('false');
+            $table->enum('bandwidthProtected', array('false','true'))->default('false');
+            $table->enum('nextNodeProtected', array('false','true'))->default('false');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('mpls_tunnel_ar_hops');
+    }
+}

database/migrations/2019_11_30_191013_create_mpls_tunnel_c_hops_table.php

@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateMplsTunnelCHopsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('mpls_tunnel_c_hops', function (Blueprint $table) {
+            $table->increments('c_hop_id');
+            $table->unsignedInteger('mplsTunnelCHopListIndex');
+            $table->unsignedInteger('mplsTunnelCHopIndex');
+            $table->unsignedInteger('device_id')->index('device_id');
+            $table->unsignedInteger('lsp_path_id')->nullable();
+            $table->enum('mplsTunnelCHopAddrType', array('unknown','ipV4','ipV6','asNumber','lspid','unnum'))->nullable();
+            $table->string('mplsTunnelCHopIpv4Addr', 15)->nullable();
+            $table->string('mplsTunnelCHopIpv6Addr', 45)->nullable();
+            $table->unsignedInteger('mplsTunnelCHopAsNumber')->nullable();
+            $table->enum('mplsTunnelCHopStrictOrLoose', array('strict','loose'))->nullable();
+            $table->string('mplsTunnelCHopRouterId', 15)->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('mpls_tunnel_c_hops');
+    }
+}

database/migrations/2019_12_01_165514_add_indexes_to_mpls_lsp_paths_table.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddIndexesToMplsLspPathsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('mpls_lsp_paths', function (Blueprint $table) {
+            /** add
+             * vRtrMplsLspPathTunnelARHopListIndex
+             * vRtrMplsLspPathTunnelCHopListIndex
+             * indexes to table
+             */
+            $table->unsignedInteger('mplsLspPathTunnelARHopListIndex')->nullable();
+            $table->unsignedInteger('mplsLspPathTunnelCHopListIndex')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('mpls_lsp_paths', function (Blueprint $table) {
+            $table->dropColumn(['mplsLspPathTunnelARHopListIndex', 'mplsLspPathTunnelCHopListIndex']);
+        });
+    }
+}

includes/html/pages/device/routing/mpls.inc.php

@@ -154,7 +154,8 @@ if ($vars['view'] == 'lsp') {
 } // endif lsp view
 
 if ($vars['view'] == 'paths') {
-    echo '<tr><th><a title="Administrative name for LSP this path belongs to">LSP Name</a></th>
+    echo '<tr><th>&nbsp;</th>
+        <th><a title="Administrative name for LSP this path belongs to">LSP Name</a></th>
         <th><a title="The OID index of this path">Index</a></th>
         <th><a title="This variable is an enum that represents the role this path is taking within this LSP.">Type</a></th>
         <th><a title="The desired administrative state for this LSP Path.">Admin State</a></th>
@@ -195,12 +196,13 @@ if ($vars['view'] == 'paths') {
         }
        
         $host = @dbFetchRow('SELECT * FROM `ipv4_addresses` AS A, `ports` AS I, `devices` AS D WHERE A.ipv4_address = ? AND I.port_id = A.port_id AND D.device_id = I.device_id', [$path['mplsLspPathFailNodeAddr']]);
-        $destination = $lsp['mplsLspPathFailNodeAddr'];
+        $destination = $path['mplsLspPathFailNodeAddr'];
         if (is_array($host)) {
             $destination = generate_device_link($host, 0, array('tab' => 'routing', 'proto' => 'mpls'));
         }
-        echo "<tr bgcolor=$bg_colour>
+        echo '<tr data-toggle="collapse" data-target="#path-map' . $i . '" class="accordion-toggle" bgcolor="' . $bg_colour .'">
-            <td>" . $path['mplsLspName'] . '</td>
+            <td><button class="btn btn-default btn-xs"><span class="fa fa-plus"></span></button></td>
+            <td>' . $path['mplsLspName'] . '</td>
             <td>' . $path['path_oid'] . '</td>
             <td>' . $path['mplsLspPathType'] . '</td>
             <td><span class="label label-' . $adminstate_status_color . '">' . $path['mplsLspPathAdminState'] . '</td>
@@ -215,6 +217,13 @@ if ($vars['view'] == 'paths') {
             <td>' . $path['mplsLspPathMetric'] . '</td>
             <td>' . $path['mplsLspPathOperMetric'] . '</td>';
         echo '</tr>';
+        echo '<tr><td colspan="12" class="hiddenRow">';
+        echo '<div class="accordian-body collapse" id="path-map' . $i . '">';
+        // FIXME include only on expanded data-toggle
+        include 'includes/html/pages/routing/mpls-path-map.inc.php';
+        echo '</div>
+             </td>
+             </tr>';
 
         $i++;
     }

includes/html/pages/routing/mpls-path-map.inc.php

@@ -0,0 +1,195 @@
+<?php
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2019 Vitali Kari
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */
+
+use LibreNMS\Config;
+use Illuminate\Support\Collection;
+
+$hops = [];
+$links =[];
+
+$options = Config::get('network_map_vis_options');
+
+$lsp_path_id = $path['lsp_path_id'];
+$last_node = dbFetchCell('SELECT L.mplsLspToAddr FROM mpls_lsps AS L, mpls_lsp_paths AS P WHERE P.lsp_path_id = ? AND L.lsp_id = P.lsp_id', [$path['lsp_path_id']]);
+$device_id = $device['device_id'];
+
+$ar_list = dbFetchRows('SELECT * from `mpls_tunnel_ar_hops` where device_id = ? AND lsp_path_id = ?', [$device_id, $lsp_path_id]);
+d_echo($ar_list);
+
+// first node is host self
+$node = device_has_ip($ar_list[0]['mplsTunnelARHopRouterId']);
+if ($node) {
+    $node_id = $node['device_id'];
+    $label = $node['hostname'];
+    $first_node = $ar_list[0]['mplsTunnelARHopRouterId'];
+} else {
+    $node_id = $label = $first_node;
+}
+    
+foreach ($ar_list as $value) {
+    $node = device_has_ip($value['mplsTunnelARHopRouterId']);
+    if ($node) {
+        $remote_node_id = $node['device_id'];
+        $remote_label = $node['hostname'];
+    } else {
+        $remote_node_id = $remote_label = $value['mplsTunnelARHopRouterId'];
+    }
+    
+    $hops[$remote_node_id] = [
+        'id' => $remote_node_id,
+        'label' => $remote_label . PHP_EOL . $value['mplsTunnelARHopRouterId'],
+    ];
+
+    if ($value['nextNodeProtected'] == 'true') {
+        $hops[$remote_node_id]['color'] = '#ccffcc';
+        $hops[$remote_node_id]['title'] = 'Node Protected';
+    } else {
+        $hops[$remote_node_id]['color'] = '#cccccc';
+        $hops[$remote_node_id]['title'] = 'Node Not Protected';
+    }
+
+    if ($value['mplsTunnelARHopRouterId'] == $first_node || $value['mplsTunnelARHopRouterId'] == $last_node) {
+        $hops[$remote_node_id]['shape'] = 'circle';
+    }
+
+    $lsp = dbFetchCell('SELECT L.mplsLspName FROM mpls_lsps AS L, mpls_lsp_paths AS P WHERE P.lsp_path_id = ? AND L.lsp_id = P.lsp_id', [$value['lsp_path_id']]);
+
+    if ($value['localProtected'] == 'true') {
+        $link_color = '#004d00';
+    } else {
+        $link_color = '#000000';
+    }
+
+    $links[] = [
+        'from' => $node_id,
+        'to' => $remote_node_id,
+        'label' => strval($value['mplsTunnelARHopIpv4Addr']),
+        'font' =>
+        [
+            'align' => 'top',
+            'color' => $link_color,
+        ],
+        'title' => $lsp . ' active hop #' . strval($value['mplsTunnelARHopIndex']) . ' Link Protected: ' . $value['localProtected'],
+        'width' => 4.0,
+        'color' =>
+        [
+            'color' => $link_color,
+            'opacity' => '0.6',
+        ],
+        'selfReferenceSize' => 45,
+    ];
+
+    // process next hop
+    $node_id = $remote_node_id;
+    $label = $remote_label;
+}
+
+// try to find the computed CSPF Path
+$dev_mpls_tunnel_c_hops = collect(dbFetchRows('SELECT * FROM mpls_tunnel_c_hops where device_id = ?', [$device_id])); // collect all computed hops
+$keyed = $dev_mpls_tunnel_c_hops->keyBy('mplsTunnelCHopListIndex'); // reduce to last hops
+
+// Filter to only with final destination
+$filtered = $keyed->filter(function ($value) use ($last_node) {
+    return ($value['mplsTunnelCHopRouterId'] == $last_node);
+});
+// FIXME pick the last one, but it seems that the secod one could work too. On NOKIA it actually does not matter, the paths have the same hops.
+// The first one is the active route path.
+$filtered2 = $filtered->last()['mplsTunnelCHopListIndex'];
+
+// get CSPF List
+$c_list = dbFetchRows('SELECT * from `mpls_tunnel_c_hops` where device_id = ? AND mplsTunnelCHopListIndex = ?', [$device_id, $filtered2]);
+
+// first node is host self
+$node = device_has_ip($c_list[0]['mplsTunnelCHopRouterId']);
+if ($node) {
+    $node_id = $node['device_id'];
+    $label = $node['hostname'];
+} else {
+    $node_id = $label = $c_list[0]['mplsTunnelCHopRouterId'];
+}
+
+foreach ($c_list as $value) {
+    $node = device_has_ip($value['mplsTunnelCHopRouterId']);
+    if ($node) {
+        $remote_node_id = $node['device_id'];
+        $remote_label = $node['hostname'];
+    } else {
+        $remote_node_id = $remote_label = $value['mplsTunnelCHopRouterId'];
+    }
+
+    if (empty($hops[$remote_node_id])) {
+        $hops[$remote_node_id] = [
+            'id' => $remote_node_id,
+            'label' => $remote_label . PHP_EOL . $value['mplsTunnelCHopRouterId'],
+            'color' => '#cccccc',
+            'title' => 'Node Protection Unknown',
+        ];
+    }
+    
+    $links[] = [
+        'from' => $node_id,
+        'to' => $remote_node_id,
+        'label' => strval($value['mplsTunnelCHopIpv4Addr']),
+        'font' =>
+        [
+            'align' => 'bottom',
+            'color' => '#262626',
+        ],
+        'title' => 'computed detour hop # ' . strval($value['mplsTunnelCHopIndex']),
+        'width' => 4.0,
+        'color' =>
+        [
+            'color' => '#262626',
+            'opacity' => '0.5',
+        ],
+        'selfReferenceSize' => 25,
+        'dashes' => 'true',
+    ];
+
+    // process next hop
+    $node_id = $remote_node_id;
+    $label = $remote_label;
+}
+
+$nodes = json_encode(array_values($hops));
+$edges = json_encode($links);
+if (count($hops) > 1 && count($links) > 0) {
+    $visualization = 'visualization-' . $i;
+    echo '<div id="visualization-' . $i . '"></div>
+        <script src="js/vis.min.js"></script>
+        <script type="text/javascript">
+        var height = $(window).height() / 2;
+        ';
+    echo "$('#" . $visualization . "').height(height + 'px');
+        var nodes = " . $nodes . ";
+        var edges = " . $edges . ";
+        ";
+    echo "var container = document.getElementById('" . $visualization . "');
+        ";
+    echo "var data = {
+            nodes: nodes,
+            edges: edges,
+            stabilize: true
+        };
+        var options =  " . $options . ";
+        ";
+    echo "var network = new vis.Network(container, data, options);
+        network.on('click', function (properties) {
+            if (properties.nodes > 0) {
+                window.location.href = " . '"device/device="+properties.nodes+"/tab=routing/proto=mpls/view=paths/"
+            }
+        });
+        </script>';
+} else {
+    print_message("No Path map to display. Maybe there are no MPLS tunnel hops discovered.");
+}

includes/html/pages/routing/mpls.inc.php

@@ -199,12 +199,12 @@ if ($vars['view'] == 'paths') {
         }
 
         $host = @dbFetchRow('SELECT * FROM `ipv4_addresses` AS A, `ports` AS I, `devices` AS D WHERE A.ipv4_address = ? AND I.port_id = A.port_id AND D.device_id = I.device_id', [$path['mplsLspPathFailNodeAddr']]);
-        $destination = $lsp['mplsLspPathFailNodeAddr'];
+        $destination = $path['mplsLspPathFailNodeAddr'];
         if (is_array($host)) {
             $destination = generate_device_link($host, 0, array('tab' => 'routing', 'proto' => 'mpls'));
         }
         echo "<tr bgcolor=$bg_colour>
-            <td>" . generate_device_link($device, 0, array('tab' => 'routing', 'proto' => 'mpls')) . '</td>
+            <td>" . generate_device_link($device, 0, array('tab' => 'routing', 'proto' => 'mpls', 'view' => 'paths')) . '</td>
             <td>' . $path['mplsLspName'] . '</td>
             <td>' . $path['path_oid'] . '</td>
             <td>' . $path['mplsLspPathType'] . '</td>
@@ -269,7 +269,7 @@ if ($vars['view'] == 'sdps') {
             $destination = generate_device_link($host, 0, array('tab' => 'routing', 'proto' => 'mpls'));
         }
         echo "<tr bgcolor=$bg_colour>
-            <td>" . generate_device_link($device, 0, array('tab' => 'routing', 'proto' => 'mpls')) . '</td>
+            <td>" . generate_device_link($device, 0, array('tab' => 'routing', 'proto' => 'mpls', 'view' => 'sdps')) . '</td>
             <td>' . $sdp['sdp_oid'] . '</td>
             <td>' . $destination . '</td>
             <td>' . $sdp['sdpDelivery'] . '</td>
@@ -337,7 +337,7 @@ sapDown: The SAP associated with the service is down.">Oper State</a></th>
         }
 
         echo "<tr bgcolor=$bg_colour>
-            <td>" . generate_device_link($device, 0, array('tab' => 'routing', 'proto' => 'mpls')) . '</td>
+            <td>" . generate_device_link($device, 0, array('tab' => 'routing', 'proto' => 'mpls', 'view' => 'sdpbinds')) . '</td>
             <td>' . $sdpbind['svcId'] . '</td>
             <td>' . $sdpbind['sdp_oid'] . ':' . $sdpbind['svc_oid'] . '</td>
             <td>' . $sdpbind['sdpBindType'] . '</td>
@@ -405,7 +405,7 @@ vprn services are up when the service is administratively up however routing fun
         }
 
         echo "<tr bgcolor=$bg_colour>
-            <td>" . generate_device_link($device, 0, array('tab' => 'routing', 'proto' => 'mpls')) . '</td>
+            <td>" . generate_device_link($device, 0, array('tab' => 'routing', 'proto' => 'mpls', 'view' => 'services')) . '</td>
             <td>' . $svc['svc_oid'] . '</td>
             <td>' . $svc['svcType'] . '</td>
             <td>' . $svc['svcCustId'] . '</td>
@@ -468,7 +468,7 @@ if ($vars['view'] == 'saps') {
         }
 
         echo "<tr bgcolor=$bg_colour>
-            <td>" . generate_device_link($device, 0, array('tab' => 'routing', 'proto' => 'mpls')) . '</td>
+            <td>" . generate_device_link($device, 0, array('tab' => 'routing', 'proto' => 'mpls', 'view' => 'saps')) . '</td>
             <td>' . $sap['svc_oid'] . '</td>
             <td>' . generate_port_link($port) . '</td>
             <td>' . $sap['sapEncapValue'] . '</td>

mibs/nokia/TIMETRA-DHCP-SERVER-MIB

@@ -22,6 +22,7 @@ IMPORTS
     TItemDescription, TNamedItem,
     TNamedItemOrEmpty, TmnxActionType,
     TmnxAdminState, TmnxCreateOrigin,
+    TmnxDhcpOptionDisplay,
     TmnxDhcpOptionType,
     TmnxDhcpServerDUIDTypeCode,
     TmnxPppoeUserNameOrEmpty, TmnxVRtrID,
@@ -42,7 +43,7 @@ timetraDhcpServerMIBModule       MODULE-IDENTITY
          (Dynamic Host Configuration Protocol) server for the Nokia SROS
          device.
 
-         Copyright 2008-2017 Nokia. All rights reserved. Reproduction of this
+         Copyright 2008-2018 Nokia. All rights reserved. Reproduction of this
          document is authorized on the condition that the foregoing copyright
          notice is included.
 
@@ -975,7 +976,8 @@ TmnxDhcpSvrPoolOptionEntry       ::= SEQUENCE
     tmnxDhcpSvrPoolOptionRowStatus   RowStatus,
     tmnxDhcpSvrPoolOptionLastCh      TimeStamp,
     tmnxDhcpSvrPoolOptionType        TmnxDhcpOptionType,
-    tmnxDhcpSvrPoolOptionValue       OCTET STRING
+    tmnxDhcpSvrPoolOptionValue       OCTET STRING,
+    tmnxDhcpSvrPoolOptionDisplay     TmnxDhcpOptionDisplay
 }
 
 tmnxDhcpSvrPoolOptionNumber      OBJECT-TYPE
@@ -1036,6 +1038,15 @@ tmnxDhcpSvrPoolOptionValue       OBJECT-TYPE
          allowed when the value of tmnxDhcpSvrPoolOptionType is 'hex (3)'."
     ::= { tmnxDhcpSvrPoolOptionEntry 5 }
 
+tmnxDhcpSvrPoolOptionDisplay     OBJECT-TYPE
+    SYNTAX      TmnxDhcpOptionDisplay
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "The value of the object tmnxDhcpSvrPoolOptionDisplay indicates a hint
+         of how the tmnxDhcpSvrPoolOptionValue can be displayed."
+    ::= { tmnxDhcpSvrPoolOptionEntry 6 }
+
 tmnxDhcpServerSubnetTableLastCh  OBJECT-TYPE
     SYNTAX      TimeStamp
     MAX-ACCESS  read-only
@@ -1551,7 +1562,8 @@ TmnxDhcpSvrSubnetOptionEntry     ::= SEQUENCE
     tmnxDhcpSvrSubnetOptionRowStatus RowStatus,
     tmnxDhcpSvrSubnetOptionLastCh    TimeStamp,
     tmnxDhcpSvrSubnetOptionType      TmnxDhcpOptionType,
-    tmnxDhcpSvrSubnetOptionValue     OCTET STRING
+    tmnxDhcpSvrSubnetOptionValue     OCTET STRING,
+    tmnxDhcpSvrSubnetOptionDisplay   TmnxDhcpOptionDisplay
 }
 
 tmnxDhcpSvrSubnetOptionNumber    OBJECT-TYPE
@@ -1592,7 +1604,7 @@ tmnxDhcpSvrSubnetOptionType      OBJECT-TYPE
     STATUS      current
     DESCRIPTION
         "The value of the object tmnxDhcpSvrSubnetOptionType specifies how the
-         value of this option in stored in tmnxDhcpSvrSubnetOptionValue.
+         value of this option is stored in tmnxDhcpSvrSubnetOptionValue.
 
          The value of this object cannot be set to 'domain (5)' when the value
          of tmnxDhcpServerCfgAddrType is set to 'ipv4(1)'.
@@ -1612,6 +1624,15 @@ tmnxDhcpSvrSubnetOptionValue     OBJECT-TYPE
          allowed when the value of tmnxDhcpSvrSubnetOptionType is 'hex (3)'."
     ::= { tmnxDhcpSvrSubnetOptionEntry 5 }
 
+tmnxDhcpSvrSubnetOptionDisplay   OBJECT-TYPE
+    SYNTAX      TmnxDhcpOptionDisplay
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "The value of the object tmnxDhcpSvrSubnetOptionDisplay indicates a
+         hint of how the tmnxDhcpSvrSubnetOptionValue can be displayed."
+    ::= { tmnxDhcpSvrSubnetOptionEntry 6 }
+
 tmnxDhcpSvrLeaseTable            OBJECT-TYPE
     SYNTAX      SEQUENCE OF TmnxDhcpSvrLeaseEntry
     MAX-ACCESS  not-accessible
@@ -1837,11 +1858,11 @@ tmnxDhcpSvrLeasePPPoEUserName    OBJECT-TYPE
     MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION
-        "The value of object tmnxDhcpSvrLeasePPPoEUserName indicates the PPPoE
+        "The value of object tmnxDhcpSvrLeasePPPoEUserName indicates the PPP
          user name.
 
          This object is only relevant if the value of
-         tmnxDhcpSvrLeaseClientType is equal to 'pppoe'."
+         tmnxDhcpSvrLeaseClientType is equal to 'ppp'."
     ::= { tmnxDhcpSvrLeaseEntry 12 }
 
 tmnxDhcpSvrLeaseOpt82CircId      OBJECT-TYPE
@@ -1895,7 +1916,7 @@ tmnxDhcpSvrLeaseIAOptionType     OBJECT-TYPE
         "The value of object tmnxDhcpSvrLeaseIAOptionType indicates the type of
          the option.
 
-         - 'notApplicable (0)': AI is not applicable to this lease.
+         - 'notApplicable (0)': IA is not applicable to this lease.
 
          - 'iaNa (1)':
                 The IA_NA option type is used to request the assignment of
@@ -2086,7 +2107,10 @@ TmnxDhcpServerStatsEntry         ::= SEQUENCE
     tmnxDhcpSvrStatsDropIntWithFo    Counter32,
     tmnxDhcpSvrStatsDropIntConflicts Counter32,
     tmnxDhcpSvrStatsDropAudit        Counter32,
-    tmnxDhcpSvrStatsDropTxFailed     Counter32
+    tmnxDhcpSvrStatsDropTxFailed     Counter32,
+    tmnxDhcpSvrStatsRxIntReqPpp      Counter64,
+    tmnxDhcpSvrStatsRxIntReqIpoe     Counter64,
+    tmnxDhcpSvrStatsRxIntReqIpsec    Counter64
 }
 
 tmnxDhcpSvrStatsRxDiscovers      OBJECT-TYPE
@@ -2387,7 +2411,7 @@ tmnxDhcpSvrStatsDropDuplDiffGi   OBJECT-TYPE
 tmnxDhcpSvrStatsRxIntRequests    OBJECT-TYPE
     SYNTAX      Counter64
     MAX-ACCESS  read-only
-    STATUS      current
+    STATUS      obsolete
     DESCRIPTION
         "The value of tmnxDhcpSvrStatsRxIntRequests indicates the number of
          internal request calls received by the DHCP server instance from the
@@ -2457,6 +2481,36 @@ tmnxDhcpSvrStatsDropTxFailed     OBJECT-TYPE
          responses dropped because this server instance could not transmit it."
     ::= { tmnxDhcpServerStatsEntry 36 }
 
+tmnxDhcpSvrStatsRxIntReqPpp      OBJECT-TYPE
+    SYNTAX      Counter64
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "The value of tmnxDhcpSvrStatsRxIntReqPpp indicates the number of
+         internal request calls received by the DHCP server instance from the
+         local address assignment infrastructure for PPP."
+    ::= { tmnxDhcpServerStatsEntry 37 }
+
+tmnxDhcpSvrStatsRxIntReqIpoe     OBJECT-TYPE
+    SYNTAX      Counter64
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "The value of tmnxDhcpSvrStatsRxIntReqIpoe indicates the number of
+         internal request calls received by the DHCP server instance from the
+         local address assignment infrastructure for IPoE."
+    ::= { tmnxDhcpServerStatsEntry 38 }
+
+tmnxDhcpSvrStatsRxIntReqIpsec    OBJECT-TYPE
+    SYNTAX      Counter64
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "The value of tmnxDhcpSvrStatsRxIntReqIpsec indicates the number of
+         internal request calls received by the DHCP server instance from the
+         local address assignment infrastructure for IPsec."
+    ::= { tmnxDhcpServerStatsEntry 39 }
+
 tmnxDhcpSvrDeclinedAddrTable     OBJECT-TYPE
     SYNTAX      SEQUENCE OF TmnxDhcpSvrDeclinedAddrEntry
     MAX-ACCESS  not-accessible
@@ -2558,11 +2612,11 @@ tmnxDhcpSvrDeclinedAddrUserName  OBJECT-TYPE
     MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION
-        "The value of object tmnxDhcpSvrDeclinedAddrUserName indicates the
+        "The value of object tmnxDhcpSvrDeclinedAddrUserName indicates the PPP
-         PPPoE user name.
+         user name.
 
          This object is only relevant if the value of
-         tmnxDhcpSvrDeclinedAddrClientType is equal to 'pppoe'."
+         tmnxDhcpSvrDeclinedAddrClientType is equal to 'ppp'."
     ::= { tmnxDhcpSvrDeclinedAddrEntry 7 }
 
 tmnxDhcpSvrDeclinedAddrCircId    OBJECT-TYPE
@@ -4147,7 +4201,8 @@ TmnxDhcpServerStats6Entry        ::= SEQUENCE
     tmnxDhcpSvrStats6DropAudit       Counter64,
     tmnxDhcpSvrStats6RxLeasequeries  Counter64,
     tmnxDhcpSvrStats6TxLqReplies     Counter64,
-    tmnxDhcpSvrStats6DropLqNotAllow  Counter32
+    tmnxDhcpSvrStats6DropLqNotAllow  Counter32,
+    tmnxDhcpSvrStats6RxIntIpsec      Counter64
 }
 
 tmnxDhcpSvrStats6RxSolicits      OBJECT-TYPE
@@ -4508,6 +4563,16 @@ tmnxDhcpSvrStats6DropLqNotAllow  OBJECT-TYPE
          server is configured not to allow leasequery packets."
     ::= { tmnxDhcpServerStats6Entry 36 }
 
+tmnxDhcpSvrStats6RxIntIpsec      OBJECT-TYPE
+    SYNTAX      Counter64
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "The value of tmnxDhcpSvrStats6RxIntIpsec indicates the number of
+         internal request calls received by the DHCP server instance from the
+         local address assignment infrastructure for IPsec."
+    ::= { tmnxDhcpServerStats6Entry 37 }
+
 tmnxDhcpSvrSubnetStats6Table     OBJECT-TYPE
     SYNTAX      SEQUENCE OF TmnxDhcpSvrSubnetStats6Entry
     MAX-ACCESS  not-accessible
@@ -7858,7 +7923,8 @@ TmnxDhcpsDefOptionEntry          ::= SEQUENCE
     tmnxDhcpsDefOptionRowStatus      RowStatus,
     tmnxDhcpsDefOptionLastCh         TimeStamp,
     tmnxDhcpsDefOptionType           TmnxDhcpOptionType,
-    tmnxDhcpsDefOptionValue          OCTET STRING
+    tmnxDhcpsDefOptionValue          OCTET STRING,
+    tmnxDhcpsDefOptionDisplay        TmnxDhcpOptionDisplay
 }
 
 tmnxDhcpsDefOptionNumber         OBJECT-TYPE
@@ -7919,6 +7985,15 @@ tmnxDhcpsDefOptionValue          OBJECT-TYPE
          allowed when the value of tmnxDhcpsDefOptionType is 'hex (3)'."
     ::= { tmnxDhcpsDefOptionEntry 5 }
 
+tmnxDhcpsDefOptionDisplay        OBJECT-TYPE
+    SYNTAX      TmnxDhcpOptionDisplay
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "The value of the object tmnxDhcpsDefOptionDisplay indicates a hint of
+         how the tmnxDhcpsDefOptionValue can be displayed."
+    ::= { tmnxDhcpsDefOptionEntry 6 }
+
 tmnxDhcpServerNotificationObjs   OBJECT IDENTIFIER ::= { tmnxDhcpServer 2 }
 
 tmnxDhcpSvrNotifDescription      OBJECT-TYPE
@@ -8370,7 +8445,7 @@ tmnxDhcpServerV14v0Compliance    MODULE-COMPLIANCE
     ::= { tmnxDhcpServerCompliances 9 }
 
 tmnxDhcpServerV15v0Compliance    MODULE-COMPLIANCE
-    STATUS      current
+    STATUS      obsolete
     DESCRIPTION
         "The compliance statement for management of DHCP Server on Nokia SROS
          series systems release 15.0."
@@ -8405,6 +8480,44 @@ tmnxDhcpServerV15v0Compliance    MODULE-COMPLIANCE
         }
     ::= { tmnxDhcpServerCompliances 10 }
 
+tmnxDhcpServerV16v0Compliance    MODULE-COMPLIANCE
+    STATUS      current
+    DESCRIPTION
+        "The compliance statement for management of DHCP Server on Nokia SROS
+         series systems release 16.0."
+    MODULE
+        MANDATORY-GROUPS {
+            tmnxDhcpServerV8v0Group,
+            tmnxDhcpServerV9v0Group,
+            tmnxDhcpServerV10v0Group,
+            tmnxDhcpServerV12v0Group,
+            tmnxDhcpServerV13v0Group,
+            tmnxDhcpServerV16v0Group,
+            tmnxDhcpServerDuidGroup,
+            tmnxDhcpLeaseGroup,
+            tmnxDhcpLeaseV12v0Group,
+            tmnxDhcpStatsV8v0Group,
+            tmnxDhcpStatsV9v0Group,
+            tmnxDhcpStatsV13v0Group,
+            tmnxDhcpAddrListGroup,
+            tmnxDhcpToolsGroup,
+            tmnxDhcpSvrNotifGroup,
+            tmnxDhcpSvrNotifV10v0Group,
+            tmnxDhcpSvrNotifV12v0Group,
+            tmnxDhcpSvrNotifV13v0Group,
+            tmnxDhcpsFailoverGroup,
+            tmnxDhcpsFailoverV10v0Group,
+            tmnxDhcpsFailoverV11v0Group,
+            tmnxDhcpsFailoverV12v0Group,
+            tmnxDhcpSvrFoNotifGroup,
+            tmnxDhcpServerStickyLseGroup,
+            tmnxDhcpsPrefixLenExtensionGroup,
+            tmnxDhcpsAutoProvisionGroup,
+            tmnxDhcpStatsV16v0Group,
+            tmnxDhcpIntReqStatsGroup
+        }
+    ::= { tmnxDhcpServerCompliances 11 }
+
 tmnxDhcpServerGroups             OBJECT IDENTIFIER ::= { tmnxDhcpServerConformance 2 }
 
 tmnxDhcpServerGroup              OBJECT-GROUP
@@ -9051,7 +9164,7 @@ tmnxDhcpStatsV11v0Group          OBJECT-GROUP
         tmnxDhcpSvrSubnetStatsFoOfferP,
         tmnxDhcpSvrSubnetStatsFoOfferPT
     }
-    STATUS      current
+    STATUS      obsolete
     DESCRIPTION
         "The group of objects providing DHCP statistics on Nokia SROS series
          systems since release 11.0."
@@ -9353,6 +9466,186 @@ tmnxDhcpsAutoProvisionGroup      OBJECT-GROUP
          capability on Nokia SROS series systems."
     ::= { tmnxDhcpServerGroups 29 }
 
+tmnxDhcpStatsV16v0Group          OBJECT-GROUP
+    OBJECTS     {
+        tmnxDhcpSvrPoolStatsFree,
+        tmnxDhcpSvrPoolStatsOffered,
+        tmnxDhcpSvrPoolStatsStable,
+        tmnxDhcpSvrPoolStatsFRPending,
+        tmnxDhcpSvrPoolStatsRemPending,
+        tmnxDhcpSvrPoolStatsDeclined,
+        tmnxDhcpSvrPoolStatsFoFree,
+        tmnxDhcpSvrPoolStatsFoOffered,
+        tmnxDhcpSvrPoolStatsFoStable,
+        tmnxDhcpSvrPoolStatsFoFRPend,
+        tmnxDhcpSvrPoolStatsFoRemPend,
+        tmnxDhcpSvrPoolStatsFoDeclined,
+        tmnxDhcpSvrPoolStatsProv,
+        tmnxDhcpSvrPoolStatsFoProv,
+        tmnxDhcpSvrPoolStatsHasExt,
+        tmnxDhcpSvrPoolStatsExtResetT,
+        tmnxDhcpSvrPoolStatsStableP,
+        tmnxDhcpSvrPoolStatsStablePT,
+        tmnxDhcpSvrPoolStatsFoStableP,
+        tmnxDhcpSvrPoolStatsFoStablePT,
+        tmnxDhcpSvrPoolStatsUsed,
+        tmnxDhcpSvrPoolStatsUsedP,
+        tmnxDhcpSvrPoolStatsUsedPT,
+        tmnxDhcpSvrPoolStatsFoUsed,
+        tmnxDhcpSvrPoolStatsFoUsedP,
+        tmnxDhcpSvrPoolStatsFoUsedPT,
+        tmnxDhcpSvrPoolStatsFree,
+        tmnxDhcpSvrPoolStatsFreeP,
+        tmnxDhcpSvrPoolStatsFreePT,
+        tmnxDhcpSvrPoolStatsFoFree,
+        tmnxDhcpSvrPoolStatsFoFreeP,
+        tmnxDhcpSvrPoolStatsFoFreePT,
+        tmnxDhcpSvrPoolStatsUsedPct,
+        tmnxDhcpSvrPoolStatsUsedPctP,
+        tmnxDhcpSvrPoolStatsUsedPctPT,
+        tmnxDhcpSvrPoolStatsFoUsdPct,
+        tmnxDhcpSvrPoolStatsFoUsdPctP,
+        tmnxDhcpSvrPoolStatsFoUsdPctPT,
+        tmnxDhcpSvrPoolStatsFreePct,
+        tmnxDhcpSvrPoolStatsFreePctP,
+        tmnxDhcpSvrPoolStatsFreePctPT,
+        tmnxDhcpSvrPoolStatsFoFrePct,
+        tmnxDhcpSvrPoolStatsFoFrePctP,
+        tmnxDhcpSvrPoolStatsFoFrePctPT,
+        tmnxDhcpSvrPoolStatsOfferP,
+        tmnxDhcpSvrPoolStatsOfferPT,
+        tmnxDhcpSvrPoolStatsFoOfferP,
+        tmnxDhcpSvrPoolStatsFoOfferPT,
+        tmnxDhcpSvrStatsRxIntReleases,
+        tmnxDhcpSvrStatsDropIntWithLudb,
+        tmnxDhcpSvrStatsDropIntWithFo,
+        tmnxDhcpSvrStatsDropIntConflicts,
+        tmnxDhcpSvrStatsDropTxFailed,
+        tmnxDhcpSvrSubnetStats6HasExt,
+        tmnxDhcpSvrSubnetStats6ExtResetT,
+        tmnxDhcpSvrSubnetStats6StableP,
+        tmnxDhcpSvrSubnetStats6StablePT,
+        tmnxDhcpSvrSubnetStats6ProvBlk,
+        tmnxDhcpSvrSubnetStats6UsedBlk,
+        tmnxDhcpSvrSubnetStats6UsedBlkP,
+        tmnxDhcpSvrSubnetStats6UsedBlkPT,
+        tmnxDhcpSvrSubnetStats6FreeBlk,
+        tmnxDhcpSvrSubnetStats6FreeBlkP,
+        tmnxDhcpSvrSubnetStats6FreeBlkPT,
+        tmnxDhcpSvrSubnetStats6UsedPct,
+        tmnxDhcpSvrSubnetStats6UsedPctP,
+        tmnxDhcpSvrSubnetStats6UsedPctPT,
+        tmnxDhcpSvrSubnetStats6FreePct,
+        tmnxDhcpSvrSubnetStats6FreePctP,
+        tmnxDhcpSvrSubnetStats6FreePctPT,
+        tmnxDhcpSvrSubnetStats6AdvertP,
+        tmnxDhcpSvrSubnetStats6AdvertPT,
+        tmnxDhcpsPoolStats6Stable,
+        tmnxDhcpsPoolStats6FoStable,
+        tmnxDhcpsPoolStats6HasExt,
+        tmnxDhcpsPoolStats6ExtResetT,
+        tmnxDhcpsPoolStats6StableP,
+        tmnxDhcpsPoolStats6StablePT,
+        tmnxDhcpsPoolStats6FoStableP,
+        tmnxDhcpsPoolStats6FoStablePT,
+        tmnxDhcpsPoolStats6ProvBlk,
+        tmnxDhcpsPoolStats6FoProvBlk,
+        tmnxDhcpsPoolStats6UsedBlk,
+        tmnxDhcpsPoolStats6UsedBlkP,
+        tmnxDhcpsPoolStats6UsedBlkPT,
+        tmnxDhcpsPoolStats6FoUsedBlk,
+        tmnxDhcpsPoolStats6FoUsedBlkP,
+        tmnxDhcpsPoolStats6FoUsedBlkPT,
+        tmnxDhcpsPoolStats6FreeBlk,
+        tmnxDhcpsPoolStats6FreeBlkP,
+        tmnxDhcpsPoolStats6FreeBlkPT,
+        tmnxDhcpsPoolStats6FoFreeBlk,
+        tmnxDhcpsPoolStats6FoFreeBlkP,
+        tmnxDhcpsPoolStats6FoFreeBlkPT,
+        tmnxDhcpsPoolStats6UsedPct,
+        tmnxDhcpsPoolStats6UsedPctP,
+        tmnxDhcpsPoolStats6UsedPctPT,
+        tmnxDhcpsPoolStats6FoUsedPct,
+        tmnxDhcpsPoolStats6FoUsedPctP,
+        tmnxDhcpsPoolStats6FoUsedPctPT,
+        tmnxDhcpsPoolStats6FreePct,
+        tmnxDhcpsPoolStats6FreePctP,
+        tmnxDhcpsPoolStats6FreePctPT,
+        tmnxDhcpsPoolStats6FoFreePct,
+        tmnxDhcpsPoolStats6FoFreePctP,
+        tmnxDhcpsPoolStats6FoFreePctPT,
+        tmnxDhcpsPoolStats6Advertise,
+        tmnxDhcpsPoolStats6AdvertP,
+        tmnxDhcpsPoolStats6AdvertPT,
+        tmnxDhcpsPoolStats6FoAdvertise,
+        tmnxDhcpsPoolStats6FoAdvertP,
+        tmnxDhcpsPoolStats6FoAdvertPT,
+        tmnxDhcpsPoolStats6IntNoPfxWan,
+        tmnxDhcpsPoolStats6IntNoPfxSlaa,
+        tmnxDhcpSvrSubnetStatsHasExt,
+        tmnxDhcpSvrSubnetStatsExtResetT,
+        tmnxDhcpSvrSubnetStatsStableP,
+        tmnxDhcpSvrSubnetStatsStablePT,
+        tmnxDhcpSvrSubnetStatsFoStableP,
+        tmnxDhcpSvrSubnetStatsFoStablePT,
+        tmnxDhcpSvrSubnetStatsUsed,
+        tmnxDhcpSvrSubnetStatsUsedP,
+        tmnxDhcpSvrSubnetStatsUsedPT,
+        tmnxDhcpSvrSubnetStatsFoUsed,
+        tmnxDhcpSvrSubnetStatsFoUsedP,
+        tmnxDhcpSvrSubnetStatsFoUsedPT,
+        tmnxDhcpSvrSubnetStatsFreeP,
+        tmnxDhcpSvrSubnetStatsFreePT,
+        tmnxDhcpSvrSubnetStatsFoFreeP,
+        tmnxDhcpSvrSubnetStatsFoFreePT,
+        tmnxDhcpSvrSubnetStatsUsedPct,
+        tmnxDhcpSvrSubnetStatsUsedPctP,
+        tmnxDhcpSvrSubnetStatsUsedPctPT,
+        tmnxDhcpSvrSubnetStatsFoUsdPct,
+        tmnxDhcpSvrSubnetStatsFoUsdPctP,
+        tmnxDhcpSvrSubnetStatsFoUsdPctPT,
+        tmnxDhcpSvrSubnetStatsFreePct,
+        tmnxDhcpSvrSubnetStatsFreePctP,
+        tmnxDhcpSvrSubnetStatsFreePctPT,
+        tmnxDhcpSvrSubnetStatsFoFrePct,
+        tmnxDhcpSvrSubnetStatsFoFrePctP,
+        tmnxDhcpSvrSubnetStatsFoFrePctPT,
+        tmnxDhcpSvrSubnetStatsOfferP,
+        tmnxDhcpSvrSubnetStatsOfferPT,
+        tmnxDhcpSvrSubnetStatsFoOfferP,
+        tmnxDhcpSvrSubnetStatsFoOfferPT
+    }
+    STATUS      current
+    DESCRIPTION
+        "The group of objects providing DHCP statistics on Nokia SROS series
+         systems since release 11.0."
+    ::= { tmnxDhcpServerGroups 30 }
+
+tmnxDhcpIntReqStatsGroup         OBJECT-GROUP
+    OBJECTS     {
+        tmnxDhcpSvrStatsRxIntReqPpp,
+        tmnxDhcpSvrStatsRxIntReqIpoe,
+        tmnxDhcpSvrStatsRxIntReqIpsec,
+        tmnxDhcpSvrStats6RxIntIpsec
+    }
+    STATUS      current
+    DESCRIPTION
+        "The group of objects providing DHCP statistics on Nokia SROS series
+         systems for internal requests."
+    ::= { tmnxDhcpServerGroups 31 }
+
+tmnxDhcpServerV16v0Group         OBJECT-GROUP
+    OBJECTS     {
+        tmnxDhcpSvrPoolOptionDisplay,
+        tmnxDhcpSvrSubnetOptionDisplay,
+        tmnxDhcpsDefOptionDisplay
+    }
+    STATUS      current
+    DESCRIPTION
+        "The group of objects supporting DHCP server capability on Nokia SROS
+         series systems added in release 16.0."
+    ::= { tmnxDhcpServerGroups 32 }
+
 tmnxDhcpsObsoletedNotifyGroup    NOTIFICATION-GROUP
     NOTIFICATIONS {
         tmnxDhcpSvrSubnetBindingCreate,
@@ -9377,7 +9670,8 @@ tmnxDhcpsObsoleteGroup           OBJECT-GROUP
         tmnxDhcpSvrSubnetBindUnbindTime,
         tmnxDhcpSvrSubnetBindState,
         tmnxDhcpSvrSubntBndngTbleLastCh,
-        tmnxDhcpSvrSubnetBindActive
+        tmnxDhcpSvrSubnetBindActive,
+        tmnxDhcpSvrStatsRxIntRequests
     }
     STATUS      current
     DESCRIPTION

mibs/nokia/TIMETRA-GLOBAL-MIB

@@ -1,380 +1,602 @@
-TIMETRA-GLOBAL-MIB DEFINITIONS ::= BEGIN
+TIMETRA-GLOBAL-MIB DEFINITIONS ::= BEGIN
-
+
-IMPORTS
+IMPORTS
-    MODULE-IDENTITY, OBJECT-IDENTITY,
+    MODULE-COMPLIANCE, OBJECT-GROUP
-    enterprises                             FROM SNMPv2-SMI;
+                                                         FROM SNMPv2-CONF
-
+    MODULE-IDENTITY, OBJECT-TYPE,
-timetraGlobalMIBModule  MODULE-IDENTITY
+    enterprises
-    LAST-UPDATED    "0801010000Z"
+                                                         FROM SNMPv2-SMI
-    ORGANIZATION    "Alcatel"
+    DateAndTime
-    CONTACT-INFO    
+                                                         FROM SNMPv2-TC
-        "Alcatel 7x50 Support
+    ;
-         Web: http://www.alcatel.com/comps/pages/carrier_support.jhtml"
+
-    DESCRIPTION
+timetraGlobalMIBModule           MODULE-IDENTITY
-        "This  document  is the SNMP MIB module for central registration
+    LAST-UPDATED "201701010000Z"
-        of object identifiers defined under the Alcatel 'timetra' branch
+    ORGANIZATION "Nokia"
-        for the Alcatel 7x50 SR series SNMP MIBs.
+    CONTACT-INFO
-
+        "Nokia SROS Support
-        Copyright  2003-2008  Alcatel-Lucent. All rights reserved.
+         Web: http://www.nokia.com"
-        Reproduction of  this document is  authorized  on  the condition
+    DESCRIPTION
-        that the foregoing copyright notice is included.
+        "This  document  is the SNMP MIB module for central registration
-
+         of object identifiers defined under the Nokia 'timetra' branch
-        This   SNMP   MIB   module  (Specification)  embodies  Alcatel's
+         for the Nokia SROS series SNMP MIBs.
-        proprietary intellectual property. Alcatel retains all title and
+
-        ownership in the Specification, including any revisions.
+         Copyright 2003-2018 Nokia. All rights reserved. Reproduction of this
-
+         document is authorized on the condition that the foregoing copyright
-        Alcatel grants all interested parties a non-exclusive license to
+         notice is included.
-        use  and  distribute an unmodified copy of this Specification in
+
-        connection with management of Alcatel products, and without fee,
+         This SNMP MIB module (Specification) embodies Nokia's
-        provided this copyright notice and license appear on all copies.
+         proprietary intellectual property.  Nokia retains
-
+         all title and ownership in the Specification, including any
-        This  Specification  is  supplied  `as is', and Alcatel makes no
+         revisions.
-        warranty,  either  express or implied, as to the use, operation,
+
-        condition, or performance of the Specification."
+         Nokia grants all interested parties a non-exclusive license to use and
---
+         distribute an unmodified copy of this Specification in connection with
---  Revision History
+         management of Nokia products, and without fee, provided this copyright
---
+         notice and license appear on all copies.
-        REVISION        "0801010000Z"
+
-        DESCRIPTION     "Rev 6.0                01 Jan 2008 00:00
+         This Specification is supplied 'as is', and Nokia makes no warranty,
-                         6.0 release of the TIMETRA-GLOBAL-MIB."
+         either express or implied, as to the use, operation, condition, or
-
+         performance of the Specification."
-        REVISION        "0701010000Z"
+
-        DESCRIPTION     "Rev 5.0                01 Jan 2007 00:00
+    REVISION    "201701010000Z"
-                         5.0 release of the TIMETRA-GLOBAL-MIB."
+    DESCRIPTION
-
+        "Rev 15.0                1 Jan 2017 00:00
-        REVISION        "0508310000Z"   
+         15.0 release of the TIMETRA-GLOBAL-MIB."
-        DESCRIPTION     "Rev 3.0                31 Aug 2005 00:00
+
-                         3.0 release of the TIMETRA-GLOBAL-MIB."
+    REVISION    "201601010000Z"
-
+    DESCRIPTION
-        REVISION        "0501240000Z"   
+        "Rev 14.0                1 Jan 2016 00:00
-        DESCRIPTION     "Rev 2.1                24 Jan 2005 00:00
+         14.0 release of the TIMETRA-GLOBAL-MIB."
-                         2.1 release of the TIMETRA-GLOBAL-MIB."
+
-
+    REVISION    "201501010000Z"
-        REVISION        "0401150000Z"
+    DESCRIPTION
-        DESCRIPTION     "Rev 2.0                15 Jan 2004 00:00
+        "Rev 13.0                1 Jan 2015 00:00
-                         2.0 release of the TIMETRA-GLOBAL-MIB."
+         13.0 release of the TIMETRA-GLOBAL-MIB."
-
+
-        REVISION        "0301200000Z"
+    REVISION    "201401010000Z"
-        DESCRIPTION     "Rev 1.0                20 Jan 2003 00:00
+    DESCRIPTION
-                This is the 1.0 release of the TIMETRA-GLOBAL-MIB."
+        "Rev 12.0                1 Jan 2014 00:00
-
+         12.0 release of the TIMETRA-GLOBAL-MIB."
-        REVISION        "0008140000Z"   
+
-        DESCRIPTION     "Rev 0.1                14 Aug 2000 00:00
+    REVISION    "201208010000Z"
-                This is the initial version of the TIMETRA-GLOBAL-MIB."
+    DESCRIPTION
-        ::= { timetraModules 1 }
+        "Rev 11.0                1 Aug 2012 00:00
-
+         11.0 release of the TIMETRA-GLOBAL-MIB."
---
+
--- ----------------------------------------------------------------------------
+    REVISION    "201102010000Z"
--- timetra
+    DESCRIPTION
--- ----------------------------------------------------------------------------
+        "Rev 9.0                1 Feb 2011 00:00
---  The Private Enterprise Number 6527 was assigned to TiMetra Inc.,
+         9.0 release of the TIMETRA-GLOBAL-MIB."
---  previously known as Panthera Networks, by the IANA on July 14, 2000.
+
---
+    REVISION    "201002280000Z"
---  TiMetra, Inc. was acquired by Alcatel on July 18, 2003 and has
+    DESCRIPTION
---  had the timetra enterprise number, 6527, registered to Alcatel.
+        "Rev 8.0                28 Feb 2010 00:00
---
+         8.0 release of the TIMETRA-GLOBAL-MIB."
-timetra OBJECT IDENTIFIER ::= { enterprises 6527 }
+
-
+    REVISION    "200902280000Z"
---
+    DESCRIPTION
--- ----------------------------------------------------------------------------
+        "Rev 7.0                28 Feb 2009 00:00
--- timetra 1  : timetra registry
+         7.0 release of the TIMETRA-GLOBAL-MIB."
--- ----------------------------------------------------------------------------
+
---  Sub-tree for registrations
+    REVISION    "200902010000Z"
-timetraReg      OBJECT IDENTIFIER ::= { timetra 1 }
+    DESCRIPTION
-
+        "Rev 7.0                01 Feb 2009 00:00
---
+         7.0 release of the TIMETRA-GLOBAL-MIB."
--- ----------------------------------------------
+
--- timetra-reg 1  : Modules
+    REVISION    "200807010000Z"
--- ----------------------------------------------
+    DESCRIPTION
---  Note:
+        "Rev 6.1                01 Jul 2008 00:00
---    The timetraESSMIBModules and alcatelCommonMIBModules have become
+         6.1 release of the TIMETRA-GLOBAL-MIB."
---    deprecated. Henceforward, all new MIB modules will be placed
+
---    under timetraModules. 
+    REVISION    "200801010000Z"
---
+    DESCRIPTION
-    timetraModules  OBJECT IDENTIFIER ::= { timetraReg 1 }
+        "Rev 6.0                01 Jan 2008 00:00
---      timetraGlobalMIBModule           OBJECT IDENTIFIER ::= { timetraModules 1 }
+         6.0 release of the TIMETRA-GLOBAL-MIB."
---      timetraTCMIBModule               OBJECT IDENTIFIER ::= { timetraModules 2 }
+
-        timetraSRMIBModules              OBJECT IDENTIFIER ::= { timetraModules 3 }
+    REVISION    "200701010000Z"
---          timetraSysMIBModule              OBJECT IDENTIFIER ::= { timetraSRMIBModules 1 }
+    DESCRIPTION
---          tmnxChassisMIBModule             OBJECT IDENTIFIER ::= { timetraSRMIBModules 2 }
+        "Rev 5.0                01 Jan 2007 00:00
---          timetraVRtrMIBModule             OBJECT IDENTIFIER ::= { timetraSRMIBModules 3 }
+         5.0 release of the TIMETRA-GLOBAL-MIB."
---          timetraServicesMIBModule         OBJECT IDENTIFIER ::= { timetraSRMIBModules 4 }
+
---          timetraOspfMIBModule             OBJECT IDENTIFIER ::= { timetraSRMIBModules 5 }
+    REVISION    "200508310000Z"
---          timetraMplsMIBModule             OBJECT IDENTIFIER ::= { timetraSRMIBModules 6 }
+    DESCRIPTION
---          timetraRsvpMIBModule             OBJECT IDENTIFIER ::= { timetraSRMIBModules 7 }
+        "Rev 3.0                31 Aug 2005 00:00
---          timetraLdpMIBModule              OBJECT IDENTIFIER ::= { timetraSRMIBModules 8 }
+         3.0 release of the TIMETRA-GLOBAL-MIB."
---          timetraRipMIBModule              OBJECT IDENTIFIER ::= { timetraSRMIBModules 9 }
+
---          timetraIsisMIBModule             OBJECT IDENTIFIER ::= { timetraSRMIBModules 10 }
+    REVISION    "200501240000Z"
---          timetraOamTestMIBModule          OBJECT IDENTIFIER ::= { timetraSRMIBModules 11 }
+    DESCRIPTION
---          timetraLogMIBModule              OBJECT IDENTIFIER ::= { timetraSRMIBModules 12 }
+        "Rev 2.1                24 Jan 2005 00:00
---          timetraClearMIBModule            OBJECT IDENTIFIER ::= { timetraSRMIBModules 13 }
+         2.1 release of the TIMETRA-GLOBAL-MIB."
---          timetraBgpMIBModule              OBJECT IDENTIFIER ::= { timetraSRMIBModules 14 }
+
---          timetraLagMIBModule              OBJECT IDENTIFIER ::= { timetraSRMIBModules 15 }
+    REVISION    "200401150000Z"
---          timetraQosMIBModule              OBJECT IDENTIFIER ::= { timetraSRMIBModules 16 }
+    DESCRIPTION
---          timetraRoutePolicyMIBModule      OBJECT IDENTIFIER ::= { timetraSRMIBModules 17 }
+        "Rev 2.0                15 Jan 2004 00:00
---          timetraMirrorMIBModule           OBJECT IDENTIFIER ::= { timetraSRMIBModules 18 }
+         2.0 release of the TIMETRA-GLOBAL-MIB."
---          timetraCflowdMIBModule           OBJECT IDENTIFIER ::= { timetraSRMIBModules 19 }
+
---          timetraVrrpMIBModule             OBJECT IDENTIFIER ::= { timetraSRMIBModules 20 }
+    REVISION    "200301200000Z"
---          timetraFilterMIBModule           OBJECT IDENTIFIER ::= { timetraSRMIBModules 21 }
+    DESCRIPTION
---          timetraSecurityMIBModule         OBJECT IDENTIFIER ::= { timetraSRMIBModules 22 }
+        "Rev 1.0                20 Jan 2003 00:00
---          timetraIgmpMIBModule             OBJECT IDENTIFIER ::= { timetraSRMIBModules 23 )
+         This is the 1.0 release of the TIMETRA-GLOBAL-MIB."
---          timetraPimMIBModule              OBJECT IDENTIFIER ::= { timetraSRMIBModules 24 }
+
---          tmnxPortMIBModule                OBJECT IDENTIFIER ::= { timetraSRMIBModules 25 }
+    REVISION    "200008140000Z"
---          tmnxPppMIBModule                 OBJECT IDENTIFIER ::= { timetraSRMIBModules 26 }
+    DESCRIPTION
---          timetraATMMIBModule              OBJECT IDENTIFIER ::= { timetraSRMIBModules 27 }
+        "Rev 0.1                14 Aug 2000 00:00
---          timetraAgentCapabilityModule     OBJECT IDENTIFIER ::= { timetraSRMIBModules 28 }
+         This is the initial version of the TIMETRA-GLOBAL-MIB."
---          timetraAPSMIBModule              OBJECT IDENTIFIER ::= { timetraSRMIBModules 29 }
+
---          timetraGmplsMIBModule            OBJECT IDENTIFIER ::= { timetraSRMIBModules 30 }
+    ::= { timetraModules 1 }
---          timetraGmplsRsvpMIBModule        OBJECT IDENTIFIER ::= { timetraSRMIBModules 31 }   
+
---          timetraGmplsLmpMIBModule         OBJECT IDENTIFIER ::= { timetraSRMIBModules 32 }
+timetra                          OBJECT IDENTIFIER ::= { enterprises 6527 }
---          tmnxSubMgmtMIBModule             OBJECT IDENTIFIER ::= { timetraSRMIBModules 33 }
+
---          timetraNgBgpMIBModule            OBJECT IDENTIFIER ::= { timetraSRMIBModules 34 }
+timetraReg                       OBJECT IDENTIFIER ::= { timetra 1 }
---          not used. (formerly used by timetraOspfv3MIBModule)
+
---          timetraOspfNgMIBModule           OBJECT IDENTIFIER ::= { timetraSRMIBModules 36 }
+timetraModules                   OBJECT IDENTIFIER ::= { timetraReg 1 }
---          tmnxSchedulerMIBModule           OBJECT IDENTIFIER ::= { timetraSRMIBModules 37 }
+
---          timetraNtpMIBModule              OBJECT IDENTIFIER ::= { timetraSRMIBModules 38 }
+timetraSRMIBModules              OBJECT IDENTIFIER ::= { timetraModules 3 }
---          tmnxGsmpMIBModule                OBJECT IDENTIFIER ::= { timetraSRMIBModules 39 }
+
---          timetraMcRedundancyMIBModule     OBJECT IDENTIFIER ::= { timetraSRMIBModules 40 }
+timetraCapabilityModule          OBJECT IDENTIFIER ::= { timetraModules 4 }
---          timetraMcastCacMIBModule         OBJECT IDENTIFIER ::= { timetraSRMIBModules 41 }
+
---          timetraDOT3OAMMIBModule          OBJECT IDENTIFIER ::= { timetraSRMIBModules 42 }
+timetra7750CapModule             OBJECT IDENTIFIER ::= { timetraCapabilityModule 1 }
---          timetraMsdpMIBModule             OBJECT IDENTIFIER ::= { timetraSRMIBModules 43 } 
+
---          tmnxBsxMIBModule                 OBJECT IDENTIFIER ::= { timetraSRMIBModules 44 }
+timetra7450CapModule             OBJECT IDENTIFIER ::= { timetraCapabilityModule 2 }
---          timetraMldSnoopingMIBModule      OBJECT IDENTIFIER ::= { timetraSRMIBModules 45 }
+
---          timetraMldMIBModule              OBJECT IDENTIFIER ::= { timetraSRMIBModules 46 }
+timetra7710CapModule             OBJECT IDENTIFIER ::= { timetraCapabilityModule 3 }
---          timetraDhcpServerMIBModule       OBJECT IDENTIFIER ::= { timetraSRMIBModules 47 }
+
---          timetraIPsecMIBModule            OBJECT IDENTIFIER ::= { timetraSRMIBModules 48 }
+timetra7750MGCapModule           OBJECT IDENTIFIER ::= { timetraCapabilityModule 4 }
---          timetraPppoeMIBModule            OBJECT IDENTIFIER ::= { timetraSRMIBModules 49 }
+
---          timetraPimNgMIBModule            OBJECT IDENTIFIER ::= { timetraSRMIBModules 50 }
+timetraSROSCapModule             OBJECT IDENTIFIER ::= { timetraCapabilityModule 5 }
---          timetraLocalUserDbMIBModule      OBJECT IDENTIFIER ::= { timetraSRMIBModules 51 }
+
---          timetraIEEE8021CfmMIBModule      OBJECT IDENTIFIER ::= { timetraSRMIBModules 52 }
+timetraDCCapModule               OBJECT IDENTIFIER ::= { timetraCapabilityModule 6 }
---          timetraPimSnoopingMIBModule      OBJECT IDENTIFIER ::= { timetraSRMIBModules 53 }
+
---          timetraMcastPathMgmtMIBModule    OBJECT IDENTIFIER ::= { timetraSRMIBModules 54 }
+timetraMGCapModule               OBJECT IDENTIFIER ::= { timetraCapabilityModule 7 }
-        timetraCapabilityModule          OBJECT IDENTIFIER ::= { timetraModules 4 }
+
-            timetra7750CapModule             OBJECT IDENTIFIER ::= { timetraCapabilityModule 1 }
+alcatelCommonMIBModules          OBJECT IDENTIFIER ::= { timetraModules 5 }
---              timetra7750V3v0CapModule         OBJECT IDENTIFIER ::= { timetra7750CapModule 1 }
+
---              timetra7750V4v0CapModule         OBJECT IDENTIFIER ::= { timetra7750CapModule 2 }
+timetraServiceRouters            OBJECT IDENTIFIER ::= { timetraReg 3 }
---              timetra7750V5v0CapModule         OBJECT IDENTIFIER ::= { timetra7750CapModule 3 }
+
---              timetra7750V6v0CapModule         OBJECT IDENTIFIER ::= { timetra7750CapModule 4 }
+tmnxModelSR1Reg                  OBJECT-IDENTITY
-            timetra7450CapModule             OBJECT IDENTIFIER ::= { timetraCapabilityModule 2 }
+    STATUS      current
---              timetra7450V3v0CapModule         OBJECT IDENTIFIER ::= { timetra7450CapModule 1 }
+    DESCRIPTION
---              timetra7450V4v0CapModule         OBJECT IDENTIFIER ::= { timetra7450CapModule 2 }
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
---              timetra7450V5v0CapModule         OBJECT IDENTIFIER ::= { timetra7450CapModule 3 }
+         Nokia 7750 SR-1 Version 1 device."
---              timetra7450V6v0CapModule         OBJECT IDENTIFIER ::= { timetra7450CapModule 4 }
+    ::= { timetraServiceRouters 1 }
-            timetra7710CapModule             OBJECT IDENTIFIER ::= { timetraCapabilityModule 3 }
+
---              timetra7710V3v0CapModule         OBJECT IDENTIFIER ::= { timetra7710CapModule 1 }
+tmnxModelSR4Reg                  OBJECT-IDENTITY
---              timetra7710V4v0CapModule         OBJECT IDENTIFIER ::= { timetra7710CapModule 2 }
+    STATUS      current
---              timetra7710V6v0CapModule         OBJECT IDENTIFIER ::= { timetra7710CapModule 3 }
+    DESCRIPTION
-        alcatelCommonMIBModules          OBJECT IDENTIFIER ::= { timetraModules 5 }
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
---          alcatelGlobalMIBModule           OBJECT IDENTIFIER ::= { alcatelCommonMIBModules 1 }
+         Nokia 7750 SR-4 device."
-
+    ::= { timetraServiceRouters 2 }
---
+
--- ----------------------------------------------
+tmnxModelSR12Reg                 OBJECT-IDENTITY
--- timetra-reg 3  : 7750 SR hardware products
+    STATUS      current
--- ----------------------------------------------
+    DESCRIPTION
---  Sub-trees for registration of Alcatel 7750 SR series hardware products
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
---
+         Nokia 7750 SR-12 device."
-    timetraServiceRouters   OBJECT IDENTIFIER ::= { timetraReg 3 }
+    ::= { timetraServiceRouters 3 }
-        tmnxModelSR1Reg         OBJECT-IDENTITY
+
-            STATUS  current
+tmnxModelSR7Reg                  OBJECT-IDENTITY
-            DESCRIPTION
+    STATUS      current
-                "This objectID is to be used as the mib-2 sysObjectID to
+    DESCRIPTION
-                identify the Alcatel 7750 SR-1 device."
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
-        ::= { timetraServiceRouters 1 }
+         Nokia 7750 SR-7 device."
-
+    ::= { timetraServiceRouters 4 }
-        tmnxModelSR4Reg         OBJECT-IDENTITY
+
-            STATUS  current
+tmnxModelSR6Reg                  OBJECT-IDENTITY
-            DESCRIPTION
+    STATUS      current
-                "This objectID is to be used as the mib-2 sysObjectID to
+    DESCRIPTION
-                 identify the Alcatel 7750 SR-4 device."
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
-        ::= { timetraServiceRouters 2 }
+         Nokia 7750 SR-6 device."
-
+    ::= { timetraServiceRouters 5 }
-        tmnxModelSR12Reg         OBJECT-IDENTITY
+
-            STATUS  current
+tmnxModelSRc12Reg                OBJECT-IDENTITY
-            DESCRIPTION
+    STATUS      current
-                "This objectID is to be used as the mib-2 sysObjectID to
+    DESCRIPTION
-                 identify the Alcatel 7750 SR-12 device."
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
-        ::= { timetraServiceRouters 3 }
+         Nokia 7750 SR-c12 device."
-
+    ::= { timetraServiceRouters 6 }
-        tmnxModelSR7Reg         OBJECT-IDENTITY
+
-            STATUS  current
+tmnxModelSRc4Reg                 OBJECT-IDENTITY
-            DESCRIPTION
+    STATUS      current
-                "This objectID is to be used as the mib-2 sysObjectID to
+    DESCRIPTION
-                 identify the Alcatel 7750 SR-7 device."
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
-        ::= { timetraServiceRouters 4 }
+         Nokia 7750 SR-c4 device."
-
+    ::= { timetraServiceRouters 7 }
-        tmnxModelSR6Reg         OBJECT-IDENTITY
+
-            STATUS  current
+tmnxModelSR12EReg                OBJECT-IDENTITY
-            DESCRIPTION
+    STATUS      current
-                "This objectID is to be used as the mib-2 sysObjectID to
+    DESCRIPTION
-                 identify the Alcatel 7750 SR-6 device."
+        "This objectID is to be used as the mib-2 sysObjectID to identify the
-        ::= { timetraServiceRouters 5 }
+         Nokia 7750 SR-12E device."
-
+    ::= { timetraServiceRouters 8 }
---
+
--- ----------------------------------------------
+tmnxModelSRa4Reg                 OBJECT-IDENTITY
--- timetra-reg 6  : 7450 ESS hardware products
+    STATUS      current
--- ----------------------------------------------
+    DESCRIPTION
---  Sub-tree for registration of Alcatel 7450 ESS series hardware products
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
---
+         Nokia 7750 SR-a4 device."
-timetraServiceSwitches    OBJECT IDENTIFIER ::= { timetraReg 6 }
+    ::= { timetraServiceRouters 9 }
-        tmnxModelESS1Reg         OBJECT-IDENTITY
+
-            STATUS  current
+tmnxModelSRa8Reg                 OBJECT-IDENTITY
-            DESCRIPTION
+    STATUS      current
-                "This objectID is to be used as the mib-2 sysObjectID to
+    DESCRIPTION
-                 identify the Alcatel 7450 ESS-1 device."
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
-        ::= { timetraServiceSwitches 1 }
+         Nokia 7750 SR-a8 device."
-
+    ::= { timetraServiceRouters 10 }
-        tmnxModelESS4Reg         OBJECT-IDENTITY
+
-            STATUS  current
+tmnxModelSR1eReg                 OBJECT-IDENTITY
-            DESCRIPTION
+    STATUS      current
-                "This objectID is to be used as the mib-2 sysObjectID to
+    DESCRIPTION
-                 identify the Alcatel 7450 ESS-4 device."
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
-        ::= { timetraServiceSwitches 2 }
+         Nokia 7750 SR-1e device."
-
+    ::= { timetraServiceRouters 11 }
-        tmnxModelESS7Reg         OBJECT-IDENTITY
+
-            STATUS  current
+tmnxModelSR2eReg                 OBJECT-IDENTITY
-            DESCRIPTION
+    STATUS      current
-                "This objectID is to be used as the mib-2 sysObjectID to
+    DESCRIPTION
-                 identify the Alcatel 7450 ESS-7 device."
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
-        ::= { timetraServiceSwitches 3 }
+         Nokia 7750 SR-2e device."
-
+    ::= { timetraServiceRouters 12 }
-         tmnxModelESS12Reg        OBJECT-IDENTITY
+
-            STATUS  current
+tmnxModelSR3eReg                 OBJECT-IDENTITY
-            DESCRIPTION
+    STATUS      current
-                "This objectID is to be used as the mib-2 sysObjectID to
+    DESCRIPTION
-                 identify the Alcatel 7450 ESS-12 device."
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
-        ::= { timetraServiceSwitches 4 }
+         Nokia 7750 SR-3e device."
-
+    ::= { timetraServiceRouters 13 }
-         tmnxModelESS6Reg        OBJECT-IDENTITY
+
-            STATUS  current
+tmnxModelSARHmReg                OBJECT-IDENTITY
-            DESCRIPTION
+    STATUS      current
-                "This objectID is to be used as the mib-2 sysObjectID to
+    DESCRIPTION
-                 identify the Alcatel 7450 ESS-6 device."
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
-        ::= { timetraServiceSwitches 5 }
+         Nokia 7705 SAR-Hm device."
-
+    ::= { timetraServiceRouters 14 }
-         tmnxModelESS6vReg       OBJECT-IDENTITY
+
-            STATUS  current
+tmnxModelSR1v2Reg                OBJECT-IDENTITY
-            DESCRIPTION
+    STATUS      current
-                "This objectID is to be used as the mib-2 sysObjectID to
+    DESCRIPTION
-                 identify the Alcatel 7450 ESS-6V device."
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
-        ::= { timetraServiceSwitches 6 }
+         Nokia 7750 SR-1 Version 2 device."
-
+    ::= { timetraServiceRouters 15 }
---
+
--- ----------------------------------------------
+tmnxModelSR14sReg                OBJECT-IDENTITY
--- timetra-reg 9  : 7710 SR hardware products
+    STATUS      current
--- ----------------------------------------------
+    DESCRIPTION
---  Sub-trees for registration of Alcatel 7710 SR series hardware products
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
---
+         Nokia 7750 SR-14s device."
-    alcatel7710ServiceRouters   OBJECT IDENTIFIER ::= { timetraReg 9 }
+    ::= { timetraServiceRouters 16 }
-        tmnxModel7710SRc12Reg    OBJECT-IDENTITY
+
-            STATUS  current
+tmnxModelSR7sReg                 OBJECT-IDENTITY
-            DESCRIPTION
+    STATUS      current
-                "This objectID is to be used as the mib-2 sysObjectID to
+    DESCRIPTION
-                 identify the Alcatel 7710 SR-c12 (12 Compact MDA slots)
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
-                 device."
+         Nokia 7750 SR-7s device."
-        ::= { alcatel7710ServiceRouters 1 }
+    ::= { timetraServiceRouters 17 }
-
+
-        tmnxModel7710SRc4Reg    OBJECT-IDENTITY
+tmnxModelSR1sReg                 OBJECT-IDENTITY
-            STATUS  current
+    STATUS      current
-            DESCRIPTION
+    DESCRIPTION
-                "This objectID is to be used as the mib-2 sysObjectID to
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
-                 identify the Alcatel 7710 SR-c4 (4 Compact MDA slots)
+         Nokia 7750 SR-1s device."
-                 device."
+    ::= { timetraServiceRouters 18 }
-        ::= { alcatel7710ServiceRouters 2 }
+
-        
+tmnxModelSR2sReg                 OBJECT-IDENTITY
---
+    STATUS      current
--- ----------------------------------------------------------------------------
+    DESCRIPTION
--- timetra 2  : tree for company-wide common objects
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
--- ----------------------------------------------------------------------------
+         Nokia 7750 SR-2s device."
---      Sub-tree for company-wide objects and events
+    ::= { timetraServiceRouters 19 }
---
+
-timetraGeneric  OBJECT IDENTIFIER ::= { timetra 2 }
+tmnxModelIXRr6Reg                OBJECT-IDENTITY
-
+    STATUS      current
---
+    DESCRIPTION
--- ----------------------------------------------------------------------------
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
--- timetra 3  : product specific objects
+         Nokia 7250 IXR six mda slot device."
--- ----------------------------------------------------------------------------
+    ::= { timetraServiceRouters 20 }
--- Sub-tree for product-specific objects and events.
+
--- Note: 
+tmnxModelIXR6Reg                 OBJECT-IDENTITY
---   3 products were originally defined:
+    STATUS      current
---   - SR     : objects for the 7750
+    DESCRIPTION
---   - ESS    : objects for the 7450
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
---   - Common : objects common to both products
+         Nokia 7250 IXR six slot device."
---   Both the ESS and Common branch are now deprecated.
+    ::= { timetraServiceRouters 21 }
---   All MIB modules are placed under tmnxSRMIB node.
+
---
+tmnxModelIXR10Reg                OBJECT-IDENTITY
-timetraProducts         OBJECT IDENTIFIER ::= { timetra 3 }
+    STATUS      current
-
+    DESCRIPTION
---
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
--- ----------------------------------------------
+         Nokia 7250 IXR ten slot device."
--- timetra-products 1  : 7750 objects
+    ::= { timetraServiceRouters 22 }
--- ----------------------------------------------
+
---  Sub-tree for Service Router MIBs
+tmnxModelIXRsReg                 OBJECT-IDENTITY
-    tmnxSRMIB           OBJECT IDENTIFIER ::= { timetraProducts 1 }
+    STATUS      current
---      Sub-tree for Service Router conformace
+    DESCRIPTION
-        tmnxSRConfs          OBJECT IDENTIFIER ::= { tmnxSRMIB 1 }
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
---      Sub-tree for Service Router Objects
+         Nokia 7250 IXR one slot device."
-        tmnxSRObjs           OBJECT IDENTIFIER ::= { tmnxSRMIB 2 }
+    ::= { timetraServiceRouters 23 }
---      Sub-tree for Service Router Notifications (events)
+
-        tmnxSRNotifyPrefix   OBJECT IDENTIFIER ::= { tmnxSRMIB 3 }
+tmnxModelSARHmcReg               OBJECT-IDENTITY
-
+    STATUS      current
---
+    DESCRIPTION
--- ----------------------------------------------
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
--- timetra-products 2  : 7450 objects
+         Nokia 7705 SAR-Hmc device."
--- ----------------------------------------------
+    ::= { timetraServiceRouters 24 }
---  Sub-tree for Service switch Router MIBs
+
-    tmnxESSMIB          OBJECT IDENTIFIER ::= { timetraProducts 2 }
+tmnxModelIXReReg                 OBJECT-IDENTITY
---      Sub-tree for Service Switch conformace
+    STATUS      current
-        tmnxESSConfs         OBJECT IDENTIFIER ::= { tmnxESSMIB 1 }
+    DESCRIPTION
---      Sub-tree for Service Switch Objects
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
-        tmnxESSObjs          OBJECT IDENTIFIER ::= { tmnxESSMIB 2 }
+         Nokia 7250 IXR-e device."
---      Sub-tree for Service Switch Notifications (events)
+    ::= { timetraServiceRouters 25 }
-        tmnxESSNotifyPrefix  OBJECT IDENTIFIER ::= { tmnxESSMIB 3 }
+
-
+timetraServiceSwitches           OBJECT IDENTIFIER ::= { timetraReg 6 }
---
+
--- ----------------------------------------------
+tmnxModelESS1Reg                 OBJECT-IDENTITY
--- timetra-products 3  : Alcatel objects
+    STATUS      current
--- ----------------------------------------------
+    DESCRIPTION
---  Sub-tree for Common MIBs
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
-    alcatelCommonMIB    OBJECT IDENTIFIER ::= { timetraProducts 3 }
+         Nokia 7450 ESS-1 device."
---      Sub-tree for Service Switch conformace
+    ::= { timetraServiceSwitches 1 }
-        alcatelConformance   OBJECT IDENTIFIER ::= { alcatelCommonMIB 1 }
+
---      Sub-tree for Service Switch Objects
+tmnxModelESS4Reg                 OBJECT-IDENTITY
-        alcatelObjects       OBJECT IDENTIFIER ::= { alcatelCommonMIB 2 }
+    STATUS      current
---      Sub-tree for Service Switch Notifications (events)
+    DESCRIPTION
-        alcatelNotifyPrefix  OBJECT IDENTIFIER ::= { alcatelCommonMIB 3 }
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
-
+         Nokia 7450 ESS-4 device."
---
+    ::= { timetraServiceSwitches 2 }
--- ----------------------------------------------------------------------------
+
--- timetra 4  : Agent Capabilities
+tmnxModelESS7Reg                 OBJECT-IDENTITY
--- This capability branch is now obsolete and replaced with the { timetra 5 }
+    STATUS      current
--- product capabilities branch.
+    DESCRIPTION
--- ----------------------------------------------------------------------------
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
---
+         Nokia 7450 ESS-7 device."
-tmnxAgentCapability        OBJECT IDENTIFIER ::= { timetra 4 }
+    ::= { timetraServiceSwitches 3 }
-    tmnx7750AgentCapability        OBJECT IDENTIFIER ::= { tmnxAgentCapability 1 }
+
-    tmnx7450AgentCapability        OBJECT IDENTIFIER ::= { tmnxAgentCapability 2 }
+tmnxModelESS12Reg                OBJECT-IDENTITY
-    tmnx7710AgentCapability        OBJECT IDENTIFIER ::= { tmnxAgentCapability 3 }
+    STATUS      current
-
+    DESCRIPTION
---
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
--- ----------------------------------------------------------------------------
+         Nokia 7450 ESS-12 device."
--- timetra 5  : Product Capabilities
+    ::= { timetraServiceSwitches 4 }
--- ----------------------------------------------------------------------------
+
---
+tmnxModelESS6Reg                 OBJECT-IDENTITY
-tmnxProductCapability      OBJECT IDENTIFIER ::= { timetra 5 }
+    STATUS      current
-    tmnx7750Capability         OBJECT IDENTIFIER ::= { tmnxProductCapability 1 }
+    DESCRIPTION
-        tmnx7750V3v0               OBJECT IDENTIFIER ::= { tmnx7750Capability 1 }
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
-        tmnx7750V4v0               OBJECT IDENTIFIER ::= { tmnx7750Capability 2 }
+         Nokia 7450 ESS-6 device."
-        tmnx7750V5v0               OBJECT IDENTIFIER ::= { tmnx7750Capability 3 }
+    ::= { timetraServiceSwitches 5 }
-        tmnx7750V6v0               OBJECT IDENTIFIER ::= { tmnx7750Capability 4 }
+
-    tmnx7450Capability         OBJECT IDENTIFIER ::= { tmnxProductCapability 2 }
+tmnxModelESS6vReg                OBJECT-IDENTITY
-        tmnx7450V3v0               OBJECT IDENTIFIER ::= { tmnx7450Capability 1 }
+    STATUS      current
-        tmnx7450V4v0               OBJECT IDENTIFIER ::= { tmnx7450Capability 2 }
+    DESCRIPTION
-        tmnx7450V5v0               OBJECT IDENTIFIER ::= { tmnx7450Capability 3 }
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
-        tmnx7450V6v0               OBJECT IDENTIFIER ::= { tmnx7450Capability 4 }
+         Nokia 7450 ESS-6V device."
-    tmnx7710Capability         OBJECT IDENTIFIER ::= { tmnxProductCapability 3 }
+    ::= { timetraServiceSwitches 6 }
-        tmnx7710V3v0               OBJECT IDENTIFIER ::= { tmnx7710Capability 1 }
+
-        tmnx7710V4v0               OBJECT IDENTIFIER ::= { tmnx7710Capability 2 }
+alcatel7710ServiceRouters        OBJECT IDENTIFIER ::= { timetraReg 9 }
-        tmnx7710V5v0               OBJECT IDENTIFIER ::= { tmnx7710Capability 3 }
+
-        tmnx7710V6v0               OBJECT IDENTIFIER ::= { tmnx7710Capability 4 }
+tmnxModel7710SRc12Reg            OBJECT-IDENTITY
-
+    STATUS      current
-END
+    DESCRIPTION
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
+         Nokia 7710 SR-c12 (12 Compact MDA slots) device."
+    ::= { alcatel7710ServiceRouters 1 }
+
+tmnxModel7710SRc4Reg             OBJECT-IDENTITY
+    STATUS      current
+    DESCRIPTION
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
+         Nokia 7710 SR-c4 (4 Compact MDA slots) device."
+    ::= { alcatel7710ServiceRouters 2 }
+
+alcatel7750MobileGateways        OBJECT IDENTIFIER ::= { timetraReg 12 }
+
+tmnxModel7750MGSR7Reg            OBJECT-IDENTITY
+    STATUS      current
+    DESCRIPTION
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
+         Nokia 7750-MG SR-7 device."
+    ::= { alcatel7750MobileGateways 1 }
+
+tmnxModel7750MGSR12Reg           OBJECT-IDENTITY
+    STATUS      current
+    DESCRIPTION
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
+         Nokia 7750-MG SR-12 device."
+    ::= { alcatel7750MobileGateways 2 }
+
+alcatelMGVMExtRoutingSystems     OBJECT IDENTIFIER ::= { timetraReg 13 }
+
+alcatel7950ExtRoutingSystems     OBJECT IDENTIFIER ::= { timetraReg 15 }
+
+tmnxModel7950XRS20Reg            OBJECT-IDENTITY
+    STATUS      current
+    DESCRIPTION
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
+         Nokia 7950 XRS-20 device."
+    ::= { alcatel7950ExtRoutingSystems 1 }
+
+tmnxModel7950XRS16Reg            OBJECT-IDENTITY
+    STATUS      current
+    DESCRIPTION
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
+         Nokia 7950 XRS-16 device."
+    ::= { alcatel7950ExtRoutingSystems 2 }
+
+tmnxModel7950XRS20EReg           OBJECT-IDENTITY
+    STATUS      current
+    DESCRIPTION
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
+         Nokia 7950 XRS-20E device."
+    ::= { alcatel7950ExtRoutingSystems 3 }
+
+alcatel7nnnExtServiceRouters     OBJECT IDENTIFIER ::= { timetraReg 18 }
+
+alcatelVMExtRoutingSystems       OBJECT IDENTIFIER ::= { timetraReg 19 }
+
+tmnxModelVSRReg                  OBJECT-IDENTITY
+    STATUS      current
+    DESCRIPTION
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
+         Nokia Virtual Service Router device."
+    ::= { alcatelVMExtRoutingSystems 1 }
+
+tmnxModelVSRcReg                 OBJECT-IDENTITY
+    STATUS      current
+    DESCRIPTION
+        "This objectId is to be used as the mib-2 sysObjectID to identify the
+         Nokia Virtual Service Router compact device."
+    ::= { alcatelVMExtRoutingSystems 2 }
+
+timetraGeneric                   OBJECT IDENTIFIER ::= { timetra 2 }
+
+timetraProducts                  OBJECT IDENTIFIER ::= { timetra 3 }
+
+tmnxSRMIB                        OBJECT IDENTIFIER ::= { timetraProducts 1 }
+
+tmnxSRConfs                      OBJECT IDENTIFIER ::= { tmnxSRMIB 1 }
+
+tmnxSRObjs                       OBJECT IDENTIFIER ::= { tmnxSRMIB 2 }
+
+tmnxSRNotifyPrefix               OBJECT IDENTIFIER ::= { tmnxSRMIB 3 }
+
+tmnxESSMIB                       OBJECT IDENTIFIER ::= { timetraProducts 2 }
+
+tmnxESSConfs                     OBJECT IDENTIFIER ::= { tmnxESSMIB 1 }
+
+tmnxESSObjs                      OBJECT IDENTIFIER ::= { tmnxESSMIB 2 }
+
+tmnxESSNotifyPrefix              OBJECT IDENTIFIER ::= { tmnxESSMIB 3 }
+
+alcatelCommonMIB                 OBJECT IDENTIFIER ::= { timetraProducts 3 }
+
+alcatelConformance               OBJECT IDENTIFIER ::= { alcatelCommonMIB 1 }
+
+alcatelObjects                   OBJECT IDENTIFIER ::= { alcatelCommonMIB 2 }
+
+alcatelNotifyPrefix              OBJECT IDENTIFIER ::= { alcatelCommonMIB 3 }
+
+tmnxMGMIB                        OBJECT IDENTIFIER ::= { timetraProducts 4 }
+
+tmnxMGConfs                      OBJECT IDENTIFIER ::= { tmnxMGMIB 1 }
+
+tmnxMGObjs                       OBJECT IDENTIFIER ::= { tmnxMGMIB 2 }
+
+tmnxMGNotifyPrefix               OBJECT IDENTIFIER ::= { tmnxMGMIB 3 }
+
+tmnxAgentCapability              OBJECT IDENTIFIER ::= { timetra 4 }
+
+tmnx7750AgentCapability          OBJECT IDENTIFIER ::= { tmnxAgentCapability 1 }
+
+tmnx7450AgentCapability          OBJECT IDENTIFIER ::= { tmnxAgentCapability 2 }
+
+tmnx7710AgentCapability          OBJECT IDENTIFIER ::= { tmnxAgentCapability 3 }
+
+tmnxProductCapability            OBJECT IDENTIFIER ::= { timetra 5 }
+
+tmnx7750Capability               OBJECT IDENTIFIER ::= { tmnxProductCapability 1 }
+
+tmnx7750V3v0                     OBJECT IDENTIFIER ::= { tmnx7750Capability 1 }
+
+tmnx7750V4v0                     OBJECT IDENTIFIER ::= { tmnx7750Capability 2 }
+
+tmnx7750V5v0                     OBJECT IDENTIFIER ::= { tmnx7750Capability 3 }
+
+tmnx7750V6v0                     OBJECT IDENTIFIER ::= { tmnx7750Capability 4 }
+
+tmnx7750V6v1                     OBJECT IDENTIFIER ::= { tmnx7750Capability 5 }
+
+tmnx7750V7v0                     OBJECT IDENTIFIER ::= { tmnx7750Capability 6 }
+
+tmnx7750V8v0                     OBJECT IDENTIFIER ::= { tmnx7750Capability 7 }
+
+tmnx7450Capability               OBJECT IDENTIFIER ::= { tmnxProductCapability 2 }
+
+tmnx7450V3v0                     OBJECT IDENTIFIER ::= { tmnx7450Capability 1 }
+
+tmnx7450V4v0                     OBJECT IDENTIFIER ::= { tmnx7450Capability 2 }
+
+tmnx7450V5v0                     OBJECT IDENTIFIER ::= { tmnx7450Capability 3 }
+
+tmnx7450V6v0                     OBJECT IDENTIFIER ::= { tmnx7450Capability 4 }
+
+tmnx7450V6v1                     OBJECT IDENTIFIER ::= { tmnx7450Capability 5 }
+
+tmnx7450V7v0                     OBJECT IDENTIFIER ::= { tmnx7450Capability 6 }
+
+tmnx7450V8v0                     OBJECT IDENTIFIER ::= { tmnx7450Capability 7 }
+
+tmnx7710Capability               OBJECT IDENTIFIER ::= { tmnxProductCapability 3 }
+
+tmnx7710V3v0                     OBJECT IDENTIFIER ::= { tmnx7710Capability 1 }
+
+tmnx7710V4v0                     OBJECT IDENTIFIER ::= { tmnx7710Capability 2 }
+
+tmnx7710V5v0                     OBJECT IDENTIFIER ::= { tmnx7710Capability 3 }
+
+tmnx7710V6v0                     OBJECT IDENTIFIER ::= { tmnx7710Capability 4 }
+
+tmnx7710V6v1                     OBJECT IDENTIFIER ::= { tmnx7710Capability 5 }
+
+tmnx7710V7v0                     OBJECT IDENTIFIER ::= { tmnx7710Capability 6 }
+
+tmnx7710V8v0                     OBJECT IDENTIFIER ::= { tmnx7710Capability 7 }
+
+tmnx7750MGCapability             OBJECT IDENTIFIER ::= { tmnxProductCapability 4 }
+
+tmnx7750MGV1v0                   OBJECT IDENTIFIER ::= { tmnx7750MGCapability 1 }
+
+tmnx7750MGV2v0                   OBJECT IDENTIFIER ::= { tmnx7750MGCapability 2 }
+
+tmnx7750MGV3v0                   OBJECT IDENTIFIER ::= { tmnx7750MGCapability 3 }
+
+tmnx7750MGV4v0                   OBJECT IDENTIFIER ::= { tmnx7750MGCapability 4 }
+
+tmnxSROSCapability               OBJECT IDENTIFIER ::= { tmnxProductCapability 5 }
+
+tmnxSROSV8v0                     OBJECT IDENTIFIER ::= { tmnxSROSCapability 1 }
+
+tmnxSROSV9v0                     OBJECT IDENTIFIER ::= { tmnxSROSCapability 2 }
+
+tmnxSROSV10v0                    OBJECT IDENTIFIER ::= { tmnxSROSCapability 3 }
+
+tmnxBasedProducts                OBJECT IDENTIFIER ::= { timetra 6 }
+
+timetraConformance               OBJECT IDENTIFIER ::= { timetra 999 }
+
+timetraCompliances               OBJECT IDENTIFIER ::= { timetraConformance 1 }
+
+timetraCompliance                MODULE-COMPLIANCE
+    STATUS      current
+    DESCRIPTION
+        "The global MIB compliance statement for timetra products"
+    MODULE
+        MANDATORY-GROUPS {
+            timetraGroup
+        }
+    ::= { timetraCompliances 1 }
+
+timetraGroups                    OBJECT IDENTIFIER ::= { timetraConformance 2 }
+
+timetraGroup                     OBJECT-GROUP
+    OBJECTS     {
+        timetraEoM
+    }
+    STATUS      current
+    DESCRIPTION
+        "The group of objects in the timetra group"
+    ::= { timetraGroups 1 }
+
+timetraEoM                       OBJECT-TYPE
+    SYNTAX      DateAndTime
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "The object timetraEoM is the last readable object supported by Nokia
+         SR family defined by Nokia.
+
+         The value of timetraEoM indicates the date and time when the object
+         was last read in an SNMP get request."
+    ::= { timetra 1000 }
+
+END

mibs/nokia/TIMETRA-SDP-MIB

@@ -52,10 +52,11 @@ IMPORTS
     tmnxServNotifications, tmnxServObjs,
     tmnxSvcObjs, tstpTraps
                                                          FROM TIMETRA-SERV-MIB
-    SdpBindId, ServiceAdminStatus,
+    AluNgeKeygroupIdOrZero, SdpBindId,
-    TCpmProtPolicyID, TFCSet,
+    ServiceAdminStatus, TCpmProtPolicyID,
-    TItemDescription, TLNamedItemOrEmpty,
+    TFCSet, TItemDescription,
-    TNamedItem, TNamedItemOrEmpty,
+    TLNamedItemOrEmpty, TNamedItem,
+    TNamedItemOrEmpty,
     TPolicyStatementNameOrEmpty,
     TQosQGrpInstanceIDorZero,
     TSdpEgressPolicyID, TSdpIngressPolicyID,
@@ -91,7 +92,7 @@ timetraServicesSdpMIBModule      MODULE-IDENTITY
         "This document is the SNMP MIB module to manage and provision the
          various services of the Nokia SROS system.
 
-         Copyright 2003-2017 Nokia. All rights reserved. Reproduction of this
+         Copyright 2003-2018 Nokia. All rights reserved. Reproduction of this
          document is authorized on the condition that the foregoing copyright
          notice is included.
 
@@ -402,7 +403,7 @@ sdpOperStatus                    OBJECT-TYPE
     ::= { sdpInfoEntry 9 }
 
 sdpAdminPathMtu                  OBJECT-TYPE
-    SYNTAX      Integer32 (0 | 576..9194)
+    SYNTAX      Integer32 (0 | 576..9782)
     MAX-ACCESS  read-create
     STATUS      current
     DESCRIPTION
@@ -644,7 +645,7 @@ sdpCollectAcctStats              OBJECT-TYPE
     ::= { sdpInfoEntry 30 }
 
 sdpAccountingPolicyId            OBJECT-TYPE
-    SYNTAX      Unsigned32
+    SYNTAX      Unsigned32 (0..99)
     MAX-ACCESS  read-create
     STATUS      current
     DESCRIPTION
@@ -749,7 +750,7 @@ sdpBandwidthBookingFactor        OBJECT-TYPE
 
 sdpOperBandwidth                 OBJECT-TYPE
     SYNTAX      Unsigned32
-    UNITS       "kilobits per second"
+    UNITS       "kilobps"
     MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION
@@ -761,7 +762,7 @@ sdpOperBandwidth                 OBJECT-TYPE
 
 sdpAvailableBandwidth            OBJECT-TYPE
     SYNTAX      Unsigned32
-    UNITS       "kilobits per second"
+    UNITS       "kilobps"
     MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION
@@ -771,7 +772,7 @@ sdpAvailableBandwidth            OBJECT-TYPE
 
 sdpMaxBookableBandwidth          OBJECT-TYPE
     SYNTAX      Unsigned32
-    UNITS       "kilobits per second"
+    UNITS       "kilobps"
     MAX-ACCESS  accessible-for-notify
     STATUS      current
     DESCRIPTION
@@ -785,7 +786,7 @@ sdpMaxBookableBandwidth          OBJECT-TYPE
 
 sdpBookedBandwidth               OBJECT-TYPE
     SYNTAX      Unsigned32
-    UNITS       "kilobits per second"
+    UNITS       "kilobps"
     MAX-ACCESS  accessible-for-notify
     STATUS      current
     DESCRIPTION
@@ -1287,7 +1288,9 @@ SdpBindEntry                     ::= SEQUENCE
     sdpBindForceQinqVcForwarding     TruthValue,
     sdpBindIngressVlanTranslation    INTEGER,
     sdpBindIngressVlanTranslationId  Integer32,
-    sdpBindMinReqdSdpOperMtu         Integer32
+    sdpBindMinReqdSdpOperMtu         Integer32,
+    sdpBindForceQinqVcFwding         INTEGER,
+    sdpBindMulticastSource           TruthValue
 }
 
 sdpBindId                        OBJECT-TYPE
@@ -1517,10 +1520,11 @@ sdpBindSplitHorizonGrp           OBJECT-TYPE
     DESCRIPTION
         "This value of the object sdpBindSplitHorizonGrp specifies the name of
          the split-horizon group where the spoke SDP Bind belongs to. This
-         object can be set only at the time the row is created. Per default a
+         object can be set only at the time the row is created and is mutually
-         spoke SDP Bind does not belong to any split-horizon group. The name
+         exclusive with sdpBindMulticastSource. Per default a spoke SDP Bind
-         specified must correspond to an existing split-horizon group in the
+         does not belong to any split-horizon group. The name specified must
-         TLS service where this spoke SDP Bind is defined."
+         correspond to an existing split-horizon group in the TLS service where
+         this spoke SDP Bind is defined."
     DEFVAL      { "" }
     ::= { sdpBindEntry 19 }
 
@@ -1690,7 +1694,7 @@ sdpBindCollectAcctStats          OBJECT-TYPE
     ::= { sdpBindEntry 26 }
 
 sdpBindAccountingPolicyId        OBJECT-TYPE
-    SYNTAX      Unsigned32
+    SYNTAX      Unsigned32 (0..99)
     MAX-ACCESS  read-create
     STATUS      current
     DESCRIPTION
@@ -1882,7 +1886,7 @@ sdpBindForceVlanVcForwarding     OBJECT-TYPE
 
 sdpBindAdminBandwidth            OBJECT-TYPE
     SYNTAX      SdpBindBandwidth
-    UNITS       "kilobits per second"
+    UNITS       "kilobps"
     MAX-ACCESS  read-create
     STATUS      current
     DESCRIPTION
@@ -1895,7 +1899,7 @@ sdpBindAdminBandwidth            OBJECT-TYPE
 
 sdpBindOperBandwidth             OBJECT-TYPE
     SYNTAX      SdpBindBandwidth
-    UNITS       "kilobits per second"
+    UNITS       "kilobps"
     MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION
@@ -2488,7 +2492,7 @@ sdpBindBfdEncap                  OBJECT-TYPE
 sdpBindForceQinqVcForwarding     OBJECT-TYPE
     SYNTAX      TruthValue
     MAX-ACCESS  read-create
-    STATUS      current
+    STATUS      obsolete
     DESCRIPTION
         "The value of sdpBindForceQinqVcForwarding specifies whether or not the
          datapath should forcefully insert two VLAN tags when sdpBindVcType is
@@ -2548,6 +2552,35 @@ sdpBindMinReqdSdpOperMtu         OBJECT-TYPE
          SDP MTU size used with this SDP binding."
     ::= { sdpBindEntry 82 }
 
+sdpBindForceQinqVcFwding         OBJECT-TYPE
+    SYNTAX      INTEGER {
+        none     (0),
+        ctagctag (1),
+        stagctag (2)
+    }
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION
+        "The value of sdpBindForceQinqVcFwding specifies whether or not the
+         datapath should forcefully insert two VLAN tags which are copied from
+         the qinq service-delimiting vlan values.
+
+         The sdpBindVcType should be either set to 'ether' or 'vlan'."
+    DEFVAL      { none }
+    ::= { sdpBindEntry 83 }
+
+sdpBindMulticastSource           OBJECT-TYPE
+    SYNTAX      TruthValue
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION
+        "The value of sdpBindMulticastSource specifies whether or not the
+         multicast source is enabled on the SDP. This object can only be set at
+         the time the row is created and is mutually exclusive with
+         sdpBindSplitHorizonGrp."
+    DEFVAL      { false }
+    ::= { sdpBindEntry 84 }
+
 sdpBindBaseStatsTable            OBJECT-TYPE
     SYNTAX      SEQUENCE OF SdpBindBaseStatsEntry
     MAX-ACCESS  not-accessible
@@ -4180,7 +4213,7 @@ sdpBindCpipePeerPayloadSize      OBJECT-TYPE
 
 sdpBindCpipeLocalBitrate         OBJECT-TYPE
     SYNTAX      Unsigned32
-    UNITS       "64 Kbits/s"
+    UNITS       "sixty-four kilobps"
     MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION
@@ -4189,7 +4222,7 @@ sdpBindCpipeLocalBitrate         OBJECT-TYPE
 
 sdpBindCpipePeerBitrate          OBJECT-TYPE
     SYNTAX      Unsigned32
-    UNITS       "64 Kbits/s"
+    UNITS       "sixty-four kilobps"
     MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION
@@ -4951,7 +4984,17 @@ PwTemplateEntry                  ::= SEQUENCE
     pwTemplateForceQinqVcForwarding  TruthValue,
     pwTemplatePreferProvSdp          TruthValue,
     pwTemplateEntropyLabel           TruthValue,
-    pwTemplateName                   TLNamedItemOrEmpty
+    pwTemplateName                   TLNamedItemOrEmpty,
+    pwTemplateGreDelivery            TruthValue,
+    pwTemplateIngQoSNetworkPlcyName  TLNamedItemOrEmpty,
+    pwTemplateEgrQoSNetworkPlcyName  TLNamedItemOrEmpty,
+    pwTemplateIngressIpFilterName    TLNamedItemOrEmpty,
+    pwTemplateIngressIpv6FilterName  TLNamedItemOrEmpty,
+    pwTemplateIngressMacFilterName   TLNamedItemOrEmpty,
+    pwTemplateEgressIpFilterName     TLNamedItemOrEmpty,
+    pwTemplateEgressIpv6FilterName   TLNamedItemOrEmpty,
+    pwTemplateEgressMacFilterName    TLNamedItemOrEmpty,
+    pwTemplateForceQinqVcFwding      INTEGER
 }
 
 pwTemplateId                     OBJECT-TYPE
@@ -5008,7 +5051,7 @@ pwTemplateVcType                 OBJECT-TYPE
     ::= { pwTemplateEntry 5 }
 
 pwTemplateAccountingPolicyId     OBJECT-TYPE
-    SYNTAX      Unsigned32
+    SYNTAX      Unsigned32 (0..99)
     MAX-ACCESS  read-create
     STATUS      current
     DESCRIPTION
@@ -5269,14 +5312,14 @@ pwTemplateIgmpImportPlcy         OBJECT-TYPE
 
 pwTemplateIgmpLastMembIntvl      OBJECT-TYPE
     SYNTAX      Unsigned32 (1..50)
-    UNITS       "deci-seconds"
+    UNITS       "deciseconds"
     MAX-ACCESS  read-create
     STATUS      current
     DESCRIPTION
         "The value of pwTemplateIgmpLastMembIntvl specifies the Max Response
-         Time (in tenths of a second) used in Group-Specific and
+         Time (in deciseconds) used in Group-Specific and Group-Source-Specific
-         Group-Source-Specific Queries sent in response to 'leave' messages.
+         Queries sent in response to 'leave' messages. This is also the amount
-         This is also the amount of time between Group-Specific Query messages.
+         of time between Group-Specific Query messages.
 
          This value may be tuned to modify the leave latency of the network. A
          reduced value results in reduced time to detect the loss of the last
@@ -5364,7 +5407,7 @@ pwTemplateIgmpMcacPolicyName     OBJECT-TYPE
 
 pwTemplateIgmpMcacUnconstBW      OBJECT-TYPE
     SYNTAX      Integer32 (-1 | 0..2147483647)
-    UNITS       "kbps"
+    UNITS       "kilobps"
     MAX-ACCESS  read-create
     STATUS      obsolete
     DESCRIPTION
@@ -5383,7 +5426,7 @@ pwTemplateIgmpMcacUnconstBW      OBJECT-TYPE
 
 pwTemplateIgmpMcacPrRsvMndBW     OBJECT-TYPE
     SYNTAX      Integer32 (-1..2147483647)
-    UNITS       "kbps"
+    UNITS       "kilobps"
     MAX-ACCESS  read-create
     STATUS      obsolete
     DESCRIPTION
@@ -5570,7 +5613,7 @@ pwTemplateShgAutoLearnMacProtect OBJECT-TYPE
     ::= { pwTemplateEntry 56 }
 
 pwTemplateIngQoSNetworkPlcyId    OBJECT-TYPE
-    SYNTAX      TSdpIngressPolicyID
+    SYNTAX      TSdpIngressPolicyID (0..65535)
     MAX-ACCESS  read-create
     STATUS      current
     DESCRIPTION
@@ -5580,7 +5623,7 @@ pwTemplateIngQoSNetworkPlcyId    OBJECT-TYPE
     ::= { pwTemplateEntry 57 }
 
 pwTemplateEgrQoSNetworkPlcyId    OBJECT-TYPE
-    SYNTAX      TSdpEgressPolicyID
+    SYNTAX      TSdpEgressPolicyID (0..65535)
     MAX-ACCESS  read-create
     STATUS      current
     DESCRIPTION
@@ -5597,8 +5640,8 @@ pwTemplateIngQoSFpRedirectQGrp   OBJECT-TYPE
         "The value of pwTemplateIngQoSFpRedirectQGrp specifies the
          forwarding-plane queue group Policy for this PW template.
 
-         This object must be set along with pwTemplateIngQoSNetworkPlcyId
+         This object must be set along with pwTemplateIngQoSNetworkPlcyId or
-         object.
+         pwTemplateIngQoSNetworkPlcyName object.
 
          An 'inconsistentValue' error is returned if
          pwTemplateIngQoSFpRedirectQGrp is set to a non-default value and an
@@ -5615,8 +5658,8 @@ pwTemplateEgrQoSPortRedirectQGrp OBJECT-TYPE
         "The value of pwTemplateEgrQoSPortRedirectQGrp specifies the
          forwarding-plane queue group Policy for this PW template.
 
-         This object must be set along with pwTemplateEgrQoSNetworkPlcyId
+         This object must be set along with pwTemplateEgrQoSNetworkPlcyId or
-         object.
+         pwTemplateEgrQoSNetworkPlcyName object.
 
          An 'inconsistentValue' error is returned if
          pwTemplateEgrQoSPortRedirectQGrp is set to a non-default value and an
@@ -5659,7 +5702,7 @@ pwTemplateBlockOnPeerFault       OBJECT-TYPE
 pwTemplateForceQinqVcForwarding  OBJECT-TYPE
     SYNTAX      TruthValue
     MAX-ACCESS  read-create
-    STATUS      current
+    STATUS      obsolete
     DESCRIPTION
         "The value of pwTemplateForceQinqVcForwarding specifies whether or not
          the datapath should forcefully insert two VLAN tags when
@@ -5707,6 +5750,133 @@ pwTemplateName                   OBJECT-TYPE
     DEFVAL      { ''H }
     ::= { pwTemplateEntry 67 }
 
+pwTemplateGreDelivery            OBJECT-TYPE
+    SYNTAX      TruthValue
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION
+        "The value of pwTemplateGreDelivery specifies whether or not to use a
+         GRE tunnel should be used when creating an auto SDP. An
+         'inconsistentValue' error is returned if pwTemplateGreDelivery is
+         modified after creation of the entry."
+    DEFVAL      { false }
+    ::= { pwTemplateEntry 68 }
+
+pwTemplateIngQoSNetworkPlcyName  OBJECT-TYPE
+    SYNTAX      TLNamedItemOrEmpty
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION
+        "The value of the pwTemplateIngQoSNetworkPlcyName specifies the ingress
+         QoS network policy name applied to this PW template."
+    DEFVAL      { "" }
+    ::= { pwTemplateEntry 69 }
+
+pwTemplateEgrQoSNetworkPlcyName  OBJECT-TYPE
+    SYNTAX      TLNamedItemOrEmpty
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION
+        "The value of the pwTemplateEgrQoSNetworkPlcyName specifies the egress
+         QoS network policy name applied to this PW template."
+    DEFVAL      { "" }
+    ::= { pwTemplateEntry 70 }
+
+pwTemplateIngressIpFilterName    OBJECT-TYPE
+    SYNTAX      TLNamedItemOrEmpty
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION
+        "The value of pwTemplateIngressIpFilterName specifies the ingress
+         Filter name.
+
+         When the value of this object is set to non-default, the value of
+         object pwTemplateIngressIpFilterId is ignored."
+    DEFVAL      { "" }
+    ::= { pwTemplateEntry 71 }
+
+pwTemplateIngressIpv6FilterName  OBJECT-TYPE
+    SYNTAX      TLNamedItemOrEmpty
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION
+        "The value of pwTemplateIngressIpv6FilterName specifies the ingress
+         Filter name.
+
+         When the value of this object is set to non-default, the value of
+         object pwTemplateIngressIpv6FilterId is ignored."
+    DEFVAL      { "" }
+    ::= { pwTemplateEntry 72 }
+
+pwTemplateIngressMacFilterName   OBJECT-TYPE
+    SYNTAX      TLNamedItemOrEmpty
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION
+        "The value of pwTemplateIngressMacFilterName specifies the ingress
+         Filter name.
+
+         When the value of this object is set to non-default, the value of
+         object pwTemplateIngressMacFilterId is ignored."
+    DEFVAL      { "" }
+    ::= { pwTemplateEntry 73 }
+
+pwTemplateEgressIpFilterName     OBJECT-TYPE
+    SYNTAX      TLNamedItemOrEmpty
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION
+        "The value of pwTemplateEgressIpFilterName specifies the ingress Filter
+         name.
+
+         When the value of this object is set to non-default, the value of
+         object pwTemplateEgressIpFilterId is ignored."
+    DEFVAL      { "" }
+    ::= { pwTemplateEntry 74 }
+
+pwTemplateEgressIpv6FilterName   OBJECT-TYPE
+    SYNTAX      TLNamedItemOrEmpty
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION
+        "The value of pwTemplateEgressIpv6FilterName specifies the ingress
+         Filter name.
+
+         When the value of this object is set to non-default, the value of
+         object pwTemplateEgressIpv6FilterId is ignored."
+    DEFVAL      { "" }
+    ::= { pwTemplateEntry 75 }
+
+pwTemplateEgressMacFilterName    OBJECT-TYPE
+    SYNTAX      TLNamedItemOrEmpty
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION
+        "The value of pwTemplateEgressMacFilterName specifies the ingress
+         Filter name.
+
+         When the value of this object is set to non-default, the value of
+         object pwTemplateEgressMacFilterId is ignored."
+    DEFVAL      { "" }
+    ::= { pwTemplateEntry 76 }
+
+pwTemplateForceQinqVcFwding      OBJECT-TYPE
+    SYNTAX      INTEGER {
+        none     (0),
+        ctagctag (1),
+        stagctag (2)
+    }
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION
+        "The value of pwTemplateForceQinqVcFwding specifies whether or not the
+         datapath should forcefully insert two VLAN tags which are copied from
+         the qinq service-delimiting vlan values.
+
+         The pwTemplateVcType should be either set to 'ether' or 'vlan'."
+    DEFVAL      { none }
+    ::= { pwTemplateEntry 77 }
+
 pwTemplateIgmpSnpgGrpSrcTblLC    OBJECT-TYPE
     SYNTAX      TimeStamp
     MAX-ACCESS  read-only
@@ -5940,7 +6110,7 @@ sdpBindTlsMrpLastChngd           OBJECT-TYPE
 
 sdpBindTlsMrpJoinTime            OBJECT-TYPE
     SYNTAX      Unsigned32 (1..10)
-    UNITS       "deci-seconds"
+    UNITS       "deciseconds"
     MAX-ACCESS  read-write
     STATUS      current
     DESCRIPTION
@@ -5952,7 +6122,7 @@ sdpBindTlsMrpJoinTime            OBJECT-TYPE
 
 sdpBindTlsMrpLeaveTime           OBJECT-TYPE
     SYNTAX      Unsigned32 (30..60)
-    UNITS       "deci-seconds"
+    UNITS       "deciseconds"
     MAX-ACCESS  read-write
     STATUS      current
     DESCRIPTION
@@ -5964,7 +6134,7 @@ sdpBindTlsMrpLeaveTime           OBJECT-TYPE
 
 sdpBindTlsMrpLeaveAllTime        OBJECT-TYPE
     SYNTAX      Unsigned32 (60..300)
-    UNITS       "deci-seconds"
+    UNITS       "deciseconds"
     MAX-ACCESS  read-write
     STATUS      current
     DESCRIPTION
@@ -5976,7 +6146,7 @@ sdpBindTlsMrpLeaveAllTime        OBJECT-TYPE
 
 sdpBindTlsMrpPeriodicTime        OBJECT-TYPE
     SYNTAX      Unsigned32 (10..100)
-    UNITS       "deci-seconds"
+    UNITS       "deciseconds"
     MAX-ACCESS  read-write
     STATUS      current
     DESCRIPTION
@@ -7035,7 +7205,8 @@ SdpPwPortEntry                   ::= SEQUENCE
     sdpPwPortEgrShapSapSecShaper     TNamedItemOrEmpty,
     sdpPwPortMonOperGrp              TNamedItemOrEmpty,
     sdpPwPortIngVcLabel              Unsigned32,
-    sdpPwPortEgrVcLabel              Unsigned32
+    sdpPwPortEgrVcLabel              Unsigned32,
+    sdpPwPortControlWord             TruthValue
 }
 
 sdpPwPortId                      OBJECT-TYPE
@@ -7280,6 +7451,16 @@ sdpPwPortEgrVcLabel              OBJECT-TYPE
     DEFVAL      { 0 }
     ::= { sdpPwPortEntry 16 }
 
+sdpPwPortControlWord             OBJECT-TYPE
+    SYNTAX      TruthValue
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION
+        "The sdpPwPortControlWord specifies whether the use of the
+         'ControlWord' is preferred or not."
+    DEFVAL      { false }
+    ::= { sdpPwPortEntry 17 }
+
 sdpGrpTblLastChanged             OBJECT-TYPE
     SYNTAX      TimeStamp
     MAX-ACCESS  read-only
@@ -8280,7 +8461,7 @@ sdpBindTlsFdbMacStatsTable       OBJECT-TYPE
     STATUS      current
     DESCRIPTION
         "This table maintains the count of MAC address entries per FDB type for
-         the SAPs in VPLS services."
+         the SDPs in VPLS services."
     ::= { tmnxSdpObjs 60 }
 
 sdpBindTlsFdbMacStatsEntry       OBJECT-TYPE
@@ -8289,7 +8470,7 @@ sdpBindTlsFdbMacStatsEntry       OBJECT-TYPE
     STATUS      current
     DESCRIPTION
         "This entry maintains the count of MAC address entries per FDB type for
-         the SAP in a VPLS service."
+         the SDP in a VPLS service."
     INDEX       {
         svcId,
         sdpBindId,
@@ -8306,7 +8487,7 @@ sdpBindTlsFdbMacStatsNumEntries  OBJECT-TYPE
     STATUS      current
     DESCRIPTION
         "The value of sdpBindTlsFdbMacStatsNumEntries indicates the number of
-         MAC address entries of the FDB type in the SAP in this service."
+         MAC address entries of the FDB type in the SDP in this service."
     ::= { sdpBindTlsFdbMacStatsEntry 1 }
 
 sdpBindPwLoopbackTable           OBJECT-TYPE
@@ -8473,7 +8654,10 @@ PwTemplateAugEntry               ::= SEQUENCE
     pwTemplateAugStpRootGuard        TruthValue,
     pwTemplateAugStpAdminStatus      TmnxEnabledDisabledAdminState,
     pwTemplateAugL2ptTermination     TmnxEnabledDisabled,
-    pwTemplateAugL2ptProtocols       L2ptProtocols
+    pwTemplateAugL2ptProtocols       L2ptProtocols,
+    pwTemplateAugGreAllowFrag        TruthValue,
+    pwTemplateAugAluNgeKeyGroupIn    AluNgeKeygroupIdOrZero,
+    pwTemplateAugAluNgeKeyGroupOut   AluNgeKeygroupIdOrZero
 }
 
 pwTemplateAugLastChgd            OBJECT-TYPE
@@ -8601,6 +8785,38 @@ pwTemplateAugL2ptProtocols       OBJECT-TYPE
     DEFVAL      { {} }
     ::= { pwTemplateAugEntry 10 }
 
+pwTemplateAugGreAllowFrag        OBJECT-TYPE
+    SYNTAX      TruthValue
+    MAX-ACCESS  read-write
+    STATUS      current
+    DESCRIPTION
+        "The value of pwTemplateAugGreAllowFrag specifies whether to allow GRE
+         encapsulated packets to be sent without setting the DF bit.
+
+         This object is valid only when pwTemplateGreDelivery is set to 'true'."
+    DEFVAL      { false }
+    ::= { pwTemplateAugEntry 11 }
+
+pwTemplateAugAluNgeKeyGroupIn    OBJECT-TYPE
+    SYNTAX      AluNgeKeygroupIdOrZero
+    MAX-ACCESS  read-write
+    STATUS      current
+    DESCRIPTION
+        "The pwTemplateAugAluNgeKeyGroupIn specifies keygroup identifier for
+         the inbound direction."
+    DEFVAL      { 0 }
+    ::= { pwTemplateAugEntry 12 }
+
+pwTemplateAugAluNgeKeyGroupOut   OBJECT-TYPE
+    SYNTAX      AluNgeKeygroupIdOrZero
+    MAX-ACCESS  read-write
+    STATUS      current
+    DESCRIPTION
+        "The pwTemplateAugAluNgeKeyGroupOut specifies keygroup identifier for
+         the outbound direction."
+    DEFVAL      { 0 }
+    ::= { pwTemplateAugEntry 13 }
+
 sdpSegRouteTableLastChgd         OBJECT-TYPE
     SYNTAX      TimeStamp
     MAX-ACCESS  read-only
@@ -8743,7 +8959,7 @@ SdpEvpnMHEthSegEntry             ::= SEQUENCE
 }
 
 sdpEvpnMHEthSegName              OBJECT-TYPE
-    SYNTAX      TNamedItemOrEmpty (SIZE (0|1..28))
+    SYNTAX      TNamedItemOrEmpty
     MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION
@@ -10150,7 +10366,6 @@ tmnxSdp7750V15v0Compliance       MODULE-COMPLIANCE
             sdpBindTlsEtreeGroup,
             tmnxSdpBindCpmProtV12v0Group,
             tmnxSdpBindCtrlChanReqGroup,
-            tmnxSdpBindV11v0Group,
             tmnxSdpBindCtrlChanAckGroup,
             tmnxSdpPBBEpipePWRedV12v0Group,
             tmnxSdpPbbEpipeNotifyObjsGroup,
@@ -10245,7 +10460,6 @@ tmnxSdp7450V15v0Compliance       MODULE-COMPLIANCE
             tmnxSdpBindCpmProtV12v0Group,
             tmnxSdpBindCtrlChanReqGroup,
             tmnxSdpBindCtrlChanAckGroup,
-            tmnxSdpBindV11v0Group,
             tmnxSdpPBBEpipePWRedV12v0Group,
             tmnxSdpPbbEpipeNotifyObjsGroup,
             tmnxSdpPbbEpipeNotifV12v0Group,
@@ -10271,6 +10485,47 @@ tmnxSdp7450V15v0Compliance       MODULE-COMPLIANCE
         }
     ::= { tmnxSdpCompliances 29 }
 
+tmnxSdp7750V16v0Compliance       MODULE-COMPLIANCE
+    STATUS      current
+    DESCRIPTION
+        "The compliance statement for management of services SDPs on Nokia 7750
+         SROS series systems release 16.0."
+    MODULE
+        MANDATORY-GROUPS {
+            pwTemplateGreGroup,
+            pwTemplateQosV16v0Group,
+            pwTemplateFilterNameV16v0Group,
+            tmnxSdpBindQinqV16v0Group
+        }
+    ::= { tmnxSdpCompliances 30 }
+
+tmnxSdp7450V16v0Compliance       MODULE-COMPLIANCE
+    STATUS      current
+    DESCRIPTION
+        "The compliance statement for management of services SDPs on Nokia 7450
+         SROS series systems release 16.0."
+    MODULE
+        MANDATORY-GROUPS {
+            pwTemplateGreGroup,
+            pwTemplateQosV16v0Group,
+            pwTemplateFilterNameV16v0Group,
+            tmnxSdpBindQinqV16v0Group
+        }
+    ::= { tmnxSdpCompliances 31 }
+
+tmnxSdpV19v0Compliance           MODULE-COMPLIANCE
+    STATUS      current
+    DESCRIPTION
+        "The compliance statement for management of services SDPs on Nokia SROS
+         series systems release 19.0"
+    MODULE
+        MANDATORY-GROUPS {
+            sdpPwPortControlWordGroup,
+            pwTemplateNgeAutoBindGroup,
+            sdpBindMcastSrcV19v0Group
+        }
+    ::= { tmnxSdpCompliances 32 }
+
 tmnxSdpGroups                    OBJECT IDENTIFIER ::= { tmnxSdpConformance 2 }
 
 tmnxSdpV6v0Group                 OBJECT-GROUP
@@ -11914,7 +12169,7 @@ tmnxSdpBindV11v0Group            OBJECT-GROUP
         sdpBindForceQinqVcForwarding,
         pwTemplateForceQinqVcForwarding
     }
-    STATUS      current
+    STATUS      obsolete
     DESCRIPTION
         "The group of objects supporting management of the SDP feature on Nokia
          SROS series systems in release 11.0."
@@ -12260,6 +12515,98 @@ sdpOperTunnelFarEndGroup         OBJECT-GROUP
          on Nokia SROS series systems in release 15.0."
     ::= { tmnxSdpGroups 559 }
 
+pwTemplateGreGroup               OBJECT-GROUP
+    OBJECTS     {
+        pwTemplateGreDelivery,
+        pwTemplateAugGreAllowFrag
+    }
+    STATUS      current
+    DESCRIPTION
+        "The group of objects supporting management of PW template GRE feature
+         on Nokia SROS series systems in release 16.0."
+    ::= { tmnxSdpGroups 560 }
+
+pwTemplateQosV16v0Group          OBJECT-GROUP
+    OBJECTS     {
+        pwTemplateIngQoSNetworkPlcyName,
+        pwTemplateEgrQoSNetworkPlcyName
+    }
+    STATUS      current
+    DESCRIPTION
+        "The group of objects supporting management of PW template QoS feature
+         on Nokia SROS series systems in release 16.0."
+    ::= { tmnxSdpGroups 561 }
+
+pwTemplateFilterNameV16v0Group   OBJECT-GROUP
+    OBJECTS     {
+        pwTemplateIngressIpFilterName,
+        pwTemplateIngressIpv6FilterName,
+        pwTemplateIngressMacFilterName,
+        pwTemplateEgressIpFilterName,
+        pwTemplateEgressIpv6FilterName,
+        pwTemplateEgressMacFilterName
+    }
+    STATUS      current
+    DESCRIPTION
+        "The group of objects supporting management of SAP templates Filter
+         feature on Nokia SROS series systems in release 16.0."
+    ::= { tmnxSdpGroups 562 }
+
+tmnxSdpBindQinqV16v0Group        OBJECT-GROUP
+    OBJECTS     {
+        sdpBindForceQinqVcFwding,
+        pwTemplateForceQinqVcFwding
+    }
+    STATUS      current
+    DESCRIPTION
+        "The group of objects supporting management of Qinq preserve and
+         translation feature on Nokia SROS series systems in release 16.0."
+    ::= { tmnxSdpGroups 564 }
+
+tmnxSdpBindV16v0ObsoletedGroup   OBJECT-GROUP
+    OBJECTS     {
+        sdpBindForceQinqVcForwarding,
+        pwTemplateForceQinqVcForwarding
+    }
+    STATUS      current
+    DESCRIPTION
+        "The group of objects supporting management of the SDP feature on Nokia
+         SROS series systems in release 16.0."
+    ::= { tmnxSdpGroups 565 }
+
+sdpPwPortControlWordGroup        OBJECT-GROUP
+    OBJECTS     {
+        sdpPwPortControlWord
+    }
+    STATUS      current
+    DESCRIPTION
+        "The group of objects supporting management of the SDP pseudo-wire port
+         with control-word feature on Nokia SROS series systems in release
+         19.10."
+    ::= { tmnxSdpGroups 566 }
+
+pwTemplateNgeAutoBindGroup       OBJECT-GROUP
+    OBJECTS     {
+        pwTemplateAugAluNgeKeyGroupIn,
+        pwTemplateAugAluNgeKeyGroupOut
+    }
+    STATUS      current
+    DESCRIPTION
+        "The group of objects supporting management of the SDP pseudo-wire port
+         with control-word feature on Nokia SROS series systems in release
+         19.10."
+    ::= { tmnxSdpGroups 567 }
+
+sdpBindMcastSrcV19v0Group        OBJECT-GROUP
+    OBJECTS     {
+        sdpBindMulticastSource
+    }
+    STATUS      current
+    DESCRIPTION
+        "The group of additional objects supporting management of the SDP
+         feature on Nokia SROS series systems in release 19.0."
+    ::= { tmnxSdpGroups 568 }
+
 sdpTrapsPrefix                   OBJECT IDENTIFIER ::= { tmnxServNotifications 4 }
 
 sdpTraps                         OBJECT IDENTIFIER ::= { sdpTrapsPrefix 0 }

mibs/nokia/TIMETRA-TC-MG-MIB

@@ -20,7 +20,7 @@ timetraTCMGMIBModule             MODULE-IDENTITY
         "This document is the SNMP MIB module for the SNMP Textual Conventions
          (TCs) used in the Nokia SROS manageability instrumentation.
 
-         Copyright 2003-2017 Nokia. All rights reserved. Reproduction of this
+         Copyright 2003-2018 Nokia. All rights reserved. Reproduction of this
          document is authorized on the condition that the foregoing copyright
          notice is included.
 

mibs/nokia/TIMETRA-TC-MIB

@@ -24,7 +24,7 @@ timetraTCMIBModule               MODULE-IDENTITY
         "This document is the SNMP MIB module for the SNMP Textual Conventions
          (TCs) used in the Nokia SROS manageability instrumentation.
 
-         Copyright 2003-2017 Nokia. All rights reserved. Reproduction of this
+         Copyright 2003-2018 Nokia. All rights reserved. Reproduction of this
          document is authorized on the condition that the foregoing copyright
          notice is included.
 
@@ -124,6 +124,22 @@ timetraTCMIBModule               MODULE-IDENTITY
 
     ::= { timetraModules 2 }
 
+TmnxFPNumber                     ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The unique value that identifies the forwarding plane within a
+         specific IOM card in the system."
+    SYNTAX      Unsigned32 (1..8)
+
+TmnxFPNumberOrZero               ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The unique value that identifies the forwarding plane within a
+         specific IOM card in the system.
+
+         Value 0 means this value is not applicable."
+    SYNTAX      Unsigned32 (0 | 1..8)
+
 InterfaceIndex                   ::= TEXTUAL-CONVENTION
     DISPLAY-HINT "d"
     STATUS      current
@@ -488,7 +504,7 @@ TmnxTimeInterval                 ::= TEXTUAL-CONVENTION
          TimeInterval TEXTUAL-CONVENTION can be used when an object requires
          longer intervals than 248 days.
 
-         A period of time, measured in units of 0.01 seconds."
+         A period of time, measured in units of centiseconds."
     SYNTAX      Unsigned32
 
 TNamedItem                       ::= TEXTUAL-CONVENTION
@@ -568,7 +584,7 @@ TItemLongDescription             ::= TEXTUAL-CONVENTION
     DESCRIPTION
         "Longer description for an item.  Note, use only NVT ASCII displayable
          characters here, no control characters, no UTF-8, etc."
-    SYNTAX      DisplayString (SIZE (0..160))
+    SYNTAX      DisplayString
 
 TRegularExpression               ::= TEXTUAL-CONVENTION
     STATUS      current
@@ -740,7 +756,7 @@ TmnxServId                       ::= TEXTUAL-CONVENTION
     DESCRIPTION
         "A number used to identify a Service. This ID must be unique within the
          Service Domain. The value 0 is used as the null ID."
-    SYNTAX      Unsigned32 (0 | 1..2147483647 | 2147483648 | 2147483649 | 2147483650 | 2147483651..2147483690 | 2147483691..2148007980 | 2148007981..2148012076 | 2148012077..2148016172 | 2148016173..2148278316 | 2148278317 | 2148278318..2148278381)
+    SYNTAX      Unsigned32 (0 | 1..2147483647 | 2147483648 | 2147483649 | 2147483650 | 2147483651..2147483690 | 2147483691..2148007980 | 2148007981..2148012076 | 2148012077..2148016172 | 2148016173..2148278316 | 2148278317 | 2148278318..2148278381 | 2148278382 | 2148278382..2148278386)
 
 TmnxExtServId                    ::= TEXTUAL-CONVENTION
     STATUS      current
@@ -808,7 +824,7 @@ TTmplPolicyID                    ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
         "The identification number of a policy for template objects."
-    SYNTAX      Unsigned32 (1..65535)
+    SYNTAX      Unsigned32 (0..65535)
 
 TQosIngressPolicyID              ::= TEXTUAL-CONVENTION
     STATUS      current
@@ -912,7 +928,11 @@ TmnxCreateOrigin                 ::= TEXTUAL-CONVENTION
         evpnIsa        (17),
         greBridged     (18),
         tli            (19),
-        pdn            (20)
+        pdn            (20),
+        ipsec          (23),
+        reserved24     (24),
+        reserved25     (25),
+        manual-mci     (26)
     }
 
 TmnxBsxTransitIpPolicyId         ::= TEXTUAL-CONVENTION
@@ -1277,6 +1297,13 @@ TmnxVcIdOrNone                   ::= TEXTUAL-CONVENTION
          0 indicates no VC ID is configured or available."
     SYNTAX      Unsigned32 (0 | 1..4294967295)
 
+DateAndTimeOrEmpty               ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "An object of type DateAndTimeOrEmpty data type contains a date-time
+         specification as in SNMPv2-TC::DateAndTime, or is empty"
+    SYNTAX      OCTET STRING (SIZE (0 | 8 | 11))
+
 Dot1PPriority                    ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
@@ -1290,6 +1317,12 @@ Dot1PPriorityMask                ::= TEXTUAL-CONVENTION
         "IEEE 802.1p priority mask.  zero is lowest, seven is highest."
     SYNTAX      Integer32 (0..7)
 
+Dot1PPriorityNonZeroMask         ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "IEEE 802.1p priority mask."
+    SYNTAX      Integer32 (1..7)
+
 ServiceAccessPoint               ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
@@ -1709,6 +1742,18 @@ TPortSchedulerCIR                ::= TEXTUAL-CONVENTION
          value -1 means maximum rate."
     SYNTAX      Integer32 (-1 | 0..800000000)
 
+TPortQosPIRRate                  ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The Peak Information Rate (PIR) rate to be used in kbps."
+    SYNTAX      Unsigned32 (1..10000)
+
+TPortQosCIRRate                  ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The Committed Information Rate (CIR) rate to be used in kbps."
+    SYNTAX      Unsigned32 (0..10000)
+
 TWeight                          ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
@@ -1868,8 +1913,8 @@ THPolCIRRateOverride             ::= TEXTUAL-CONVENTION
 TCIRPercentOverride              ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
-        "The CIR percentage rate specified in hundredths of a percent. A value
+        "The CIR percentage rate specified in centipercent. A value of -2
-         of -2 specifies no override."
+         specifies no override."
     SYNTAX      Integer32 (-2 | 0..10000)
 
 THsmdaCIRKRate                   ::= TEXTUAL-CONVENTION
@@ -1982,8 +2027,8 @@ THPolPIRRateOverride             ::= TEXTUAL-CONVENTION
 TPIRPercentOverride              ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
-        "The PIR percentage rate specified in hundredths of a percent. A value
+        "The PIR percentage rate specified in centipercent. A value of -2
-         of -2 specifies no override."
+         specifies no override."
     SYNTAX      Integer32 (-2 | 1..10000)
 
 TPIRRateOrZero                   ::= TEXTUAL-CONVENTION
@@ -2043,6 +2088,21 @@ TmnxDHCP6MsgType                 ::= TEXTUAL-CONVENTION
         dhcp6MsgTypeLeasequeryReply (15)
     }
 
+TmnxDhcpClientState              ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The state of a DHCP client."
+    SYNTAX      INTEGER {
+        init        (0),
+        init-reboot (1),
+        rebooting   (2),
+        selecting   (3),
+        requesting  (4),
+        rebinding   (5),
+        bound       (6),
+        renewing    (7)
+    }
+
 TmnxIgpInstance                  ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
@@ -2108,7 +2168,9 @@ TmnxBGPFamilyType                ::= TEXTUAL-CONVENTION
         ipv6Flow       (18),
         evpn           (19),
         bgpLs          (20),
-        mcastVpnIpv6   (21)
+        mcastVpnIpv6   (21),
+        srplcyIpv4     (22),
+        srplcyIpv6     (23)
     }
 
 TmnxIgmpGroupFilterMode          ::= TEXTUAL-CONVENTION
@@ -2139,6 +2201,17 @@ TmnxIgmpGroupType                ::= TEXTUAL-CONVENTION
         dynamic (2)
     }
 
+TmnxIgmpSnpgGroupType            ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The data type TmnxIgmpSnpgGroupType describes how a multicast  group
+         is learned."
+    SYNTAX      INTEGER {
+        static   (1),
+        dynamic  (2),
+        bgp-smet (3)
+    }
+
 TmnxIgmpVersion                  ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
@@ -2219,18 +2292,22 @@ TmnxTunnelTypeExt                ::= TEXTUAL-CONVENTION
     DESCRIPTION
         "The type of this tunnel entity."
     SYNTAX      INTEGER {
-        invalid (1),
+        invalid       (1),
-        sdp     (2),
+        sdp           (2),
-        rsvp    (3),
+        rsvp          (3),
-        ldp     (4),
+        ldp           (4),
-        ospf    (5),
+        ospf          (5),
-        isis    (6),
+        isis          (6),
-        bypass  (7),
+        bypass        (7),
-        gre     (8),
+        gre           (8),
-        bgp     (9),
+        bgp           (9),
-        srTe    (10),
+        srTe          (10),
-        fpe     (11),
+        fpe           (11),
-        udp     (12)
+        udp           (12),
+        ospfV3        (13),
+        mplsFwdPolicy (14),
+        srPolicy      (15),
+        ribApi        (16)
     }
 
 TmnxIgpSCFamilyType              ::= TEXTUAL-CONVENTION
@@ -2293,6 +2370,19 @@ TmnxNatIsaGrpIdOrZero            ::= TEXTUAL-CONVENTION
          The value zero means that no NAT ISA Group is defined."
     SYNTAX      Unsigned32 (0..4)
 
+TmnxNatL2AwAccessMode            ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "TmnxNatL2AwAccessMode is an enumerated integer that specifies the
+         Layer-2-Aware NAT access mode.
+
+         The value 'auto' means that the system automatically derives the
+         access mode from the configuration (of the access SAP)."
+    SYNTAX      INTEGER {
+        auto    (1),
+        bridged (2)
+    }
+
 TmnxNatSubscriberType            ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
@@ -2330,6 +2420,15 @@ TmnxNatSubscriberTypeOrNone      ::= TEXTUAL-CONVENTION
         nat64LsnSub   (4)
     }
 
+TmnxNatWaterMark                 ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The TmnxNatWaterMark data type contains an unsigned number that marks
+         a usage level in percent.
+
+         The value zero means that no watermark is defined."
+    SYNTAX      Unsigned32 (0..100)
+
 TmnxAuthPassword                 ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
@@ -2478,6 +2577,19 @@ TmnxSubAcctSessionId             ::= TEXTUAL-CONVENTION
          subscriber for the purposes of accounting."
     SYNTAX      DisplayString (SIZE (0..22))
 
+TmnxSubHostGrouping              ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The TmnxSubHostGrouping data type is an enumerated integer that
+         indicates the way hosts associated with a given subscriber and SAP are
+         grouped together to share an SLA profile instance."
+    SYNTAX      INTEGER {
+        perSap         (1),
+        perGroup       (2),
+        perSessionPpp  (3),
+        perSessionIpoe (4)
+    }
+
 TmnxSubIdentString               ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
@@ -2493,6 +2605,13 @@ TmnxSubIdentStringOrEmpty        ::= TEXTUAL-CONVENTION
          subscriber identification string."
     SYNTAX      DisplayString (SIZE (0..32))
 
+TmnxSubIdentShortString          ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The data type TmnxSubIdentShortString denotes the short subscriber
+         identification string."
+    SYNTAX      DisplayString (SIZE (1..32))
+
 TmnxSubRadServAlgorithm          ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
@@ -2514,6 +2633,33 @@ TmnxSubRadServAlgorithm          ::= TEXTUAL-CONVENTION
         hashBased  (3)
     }
 
+TmnxSubRadIsaServAlgorithm       ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The TmnxSubRadIsaServAlgorithm data type is an enumerated integer that
+         indicates the algorithm used to access the list of configured RADIUS
+         servers:
+         - direct         (1): The first server will be used as primary server for
+                                all requests, the second as secondary and so on.
+         - roundRobin     (2): The first server will be used as primary server for
+                                the first request, the second server as primary for
+                                the second request, and so on. If the router gets
+                                to the end of the list, it starts again with the
+                                first server.
+         - hashBased      (3): The server will be selected based on a specified
+                                hash value.
+         - directPriority (4): The first server will be used as primary server for
+                                all requests, the second as secondary and so on.
+                                Higher priority servers that are operationally down
+                                will be probed and put back into service upon a
+                                response."
+    SYNTAX      INTEGER {
+        direct         (1),
+        roundRobin     (2),
+        hashBased      (3),
+        directPriority (4)
+    }
+
 TmnxSubRadiusAttrType            ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
@@ -2654,6 +2800,26 @@ TmnxSubShcvSrcIpOrigin           ::= TEXTUAL-CONVENTION
         vrrp      (2)
     }
 
+TmnxSubSpiGroupId                ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The TmnxSubSpiGroupId data type is an integer that specifies  the SLA
+         profile instance group identifier.
+
+         A value of minus one means that there is no group identifier
+         configured."
+    SYNTAX      Integer32 (-1..65535)
+
+TmnxSubOperSpiGroupId            ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The TmnxSubOperSpiGroupId data type is an integer that indicates  the
+         SLA profile instance group identifier specified by the AAA server.
+
+         A value of minus one indicates that the AAA server  did not specify
+         such a group identifier."
+    SYNTAX      Integer32
+
 TmnxReferenceBandwidth           ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
@@ -2667,12 +2833,18 @@ TmnxReferenceBandwidth           ::= TEXTUAL-CONVENTION
          The value zero specifies that no reference-bandwidth is configured."
     SYNTAX      Unsigned32 (0..4000000000)
 
+TmnxSubPoolName                  ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The name of a pool"
+    SYNTAX      TLNamedItem
+
 TmnxSubProfileString             ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
         "The data type TmnxSubProfileString denotes the subscriber profile
          string."
-    SYNTAX      DisplayString (SIZE (1..16))
+    SYNTAX      DisplayString (SIZE (1..32))
 
 TmnxSubProfileStringOrEmpty      ::= TEXTUAL-CONVENTION
     STATUS      current
@@ -2680,20 +2852,20 @@ TmnxSubProfileStringOrEmpty      ::= TEXTUAL-CONVENTION
         "The data type TmnxSubProfileStringOrEmpty denotes the subscriber
          profile string. The empty string denotes the absence of a subscriber
          profile."
-    SYNTAX      DisplayString (SIZE (0..16))
+    SYNTAX      DisplayString (SIZE (0..32))
 
 TmnxSlaProfileString             ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
         "The data type TmnxSlaProfileString denotes the SLA profile string."
-    SYNTAX      DisplayString (SIZE (1..16))
+    SYNTAX      DisplayString (SIZE (1..32))
 
 TmnxSlaProfileStringOrEmpty      ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
         "The data type TmnxSlaProfileStringOrEmpty denotes the SLA profile
          string. The empty string denotes the absence of a SLA profile."
-    SYNTAX      DisplayString (SIZE (0..16))
+    SYNTAX      DisplayString (SIZE (0..32))
 
 TmnxAppProfileString             ::= TEXTUAL-CONVENTION
     STATUS      current
@@ -2989,6 +3161,20 @@ TmnxSubAleOffset                 ::= TEXTUAL-CONVENTION
         ipoeTagged           (24)
     }
 
+TmnxDataFormat                   ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The data type TmnxDataFormat represents how the input data
+         is specified:
+         - 'ascii (2)': the data contains seven-bit ASCII characters
+         - 'hex   (3)': the data contains octets. It must be displayed in
+                        hexadecimal format because it contains non-printable
+                        characters."
+    SYNTAX      INTEGER {
+        ascii (2),
+        hex   (3)
+    }
+
 TmnxDhcpOptionType               ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
@@ -3010,6 +3196,24 @@ TmnxDhcpOptionType               ::= TEXTUAL-CONVENTION
         domain (5)
     }
 
+TmnxDhcpOptionDisplay            ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The data type TmnxDhcpOptionDisplay represents a hint of
+         how the value of a DHCP option can be displayed:
+         - 'default (1)'             : display the option according to the type;
+         - 'hexDuration (2)'         : display the hex option as a duration;
+         - 'hexNetbiosNodeType (3)'  : display the hex option as a Netbios node type.;
+         - 'hexIpv4Address (4)'      : display the hex option as a list of IPv4 addresses.;
+         - 'hexIpv6Address (5)'      : display the hex option as a list of IPv6 addresses."
+    SYNTAX      INTEGER {
+        default            (1),
+        hexDuration        (2),
+        hexNetbiosNodeType (3),
+        hexIpv4Address     (4),
+        hexIpv6Address     (5)
+    }
+
 TmnxDhcpServerDUIDTypeCode       ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
@@ -3078,7 +3282,7 @@ TmnxPppoePadoDelay               ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
         "The data type TmnxPppoePadoDelay specifies the delay timeout in
-         deci-seconds before sending a PADO (PPPoE Active Discovery Offer)."
+         deciseconds before sending a PADO (PPPoE Active Discovery Offer)."
     SYNTAX      Unsigned32 (0 | 1..30)
 
 TmnxPppoeSessionInfoOrigin       ::= TEXTUAL-CONVENTION
@@ -3347,6 +3551,15 @@ TRemarkType                      ::= TEXTUAL-CONVENTION
         precedence (3)
     }
 
+TIngClassRemarkType              ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The remarking to be used."
+    SYNTAX      INTEGER {
+        any      (1),
+        dot1pExp (2)
+    }
+
 TPrecValue                       ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
@@ -3739,6 +3952,104 @@ TmnxAccPlcyQECounters            ::= TEXTUAL-CONVENTION
         ood (7)
     }
 
+TmnxAccPlcyPolicerICounters      ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "This data type describes a set of ingress counters for which
+         accounting data can be collected associated with a given policer.
+
+         ipo : In-profile Packets Offered
+         ipd : In-profile Packets Discarded
+         opo : Out-profile Packets Offered
+         opd : Out-profile Packets Discarded
+         ioo : In-profile Octets Offered
+         iod : In-profile Octets Discarded
+         ooo : Out-profile Octets Offered
+         ood : Out-profile Octets Discarded
+         ucp : Uncoloured Packets Offered
+         uco : Uncoloured Octets Offered
+         ipf : In-profile Packets Forwarded
+         iof : In-profile Octets Forwarded
+         opf : Out-profile Packets Forwarded
+         oof : Out-profile Octets Forwarded."
+    SYNTAX      BITS {
+        ipo (0),
+        ipd (1),
+        opo (2),
+        opd (3),
+        ioo (4),
+        iod (5),
+        ooo (6),
+        ood (7),
+        ucp (8),
+        uco (9),
+        ipf (10),
+        iof (11),
+        opf (12),
+        oof (13)
+    }
+
+TmnxAccPlcyPolicerECounters      ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "This data type describes a set of egress counters for which accounting
+         data can be collected associated with a given policer.
+
+          ipo  : In-profile Packets Offered
+          ipd  : In-profile Packets Discarded
+          opo  : Out-profile Packets Offered
+          opd  : Out-profile Packets Discarded
+          ioo  : In-profile Octets Offered
+          iod  : In-profile Octets Discarded
+          ooo  : Out-profile Octets Offered
+          ood  : Out-profile Octets Discarded
+          ucp  : Uncoloured Packets Offered
+          uco  : Uncoloured Octets Offered
+          ipf  : In-profile Packets Forwarded
+          iof  : In-profile Octets Forwarded
+          opf  : Out-Profile Packets Forwarded
+          oof  : Out-Profile Octets Forwarded
+          xpo  : Exceed-profile Packets Offered;
+          xpd  : Exceed-profile Packets Discarded;
+          xpf  : Exceed-profile Packets Forwarded;
+          xoo  : Exceed-profile Octets Offered;
+          xod  : Exceed-profile Octets Discarded;
+          xof  : Exceed-profile Octets Forwarded;
+          ppo  : In-plus-profile Packets Offered;
+          ppd  : In-plus-profile Packets Discarded;
+          ppf  : In-plus-profile Packets Forwarded;
+          poo  : In-plus-profile Octets Offered;
+          pod  : In-plus-profile Octets Discarded;
+          pof  : In-plus-profile Octets Forwarded;"
+    SYNTAX      BITS {
+        ipo (0),
+        ipd (1),
+        opo (2),
+        opd (3),
+        ioo (4),
+        iod (5),
+        ooo (6),
+        ood (7),
+        ucp (8),
+        uco (9),
+        ipf (10),
+        iof (11),
+        opf (12),
+        oof (13),
+        xpo (14),
+        xpd (15),
+        xpf (16),
+        xoo (17),
+        xod (18),
+        xof (19),
+        ppo (20),
+        ppd (21),
+        ppf (22),
+        poo (23),
+        pod (24),
+        pof (25)
+    }
+
 TmnxAccPlcyOICounters            ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
@@ -3867,6 +4178,22 @@ TmnxIsaBbGrpId                   ::= TEXTUAL-CONVENTION
          The value zero means that no ISA-BB Group is defined."
     SYNTAX      Unsigned32 (0..4)
 
+TmnxIsaScalingProfile            ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "TmnxIsaScalingProfile is an enumerated integer that specifies the ISA
+         scaling profile.
+
+         The meaning of each profile is explained in the customer
+         documentation.
+
+         ISA scaling profiles are only used in a virtual machine
+         implementation."
+    SYNTAX      INTEGER {
+        profile1 (1),
+        profile2 (2)
+    }
+
 TmnxVdoGrpIdIndex                ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
@@ -4053,6 +4380,20 @@ TIngPolicerId                    ::= TEXTUAL-CONVENTION
          side."
     SYNTAX      Integer32 (1..32)
 
+TNetIngPolicerId                 ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The data type describes the QoS control policer identifier on network
+         ingress side."
+    SYNTAX      Integer32 (1..16)
+
+TNetIngPolicerIdOrNone           ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The data type describes the QoS control policer identifier on network
+         ingress side or zero when not specified."
+    SYNTAX      Integer32 (0 | 1..16)
+
 TIngPolicerIdOrNone              ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
@@ -4155,6 +4496,14 @@ TClassBurstLimit                 ::= TEXTUAL-CONVENTION
          value."
     SYNTAX      Integer32 (-1 | 1..327680)
 
+TNetIngPlcrBurstSizeBytes        ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The amount of buffer space (in bytes) assigned to a queue by policer.
+         The value -1 means that the actual value is derived from the
+         corresponding buffer policy's default value."
+    SYNTAX      Integer32 (-1 | 128..4161536)
+
 TPlcrBurstSizeBytes              ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
@@ -4216,7 +4565,8 @@ TmnxBfdSessionProtocols          ::= TEXTUAL-CONVENTION
         ldpLsp      (20),
         bgpLsp      (21),
         rip         (22),
-        ripng       (23)
+        ripng       (23),
+        mplsLsp     (24)
     }
 
 TmnxBfdSessOperState             ::= TEXTUAL-CONVENTION
@@ -4247,7 +4597,8 @@ TmnxBfdOnLspSessFecType          ::= TEXTUAL-CONVENTION
     SYNTAX      INTEGER {
         rsvp (1),
         ldp  (2),
-        bgp  (3)
+        bgp  (3),
+        srTe (4)
     }
 
 TmnxIngPolicerStatMode           ::= TEXTUAL-CONVENTION
@@ -4268,6 +4619,36 @@ TmnxIngPolicerStatMode           ::= TEXTUAL-CONVENTION
         offeredLimitedCappedCIR  (9)
     }
 
+TmnxSapIngPolicerStatMode        ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "TmnxSapIngPolicerStatMode specifies the mode of statistics collected
+         by this sap ingress policer."
+    SYNTAX      INTEGER {
+        noStats                    (0),
+        minimal                    (1),
+        offeredProfileNoCIR        (2),
+        offeredTotalCIR            (3),
+        offeredPriorityNoCIR       (4),
+        offeredProfileCIR          (5),
+        offeredPriorityCIR         (6),
+        offeredLimitedProfileCIR   (7),
+        offeredProfileCappedCIR    (8),
+        offeredLimitedCappedCIR    (9),
+        offeredProfileWithDiscards (10),
+        reserved11                 (11)
+    }
+
+TmnxNetIngPlcyPolicerStatMode    ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "TmnxIngPolicerStatMode specifies the mode of statistics collected by
+         this network ingress policer."
+    SYNTAX      INTEGER {
+        noStats                    (0),
+        offeredProfileWithDiscards (10)
+    }
+
 TmnxIngPolicerStatModeOverride   ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
@@ -4455,8 +4836,10 @@ TmnxSvcOperGrpCreationOrigin     ::= TEXTUAL-CONVENTION
         "A number used to identify creation origin for the service operational
          group."
     SYNTAX      INTEGER {
-        manual (1),
+        manual    (1),
-        mvrp   (2)
+        mvrp      (2),
+        dynScript (7),
+        vsd       (12)
     }
 
 TmnxOperGrpHoldUpTime            ::= TEXTUAL-CONVENTION
@@ -4727,7 +5110,7 @@ TmnxDistCpuProtPacketRateLimit   ::= TEXTUAL-CONVENTION
 TmnxDistCpuProtRate              ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
-        "A kbps limiting rate in kilobits-per-second for Distributed CPU
+        "A kbps limiting rate in kilobits per second for Distributed CPU
          Protection Policy parameters. The value -1 means max rate."
     SYNTAX      Integer32 (-1 | 1..20000000)
 
@@ -5154,6 +5537,24 @@ TmnxSvcEvi                       ::= TEXTUAL-CONVENTION
         "The TmnxSvcEvi specifies an ethernet EVPN identifier value."
     SYNTAX      Integer32 (1..65535)
 
+TmnxSecRadiusServAlgorithm       ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The TmnxSecRadiusServAlgorithm data type is an enumerated integer that
+         indicates the algorithm used to access the list of configured RADIUS
+         servers:
+         - direct      (1): The first server will be used as primary server for
+                            all requests, the second as secondary and so on.
+         - round-robin (2): The first server will be used as primary server for
+                            the first request, the second server as primary for
+                            the second request, and so on. If the router gets
+                            to the end of the list, it starts again with the
+                            first server."
+    SYNTAX      INTEGER {
+        direct      (1),
+        round-robin (2)
+    }
+
 TmnxSvcEviOrZero                 ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
@@ -5217,6 +5618,31 @@ TmnxCBFClasses                   ::= TEXTUAL-CONVENTION
         defaultLsp (8)
     }
 
+TmnxUrpfCheckMode                ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The TmnxUrpfCheckMode is the mode of operation of Unicast Reverse Path
+         Forwarding (uRPF).
+
+         A value of 'strict' means that uRPF checks if the incoming packet has
+         a source address that matches a prefix in the routing table, and if
+         the interface expects to receive a packet with this source address
+         prefix.
+
+         A value of 'loose' means that the uRPF checks if the incoming packet
+         has a source address with a corresponding prefix in the routing table,
+         but not if the interface expects to receive a packet with a specific
+         source address prefix.
+
+         A value of 'strictNoEcmp' means that the uRPF drops a packet with a
+         source address that matches an ECMP route and otherwise behaves the
+         same as in 'strict' mode."
+    SYNTAX      INTEGER {
+        strict       (1),
+        loose        (2),
+        strictNoEcmp (3)
+    }
+
 TmnxUserPassword                 ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
@@ -5726,16 +6152,20 @@ TmnxSvcEvpnMplsTransportType     ::= TEXTUAL-CONVENTION
     DESCRIPTION
         "The type of this transport entity."
     SYNTAX      INTEGER {
-        invalid (0),
+        invalid       (0),
-        local   (1),
+        local         (1),
-        static  (2),
+        static        (2),
-        rsvp    (3),
+        rsvp          (3),
-        ldp     (4),
+        ldp           (4),
-        ospf    (5),
+        ospf          (5),
-        isis    (6),
+        isis          (6),
-        bgp     (7),
+        bgp           (7),
-        srTe    (8),
+        srTe          (8),
-        udp     (9)
+        udp           (9),
+        srPolicy      (10),
+        mplsFwdPolicy (11),
+        ribApi        (12),
+        srOspf3       (13)
     }
 
 TmnxMplsLabel                    ::= TEXTUAL-CONVENTION
@@ -5751,10 +6181,175 @@ TmnxMplsLabelOrZero              ::= TEXTUAL-CONVENTION
          value 0 indicates that no MPLS label is specified."
     SYNTAX      Unsigned32 (0 | 32..1048575)
 
+TmnxMplsLspBandwidth             ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The TmnxMplsLspBandwidth data type indicates maximum bandwidth range."
+    SYNTAX      Unsigned32 (0..6400000)
+
 TmnxVni                          ::= TEXTUAL-CONVENTION
     STATUS      current
     DESCRIPTION
         "The TmnxVni data type indicates range for VNI."
     SYNTAX      Unsigned32 (1..16777215)
 
+TmnxVniOrZero                    ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The TmnxVni data type indicates range for VNI."
+    SYNTAX      Unsigned32 (0..16777215)
+
+PwPortIdOrZero                   ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "PwPortIdOrZero indicates the range for pw port id's with 0 as the
+         default value."
+    SYNTAX      Unsigned32 (0 | 1..32767)
+
+TmnxCliEngine                    ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The value of TmnxCliEngine specifies the CLI engine type.
+         Values:
+           classicCli    (1) - Classic CLI engine.
+           mdCli         (2) - Model-Driven CLI engine.
+           systemDerived (3) - Default value. CLI engine derived from system configuration-mode."
+    SYNTAX      INTEGER {
+        classicCli    (1),
+        mdCli         (2),
+        systemDerived (3)
+    }
+
+TmnxRsvpSessionNameString        ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The TmnxRsvpSessionNameString type indicates the RSVP session name
+         which has extended from 80 to 160 characters."
+    SYNTAX      DisplayString (SIZE (0..160))
+
+TmnxQosMdAutoPolicyID            ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The identification number of a policy for Qos objects. This ID must be
+         unique within the Qos Domain. The value 0 is used as the null ID."
+    SYNTAX      Unsigned32 (0 | 2..65535)
+
+TmnxQosMdAutoIDCount             ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "This data type describes the count of policy IDs that has already been
+         assigned for Qos objects."
+    SYNTAX      Unsigned32 (0..65535)
+
+TmnxNhgDownReason                ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The reason for next-hop group being operationally down."
+    SYNTAX      INTEGER {
+        notApplicable      (0),
+        nextHopNotResolved (1),
+        nextHopIsLocal     (3),
+        nextHopIsMcast     (4),
+        resTypeMismatch    (5)
+    }
+
+TmnxQosRateHigh32                ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The upper 32 bits of a 64 bit rate value."
+    SYNTAX      TmnxHigh32 (0 | 1 | 4294967295)
+
+TmnxQosRateLow32                 ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The lower 32 bits of a 64 bit rate value."
+    SYNTAX      TmnxLow32 (0..4294967295)
+
+AluNgeKeygroupIdOrZero           ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "A number used to identify an entry in the aluNgeKeygroupTable or zero."
+    SYNTAX      Unsigned32 (0..127)
+
+TmnxEsaNum                       ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The TmnxEsaNum data type contains an identification number for an
+         Extended Service Appliance. The value '0' indicates an invalid
+         reference."
+    SYNTAX      Unsigned32 (0 | 1..16)
+
+TmnxEsaVappNum                   ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The TmnxEsaVappNum type contains an identification number for the
+         Virtual Application on an Extended Service Appliance. The value '0'
+         indicates an invalid reference."
+    SYNTAX      Unsigned32 (0 | 1..4)
+
+TPolRateTypeRefOrLocalLimit      ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The type of the PIR/CIR percent rate. The value 'kbps' means the rate
+         is specified in kbps. The value 'percentLocalLimit' means the rate is
+         specified in percentage of local limit. The value
+         'percentReferPortLimit' means the rate is specified in percentage of
+         reference port limit."
+    SYNTAX      INTEGER {
+        kbps              (1),
+        percentLocalLimit (2),
+        reserved3         (3)
+    }
+
+TPolicerRateTypeWithRefLimit     ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The type of the PIR/CIR percent rate. The value 'kbps' means the rate
+         is specified in kbps. The value 'percentPortLimit' means the rate is
+         specified in percentage of port limit. The value 'percentLocalLimit'
+         means the rate is specified in percentage of local limit. The value
+         'percentReferPortLimit' means the rate is specified in percentage of
+         reference port limit."
+    SYNTAX      INTEGER {
+        kbps              (1),
+        percentPortLimit  (2),
+        percentLocalLimit (3),
+        reserved4         (4)
+    }
+
+TWredSlopeProfile                ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "The profile marking of a packet. Value of 'in' specifies in-profile
+         marking. Value of 'out' specifies out-profile marking. Value of 'none'
+         specifies the profile marking of the packet will be inherited from the
+         existing enqueuing priority derived from earlier matches in the
+         classification hierarchy."
+    SYNTAX      INTEGER {
+        in        (1),
+        out       (2),
+        reserved4 (4),
+        reserved5 (5)
+    }
+
+TDEWredSlopeProfile              ::= TEXTUAL-CONVENTION
+    STATUS      current
+    DESCRIPTION
+        "This textual convention specifies the profile marking of a packet.
+
+         Value of 'in' specifies the in-profile marking.
+
+         Value of 'out' specifies the out-profile marking.
+
+         Value of 'de' specifies that the profile marking will be based on the DE
+         (Drop-Eligible) bit.  DE bit-value of '0' specifies in-profile and DE
+         bit value of '1' specifies out-profile marking."
+    SYNTAX      INTEGER {
+        in        (1),
+        out       (2),
+        de        (3),
+        reserved4 (4),
+        reserved5 (5)
+    }
+
 END

misc/db_schema.yaml

@@ -939,6 +939,8 @@ mpls_lsp_paths:
     - { Field: mplsLspPathTimeUp, Type: bigint(20), 'Null': true, Extra: '' }
     - { Field: mplsLspPathTimeDown, Type: bigint(20), 'Null': true, Extra: '' }
     - { Field: mplsLspPathTransitionCount, Type: 'int(10) unsigned', 'Null': true, Extra: '' }
+    - { Field: mplsLspPathTunnelARHopListIndex, Type: 'int(10) unsigned', 'Null': true, Extra: '' }
+    - { Field: mplsLspPathTunnelCHopListIndex, Type: 'int(10) unsigned', 'Null': true, Extra: '' }
   Indexes:
     PRIMARY: { Name: PRIMARY, Columns: [lsp_path_id], Unique: true, Type: BTREE }
     device_id: { Name: device_id, Columns: [device_id], Unique: false, Type: BTREE }
@@ -1028,6 +1030,42 @@ mpls_services:
   Indexes:
     PRIMARY: { Name: PRIMARY, Columns: [svc_id], Unique: true, Type: BTREE }
     device_id: { Name: device_id, Columns: [device_id], Unique: false, Type: BTREE }
+mpls_tunnel_ar_hops:
+  Columns:
+    - { Field: ar_hop_id, Type: 'int(10) unsigned', 'Null': false, Extra: auto_increment }
+    - { Field: mplsTunnelARHopListIndex, Type: 'int(10) unsigned', 'Null': false, Extra: '' }
+    - { Field: mplsTunnelARHopIndex, Type: 'int(10) unsigned', 'Null': false, Extra: '' }
+    - { Field: device_id, Type: 'int(10) unsigned', 'Null': false, Extra: '' }
+    - { Field: lsp_path_id, Type: 'int(10) unsigned', 'Null': false, Extra: '' }
+    - { Field: mplsTunnelARHopAddrType, Type: 'enum(''unknown'',''ipV4'',''ipV6'',''asNumber'',''lspid'',''unnum'')', 'Null': true, Extra: '' }
+    - { Field: mplsTunnelARHopIpv4Addr, Type: varchar(15), 'Null': true, Extra: '' }
+    - { Field: mplsTunnelARHopIpv6Addr, Type: varchar(45), 'Null': true, Extra: '' }
+    - { Field: mplsTunnelARHopAsNumber, Type: 'int(10) unsigned', 'Null': true, Extra: '' }
+    - { Field: mplsTunnelARHopStrictOrLoose, Type: 'enum(''strict'',''loose'')', 'Null': true, Extra: '' }
+    - { Field: mplsTunnelARHopRouterId, Type: varchar(15), 'Null': true, Extra: '' }
+    - { Field: localProtected, Type: 'enum(''false'',''true'')', 'Null': false, Extra: '', Default: 'false' }
+    - { Field: linkProtectionInUse, Type: 'enum(''false'',''true'')', 'Null': false, Extra: '', Default: 'false' }
+    - { Field: bandwidthProtected, Type: 'enum(''false'',''true'')', 'Null': false, Extra: '', Default: 'false' }
+    - { Field: nextNodeProtected, Type: 'enum(''false'',''true'')', 'Null': false, Extra: '', Default: 'false' }
+  Indexes:
+    PRIMARY: { Name: PRIMARY, Columns: [ar_hop_id], Unique: true, Type: BTREE }
+    device_id: { Name: device_id, Columns: [device_id], Unique: false, Type: BTREE }
+mpls_tunnel_c_hops:
+  Columns:
+    - { Field: c_hop_id, Type: 'int(10) unsigned', 'Null': false, Extra: auto_increment }
+    - { Field: mplsTunnelCHopListIndex, Type: 'int(10) unsigned', 'Null': false, Extra: '' }
+    - { Field: mplsTunnelCHopIndex, Type: 'int(10) unsigned', 'Null': false, Extra: '' }
+    - { Field: device_id, Type: 'int(10) unsigned', 'Null': false, Extra: '' }
+    - { Field: lsp_path_id, Type: 'int(10) unsigned', 'Null': true, Extra: '' }
+    - { Field: mplsTunnelCHopAddrType, Type: 'enum(''unknown'',''ipV4'',''ipV6'',''asNumber'',''lspid'',''unnum'')', 'Null': true, Extra: '' }
+    - { Field: mplsTunnelCHopIpv4Addr, Type: varchar(15), 'Null': true, Extra: '' }
+    - { Field: mplsTunnelCHopIpv6Addr, Type: varchar(45), 'Null': true, Extra: '' }
+    - { Field: mplsTunnelCHopAsNumber, Type: 'int(10) unsigned', 'Null': true, Extra: '' }
+    - { Field: mplsTunnelCHopStrictOrLoose, Type: 'enum(''strict'',''loose'')', 'Null': true, Extra: '' }
+    - { Field: mplsTunnelCHopRouterId, Type: varchar(15), 'Null': true, Extra: '' }
+  Indexes:
+    PRIMARY: { Name: PRIMARY, Columns: [c_hop_id], Unique: true, Type: BTREE }
+    device_id: { Name: device_id, Columns: [device_id], Unique: false, Type: BTREE }
 munin_plugins:
   Columns:
     - { Field: mplug_id, Type: 'int(10) unsigned', 'Null': false, Extra: auto_increment }

tests/data/timos.json

@@ -10631,6 +10631,8 @@
                     "mplsLspPathTimeUp": null,
                     "mplsLspPathTimeDown": null,
                     "mplsLspPathTransitionCount": null,
+                    "mplsLspPathTunnelARHopListIndex": 0,
+                    "mplsLspPathTunnelCHopListIndex": 0,
                     "vrf_oid": 1,
                     "lsp_oid": 1
                 },
@@ -10651,6 +10653,8 @@
                     "mplsLspPathTimeUp": null,
                     "mplsLspPathTimeDown": null,
                     "mplsLspPathTransitionCount": null,
+                    "mplsLspPathTunnelARHopListIndex": 2,
+                    "mplsLspPathTunnelCHopListIndex": 2,
                     "vrf_oid": 1,
                     "lsp_oid": 2
                 },
@@ -10671,6 +10675,8 @@
                     "mplsLspPathTimeUp": null,
                     "mplsLspPathTimeDown": null,
                     "mplsLspPathTransitionCount": null,
+                    "mplsLspPathTunnelARHopListIndex": 3,
+                    "mplsLspPathTunnelCHopListIndex": 7,
                     "vrf_oid": 1,
                     "lsp_oid": 3
                 },
@@ -10691,6 +10697,8 @@
                     "mplsLspPathTimeUp": null,
                     "mplsLspPathTimeDown": null,
                     "mplsLspPathTransitionCount": null,
+                    "mplsLspPathTunnelARHopListIndex": 1,
+                    "mplsLspPathTunnelCHopListIndex": 8,
                     "vrf_oid": 1,
                     "lsp_oid": 5
                 },
@@ -10711,6 +10719,8 @@
                     "mplsLspPathTimeUp": null,
                     "mplsLspPathTimeDown": null,
                     "mplsLspPathTransitionCount": null,
+                    "mplsLspPathTunnelARHopListIndex": 4,
+                    "mplsLspPathTunnelCHopListIndex": 5,
                     "vrf_oid": 1,
                     "lsp_oid": 6
                 },
@@ -10731,6 +10741,8 @@
                     "mplsLspPathTimeUp": null,
                     "mplsLspPathTimeDown": null,
                     "mplsLspPathTransitionCount": null,
+                    "mplsLspPathTunnelARHopListIndex": 5,
+                    "mplsLspPathTunnelCHopListIndex": 9,
                     "vrf_oid": 1,
                     "lsp_oid": 7
                 }
@@ -11353,6 +11365,8 @@
                     "mplsLspPathTimeUp": 0,
                     "mplsLspPathTimeDown": 1234414735,
                     "mplsLspPathTransitionCount": 8,
+                    "mplsLspPathTunnelARHopListIndex": 0,
+                    "mplsLspPathTunnelCHopListIndex": 0,
                     "vrf_oid": 1,
                     "lsp_oid": 1
                 },
@@ -11373,6 +11387,8 @@
                     "mplsLspPathTimeUp": 2126215009,
                     "mplsLspPathTimeDown": 0,
                     "mplsLspPathTransitionCount": 1,
+                    "mplsLspPathTunnelARHopListIndex": 2,
+                    "mplsLspPathTunnelCHopListIndex": 2,
                     "vrf_oid": 1,
                     "lsp_oid": 2
                 },
@@ -11393,6 +11409,8 @@
                     "mplsLspPathTimeUp": 968111987,
                     "mplsLspPathTimeDown": 0,
                     "mplsLspPathTransitionCount": 13,
+                    "mplsLspPathTunnelARHopListIndex": 3,
+                    "mplsLspPathTunnelCHopListIndex": 7,
                     "vrf_oid": 1,
                     "lsp_oid": 3
                 },
@@ -11413,6 +11431,8 @@
                     "mplsLspPathTimeUp": 487669387,
                     "mplsLspPathTimeDown": 0,
                     "mplsLspPathTransitionCount": 19,
+                    "mplsLspPathTunnelARHopListIndex": 1,
+                    "mplsLspPathTunnelCHopListIndex": 8,
                     "vrf_oid": 1,
                     "lsp_oid": 5
                 },
@@ -11433,6 +11453,8 @@
                     "mplsLspPathTimeUp": 1234595321,
                     "mplsLspPathTimeDown": 0,
                     "mplsLspPathTransitionCount": 1,
+                    "mplsLspPathTunnelARHopListIndex": 4,
+                    "mplsLspPathTunnelCHopListIndex": 5,
                     "vrf_oid": 1,
                     "lsp_oid": 6
                 },
@@ -11453,6 +11475,8 @@
                     "mplsLspPathTimeUp": 362844288,
                     "mplsLspPathTimeDown": 0,
                     "mplsLspPathTransitionCount": 1,
+                    "mplsLspPathTunnelARHopListIndex": 5,
+                    "mplsLspPathTunnelCHopListIndex": 9,
                     "vrf_oid": 1,
                     "lsp_oid": 7
                 }