Send Netdot-devel mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
https://osl.uoregon.edu/mailman/listinfo/netdot-devel
or, via email, send a message with subject or body 'help' to
[email protected]
You can reach the person managing the list at
[email protected]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Netdot-devel digest..."
Today's Topics:
1. [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.2-9-gfc31c83 ([email protected])
2. [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.2-10-g8483f87 ([email protected])
3. [Netdot - Bug #1707] (Resolved) Report - IP - Unused Static
Addresses doesn't work (references is_multicast)
([email protected])
4. [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.2-11-g9988943 ([email protected])
5. [Netdot - Bug #1708] (Resolved) copy 'include' field also
when using a template ([email protected])
6. [Netdot - Bug #1706] (Closed) Upgrade 0.9.10 to 1.0.2
([email protected])
7. [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.2-12-g704f319 ([email protected])
8. [Netdot - Feature #1702] (Resolved) add fwsm cli support for
fetching arp cache ([email protected])
9. [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.2-13-gd059b3d ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 26 Nov 2012 09:59:23 -0800
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.2-9-gfc31c83
To: [email protected]
Message-ID: <[email protected]>
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Netdot".
The branch, netdot-1.0 has been updated
via fc31c83118a916ca898011e53359ebc893f90755 (commit)
from 5e39ef219ac2f11261456c07a778112a28d4ddfb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fc31c83118a916ca898011e53359ebc893f90755
Author: Carlos Vicente <[email protected]>
Date: Mon Nov 26 12:59:16 2012 -0500
Allow user to mark DHCP scope active/inactive while enabling DHCP on a
subnet
diff --git a/htdocs/management/ip.html b/htdocs/management/ip.html
index 5e2b8b4..e2908eb 100644
--- a/htdocs/management/ip.html
+++ b/htdocs/management/ip.html
@@ -431,7 +431,11 @@ if( $_action eq "SHOW_ROOTS" && !$id && $rootversion ){
}
my $container = delete $ARGS{dhcp_global_scope};
my %args = (container=>$container);
-
+
+ # Active flag
+ my $active = delete $ARGS{dhcp_active};
+ $args{active} = (defined $active && $active eq 'on')? 1 : 0;
+
# Grab all the dhcp options & declarations
foreach my $arg ( %ARGS ){
if ( $arg =~ /^dhcp_/ ){
@@ -1176,7 +1180,8 @@ if ( $edit ){
$x .= '<option value="'. $ent->id .'">'. $ent->name .'</option>';
}
$x .= '</select>';
- $x .= '<a class="hand"
onClick="openinsertwindow(\'table=DhcpScope&select_id=dhcp_global_scope&selected=1&dowindow=1\')">[new]</a>';
+ $x .= '<a class="hand"
onClick="openinsertwindow(\'table=DhcpScope&select_id='.
+ 'dhcp_global_scope&selected=1&dowindow=1\')">[new]</a>';
$x;
}});
@@ -1188,6 +1193,10 @@ if ( $edit ){
push @fields, 'Option routers:';
push @data, '<input type="text" name="dhcp_option_routers"
class="txt" value="'.$o->netaddr->first->addr.'">';
}
+ push @fields, 'Active?:';
+ push @data, '<input type="checkbox" name="dhcp_active" checked="checked">
(Uncheck if you do not want this scope'.
+ ' included in the DHCP configuration)';
+
</%perl>
diff --git a/lib/Netdot/Model/DhcpScope.pm b/lib/Netdot/Model/DhcpScope.pm
index 1e134f0..27447a9 100644
--- a/lib/Netdot/Model/DhcpScope.pm
+++ b/lib/Netdot/Model/DhcpScope.pm
@@ -79,7 +79,7 @@ sub insert {
unless ( defined $argv->{type} );
# Make it active unless told otherwise
- $argv->{active} = 1 unless defined $argv->{active};
+ $argv->{active} = 1 unless exists $argv->{active};
my @shared_subnets = @{$argv->{subnets}} if $argv->{subnets};
diff --git a/lib/Netdot/Model/Ipblock.pm b/lib/Netdot/Model/Ipblock.pm
index bffe8bd..087b244 100644
--- a/lib/Netdot/Model/Ipblock.pm
+++ b/lib/Netdot/Model/Ipblock.pm
@@ -2367,6 +2367,7 @@ sub shared_network_subnets{
attributes - Optional. This must be a hashref with:
key = attribute name,
value = attribute value
+ active - Whether it should be exported or not
Returns:
Scope object (subnet or shared-network)
@@ -2385,10 +2386,12 @@ sub enable_dhcp{
$self->throw_user("Trying to enable DHCP on a non-subnet block")
if ( $self->status->name ne 'Subnet' );
- my %args = (container => $argv{container},
- type =>'subnet',
- ipblock => $self);
- $args{attributes} = $argv{attributes};
+ my %args = (container => $argv{container},
+ active => $argv{active},
+ attributes => $argv{attributes},
+ type =>'subnet',
+ ipblock => $self,
+ );
my $scope = DhcpScope->insert(\%args);
if ( my @shared = $self->shared_network_subnets ){
-----------------------------------------------------------------------
Summary of changes:
htdocs/management/ip.html | 13 +++++++++++--
lib/Netdot/Model/DhcpScope.pm | 2 +-
lib/Netdot/Model/Ipblock.pm | 11 +++++++----
3 files changed, 19 insertions(+), 7 deletions(-)
hooks/post-receive
--
Netdot
------------------------------
Message: 2
Date: Mon, 26 Nov 2012 10:21:48 -0800
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.2-10-g8483f87
To: [email protected]
Message-ID: <[email protected]>
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Netdot".
The branch, netdot-1.0 has been updated
via 8483f871d417becb1ec29c98080d25e867858079 (commit)
from fc31c83118a916ca898011e53359ebc893f90755 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8483f871d417becb1ec29c98080d25e867858079
Author: Carlos Vicente <[email protected]>
Date: Mon Nov 26 13:21:34 2012 -0500
Restoring old unmerged commit from 0.9 that included a multicast address
check in Ipblock class
diff --git a/lib/Netdot/Model/Ipblock.pm b/lib/Netdot/Model/Ipblock.pm
index 087b244..07c4cf6 100644
--- a/lib/Netdot/Model/Ipblock.pm
+++ b/lib/Netdot/Model/Ipblock.pm
@@ -403,11 +403,9 @@ sub get_unused_subnets {
my @result;
foreach my $id ( @ids ){
my $ip = Ipblock->retrieve($id);
- if ( defined $args{version} && $args{version} == 4 ){
- # Ignore IPv4 multicast blocks
- if ( $ip->netaddr->within(new NetAddr::IP "224.0.0.0/4") ){
- next;
- }
+ # Ignore multicast blocks
+ if ( $ip->is_multicast ){
+ next;
}
push @result, $ip;
}
@@ -452,37 +450,43 @@ sub get_subnet_addr {
=head2 is_loopback - Check if address is a loopback address
Arguments:
- address - dotted quad ip address. Required.
+ address - dotted quad ip address. Required unless called as object method.
prefix - dotted quad or prefix length. Optional.
NetAddr::IP will assume it is a host (/32 or /128)
Returns:
1 or 0
Example:
+ my $flag = $ipblock->is_loopback;
my $flag = Ipblock->is_loopback('127.0.0.1');
=cut
sub is_loopback{
- my ( $class, $address, $prefix ) = @_;
- $class->isa_class_method('is_loopback');
-
- $class->throw_fatal("Missing required arguments: address")
- unless $address;
-
- my $ip;
- my $str;
- if ( !($ip = $class->netaddr(address=>$address, prefix=>$prefix))){
- $str = ( $address && $prefix ) ? (join '/', $address, $prefix) :
$address;
- $class->throw_user("Invalid IP: $str");
+ my ( $self, $address, $prefix ) = @_;
+ my ($netaddr, $version);
+ if ( ref($self) ){
+ # Called as object method
+ $netaddr = $self->netaddr;
+ $version = $self->version;
+ }else{
+ # Called as class method
+ $self->throw_fatal("Missing required arguments when called as class
method: address")
+ unless ( defined $address );
+ if ( !($netaddr = NetAddr::IP->new($address, $prefix))){
+ my $str = ( $address && $prefix ) ? (join '/', $address, $prefix) :
$address;
+ $self->throw_user("Invalid IP: $str");
+ }
+ $version = $netaddr->version;
}
-
- my $ipv4_lb = $class->netaddr(address=>"127.0.0.0", prefix=>"255.0.0.0");
- my $ipv6_lb = $class->netaddr(address=>"::1");
- if ( $ip->within($ipv4_lb) || $ip == $ipv6_lb ) {
- return 1;
+ if ( $version == 4 &&
+ $netaddr->within(new NetAddr::IP '127.0.0.0', '255.0.0.0') ){
+ return 1;
+ }elsif ( $version == 6 &&
+ $netaddr == NetAddr::IP->new6('::1') ){
+ return 1;
}
- return;
+ return 0;
}
##################################################################
@@ -524,6 +528,47 @@ sub is_link_local{
}
##################################################################
+=head2 is_multicast - Check if address is a multicast address
+
+ Arguments:
+ address - dotted quad ip address. Required unless called as object method
+ prefix - dotted quad or prefix length. Optional. NetAddr::IP will assume
it is a host (/32 or /128)
+
+ Returns:
+ True (1) or False (0)
+ Example:
+ my $flag = $ipblock->is_multicast();
+ my $flag = Ipblock->is_multicast('239.255.0.1');
+
+=cut
+sub is_multicast{
+ my ($self, $address, $prefix) = @_;
+ my ($netaddr, $version);
+ if ( ref($self) ){
+ # Called as object method
+ $netaddr = $self->_netaddr;
+ $version = $self->version;
+ }else{
+ # Called as class method
+ $self->throw_fatal("Missing required arguments when called as class
method: address")
+ unless ( defined $address );
+ if ( !($netaddr = NetAddr::IP->new($address, $prefix))){
+ my $str = ( $address && $prefix ) ? (join '/', $address, $prefix) :
$address;
+ $self->throw_user("Invalid IP: $str");
+ }
+ $version = $netaddr->version;
+ }
+ if ( $version == 4 &&
+ $netaddr->within(new NetAddr::IP "224.0.0.0/4") ){
+ return 1;
+ }elsif ( $version == 6 &&
+ $netaddr->within(new6 NetAddr::IP "FF00::/8") ){
+ return 1;
+ }
+ return 0;
+}
+
+##################################################################
=head2 within - Check if address is within block
diff --git a/t/Ipblock.t b/t/Ipblock.t
index cccc24b..fd47392 100644
--- a/t/Ipblock.t
+++ b/t/Ipblock.t
@@ -76,7 +76,10 @@ is($s, $subnet->address, 'get_subnet_addr');
my $hosts = Ipblock->get_host_addrs( $subnet->address ."/". $subnet->prefix );
is($hosts->[0], '192.0.2.1', 'get_host_addrs');
-ok(Ipblock->is_loopback('127.0.0.1'), 'is_loopback');
+ok(Ipblock->is_loopback('127.0.0.1'), 'is_loopback_v4');
+ok(Ipblock->is_loopback('::1'), 'is_loopback_v6');
+ok(Ipblock->is_multicast('239.255.0.1'), 'is_multicast_v4');
+ok(Ipblock->is_multicast('FF02::1'), 'is_multicast_v6');
ok(Ipblock->is_link_local('fe80:abcd::1234'), 'is_link_local');
is(Ipblock->get_covering_block(address=>'192.0.2.5', prefix=>'32'), $subnet,
-----------------------------------------------------------------------
Summary of changes:
lib/Netdot/Model/Ipblock.pm | 91 ++++++++++++++++++++++++++++++++-----------
t/Ipblock.t | 5 ++-
2 files changed, 72 insertions(+), 24 deletions(-)
hooks/post-receive
--
Netdot
------------------------------
Message: 3
Date: Mon, 26 Nov 2012 10:24:49 -0800
From: [email protected]
Subject: [Netdot-devel] [Netdot - Bug #1707] (Resolved) Report - IP -
Unused Static Addresses doesn't work (references is_multicast)
To: [email protected], [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
Issue #1707 has been updated by Carlos Vicente.
Category set to IPManagement
Status changed from New to Resolved
Assignee set to Carlos Vicente
Target version set to 1.0.3
It appears that the commit from the 0.9 branch was never merged into 1.0. I
have restored the method in the Ipblock class.
Thank you!
----------------------------------------
Bug #1707: Report - IP - Unused Static Addresses doesn't work (references
is_multicast)
https://osl.uoregon.edu/redmine/issues/1707#change-3012
Author: Wim Vandersmissen
Status: Resolved
Priority: Normal
Assignee: Carlos Vicente
Category: IPManagement
Target version: 1.0.3
Resolution:
When running Report - IP - Unused Static Addresses an error pops up.
@error: Can't locate object method "is_multicast" via package "Ipblock"
at /usr/local/netdot/htdocs/reports/unused_statics.html line 35.
context:
...
31: my @unused;
32: foreach my $ip ( @ips ){
33: next if ( int($ip->interface) != 0 );
34: next if ( $ip->snmp_devices );
35: next if ( $ip->is_multicast );
36: push @unused, $ip;
37: }
38:
39: </%init>
...
code stack: /usr/local/netdot/htdocs/reports/unused_statics.html:35
/usr/local/netdot/htdocs/reports/ip_reports.html:75
/usr/local/netdot/htdocs/reports/autohandler:132
/usr/lib/perl5/vendor_perl/5.8.8/HTML/Mason/Request.pm:930
/usr/local/netdot/htdocs/masondata/obj/1249693838/reports/autohandler.obj:21
/usr/local/netdot/htdocs/autohandler:76
@
Fixed by commenting #next if ( $ip->is_multicast ); in
/usr/local/netdot/htdocs/reports/unused_statics.html
Seems to be added here:
http://osl.uoregon.edu/pipermail/netdot-devel/2009-December/004505.html but
removed later ?
Wim
--
You have received this notification because you have either subscribed to it,
or are involved in it.
To change your notification preferences, please click here:
http://osl.uoregon.edu/redmine/my/account
------------------------------
Message: 4
Date: Mon, 26 Nov 2012 10:29:38 -0800
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.2-11-g9988943
To: [email protected]
Message-ID: <[email protected]>
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Netdot".
The branch, netdot-1.0 has been updated
via 9988943cd44a7f94f270172cd182f8fe37ada26f (commit)
from 8483f871d417becb1ec29c98080d25e867858079 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9988943cd44a7f94f270172cd182f8fe37ada26f
Author: Carlos Vicente <[email protected]>
Date: Mon Nov 26 13:29:27 2012 -0500
Fix for #1708 (copy 'include' field also when using a template)
diff --git a/lib/Netdot/Model/Zone.pm b/lib/Netdot/Model/Zone.pm
index 2c25069..4911184 100644
--- a/lib/Netdot/Model/Zone.pm
+++ b/lib/Netdot/Model/Zone.pm
@@ -175,7 +175,7 @@ sub insert {
);
# Copy values from template zone
- foreach my $field ( qw(mname rname refresh retry expire minimum
default_ttl) ){
+ foreach my $field ( qw(mname rname refresh retry expire minimum
default_ttl include) ){
$state{$field} = $tzone->$field;
}
$newzone = $class->SUPER::insert( \%state );
-----------------------------------------------------------------------
Summary of changes:
lib/Netdot/Model/Zone.pm | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
Netdot
------------------------------
Message: 5
Date: Mon, 26 Nov 2012 10:30:15 -0800
From: [email protected]
Subject: [Netdot-devel] [Netdot - Bug #1708] (Resolved) copy 'include'
field also when using a template
To: [email protected], [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
Issue #1708 has been updated by Carlos Vicente.
Tracker changed from Support to Bug
Status changed from New to Resolved
Assignee set to Carlos Vicente
Target version set to 1.0.3
Resolution set to fixed
Fixed. Thank you!
----------------------------------------
Bug #1708: copy 'include' field also when using a template
https://osl.uoregon.edu/redmine/issues/1708#change-3013
Author: Wim Vandersmissen
Status: Resolved
Priority: Normal
Assignee: Carlos Vicente
Category: ContribCode
Target version: 1.0.3
Resolution: fixed
When creating a DNS zone from a template, it would be logical that the
'include' field is also copied.
Simple patch in attach.
--
You have received this notification because you have either subscribed to it,
or are involved in it.
To change your notification preferences, please click here:
http://osl.uoregon.edu/redmine/my/account
------------------------------
Message: 6
Date: Mon, 26 Nov 2012 10:30:59 -0800
From: [email protected]
Subject: [Netdot-devel] [Netdot - Bug #1706] (Closed) Upgrade 0.9.10
to 1.0.2
To: [email protected], [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
Issue #1706 has been updated by Carlos Vicente.
Status changed from New to Closed
Assignee set to Carlos Vicente
Resolution set to invalid
----------------------------------------
Bug #1706: Upgrade 0.9.10 to 1.0.2
https://osl.uoregon.edu/redmine/issues/1706#change-3014
Author: Alen F
Status: Closed
Priority: Normal
Assignee: Carlos Vicente
Category:
Target version:
Resolution: invalid
hello,
i cannot upgrade my database to 1.0.2. Following error occured.
cd upgrade; make all DIR=upgrade
make[1]: Entering directory `/home/netdot/netdot-1.0.2/upgrade'
Upgrading schema and data...
/usr/bin/perl updatedb 2>error.log
DEBUG: init: dbi:mysql:dbname=netdot;host=localhost;mysql_local_infile=1
make[1]: *** [db] Error 255
make[1]: Leaving directory `/home/netdot/netdot-1.0.2/upgrade'
make: *** [upgrade] Error 2
--
You have received this notification because you have either subscribed to it,
or are involved in it.
To change your notification preferences, please click here:
http://osl.uoregon.edu/redmine/my/account
------------------------------
Message: 7
Date: Mon, 26 Nov 2012 10:39:33 -0800
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.2-12-g704f319
To: [email protected]
Message-ID: <[email protected]>
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Netdot".
The branch, netdot-1.0 has been updated
via 704f31958bc248a82eef7a4d5918ada06a17b5fe (commit)
from 9988943cd44a7f94f270172cd182f8fe37ada26f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 704f31958bc248a82eef7a4d5918ada06a17b5fe
Author: Carlos Vicente <[email protected]>
Date: Mon Nov 26 13:39:20 2012 -0500
Fix for #1702: (add fwsm cli support for fetching arp cache)
diff --git a/etc/Default.conf b/etc/Default.conf
index cd72928..9093e54 100644
--- a/etc/Default.conf
+++ b/etc/Default.conf
@@ -461,6 +461,7 @@ POLL_STATS_FILE_PATH => 'var/pollstats.rrd',
FETCH_DEVICE_INFO_VIA_CLI => {
'^ciscoASA' => 'CiscoFW',
'^ciscoPIXFirewall' => 'CiscoFW',
+ '^ciscoWsSvcFwm1sc' => 'CiscoFW',
'^cat65\d{2}' => 'CiscoIOS',
'^cisco76\d{2}' => 'CiscoIOS',
'^catalyst2960' => 'CiscoCat',
diff --git a/lib/Netdot/Model/Device/CLI/CiscoFW.pm
b/lib/Netdot/Model/Device/CLI/CiscoFW.pm
index d67e724..0cf9b9e 100644
--- a/lib/Netdot/Model/Device/CLI/CiscoFW.pm
+++ b/lib/Netdot/Model/Device/CLI/CiscoFW.pm
@@ -217,6 +217,8 @@ sub _reduce_iname{
return unless $name;
if ( $name =~ /Appliance \'(\S+)\' interface/ ){
return $1;
+ }elsif ( $name =~ /Firewall Services Module \'(\S+)\' interface/ ){
+ return $1;
}
return $name;
}
-----------------------------------------------------------------------
Summary of changes:
etc/Default.conf | 1 +
lib/Netdot/Model/Device/CLI/CiscoFW.pm | 2 ++
2 files changed, 3 insertions(+), 0 deletions(-)
hooks/post-receive
--
Netdot
------------------------------
Message: 8
Date: Mon, 26 Nov 2012 10:40:19 -0800
From: [email protected]
Subject: [Netdot-devel] [Netdot - Feature #1702] (Resolved) add fwsm
cli support for fetching arp cache
To: [email protected], [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
Issue #1702 has been updated by Carlos Vicente.
Category set to DeviceManagement
Status changed from New to Resolved
Assignee set to Carlos Vicente
Resolution set to fixed
Added. Thank you!
----------------------------------------
Feature #1702: add fwsm cli support for fetching arp cache
https://osl.uoregon.edu/redmine/issues/1702#change-3015
Author: Nicolas Leseignoux
Status: Resolved
Priority: Normal
Assignee: Carlos Vicente
Category: DeviceManagement
Target version: 1.0.3
Resolution: fixed
Hello,
Would it be possible to add CLI support for fetching arp cache from Cisco FWSM ?
I'm not really good at making patches but there is only few changes to add this
support:
In /usr/local/netdot/etc/Default.conf and Site.conf:
462d461
< '^ciscoWsSvcFwm1sc' => 'CiscoFW',
and in /usr/local/netdot/lib/Netdot/Model/Device/CLI/CiscoFW.pm:
222,224d221
< if ( $name =~ /Firewall Services Module \'(\S+)\' interface/ ){
< return $1;
< }
Thanks for developing netdot :)
--
You have received this notification because you have either subscribed to it,
or are involved in it.
To change your notification preferences, please click here:
http://osl.uoregon.edu/redmine/my/account
------------------------------
Message: 9
Date: Mon, 26 Nov 2012 11:02:08 -0800
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.2-13-gd059b3d
To: [email protected]
Message-ID: <[email protected]>
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Netdot".
The branch, netdot-1.0 has been updated
via d059b3db2894f1a2df71f544834c757593077078 (commit)
from 704f31958bc248a82eef7a4d5918ada06a17b5fe (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d059b3db2894f1a2df71f544834c757593077078
Author: Carlos Vicente <[email protected]>
Date: Mon Nov 26 14:02:01 2012 -0500
Fix for #1697 (Rancid -> 2.3.6 IOS XE flash differs)
diff --git a/lib/Netdot/Exporter/Rancid.pm b/lib/Netdot/Exporter/Rancid.pm
index 32a5e46..fccd01e 100644
--- a/lib/Netdot/Exporter/Rancid.pm
+++ b/lib/Netdot/Exporter/Rancid.pm
@@ -187,9 +187,7 @@ sub _convert_mfg {
}
# More granularity for some vendors
if ( defined($mfg) && $mfg eq 'cisco' ){
- if ( $sysdescr =~ /IOS-XE/o ){
- $mfg = 'cisco-xr';
- }elsif ( $sysdescr =~ /NX-OS/o ){
+ if ( $sysdescr =~ /NX-OS/o ){
$mfg = 'cisco-nx';
}
}
-----------------------------------------------------------------------
Summary of changes:
lib/Netdot/Exporter/Rancid.pm | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
hooks/post-receive
--
Netdot
------------------------------
_______________________________________________
Netdot-devel mailing list
[email protected]
https://osl.uoregon.edu/mailman/listinfo/netdot-devel
End of Netdot-devel Digest, Vol 68, Issue 6
*******************************************
