From ab111a8e938459a561dd9f7ee2684adc30a446cc Mon Sep 17 00:00:00 2001
From: Eric Miller <>
Date: Wed, 17 Nov 2010 23:18:39 +0000
Subject: [PATCH] Modify detection for newer code levels

---
 Info.pm                  | 2 +-
 Info/Layer3/Contivity.pm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Info.pm b/Info.pm
index b12eb521..a85627ad 100644
--- a/Info.pm
+++ b/Info.pm
@@ -1294,7 +1294,7 @@ sub device_type {
             if $desc =~ /Alteon\s[1A][8D]/;
 
         # Nortel Contivity
-        $objtype = 'SNMP::Info::Layer3::Contivity' if $desc =~ /\bCES\b/;
+        $objtype = 'SNMP::Info::Layer3::Contivity' if $desc =~ /(\bCES\b|\bNVR\sV\d)/;
 
         # Allied Telesyn Layer2 managed switches. They report they have L3 support
         $objtype = 'SNMP::Info::Layer2::Allied'
diff --git a/Info/Layer3/Contivity.pm b/Info/Layer3/Contivity.pm
index cd041618..deca15c5 100644
--- a/Info/Layer3/Contivity.pm
+++ b/Info/Layer3/Contivity.pm
@@ -1,7 +1,7 @@
 # SNMP::Info::Layer3::Contivity
 # $Id$
 #
-# Copyright (c) 2008 Eric Miller
+# Copyright (c) 2010 Eric Miller
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -77,7 +77,7 @@ sub model {
 
     my $model = $e_model->{1} || undef;
 
-    return $1 if ( defined $model and $model =~ /(CES\d+)/i );
+    return $1 if ( defined $model and $model =~ /(CES\d+|NVR\d+)/i );
     return;
 }