[Netdot-devel] [SCM] Netdot branch netdot-1.0 updated. netdot-1.0.7-46-g4df92ca

[n***@osl.uoregon.edu]

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 4df92ca544ad58d36e661359df4a4653e4e6620e (commit)
via a9b06c840a94c91863b2cbd0ad1f248005160713 (commit)
via c4f719f0262dec61aae10baf0d67fcf701aa9248 (commit)
via a0f8ca6a6ca8a77b0ad44fa98f8e4114e8ac1bfc (commit)
via 1de07a738f321031248b3cbfffa8ebfbec8d3d1e (commit)
via 9f9b5320f63dca056e45f4282a44ad2716d4a797 (commit)
via 0fb980b0d8a7a71b75637a7b1744884c9fdae6ee (commit)
from 4dc2e5d02145ac787139a537087b430a6c6f2490 (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 4df92ca544ad58d36e661359df4a4653e4e6620e
Merge: c4f719f a9b06c8
Author: Carlos Vicente <***@gmail.com>
Date: Mon Jul 25 12:12:20 2016 -0400

Merge pull request #51 from nickhilliard/master

update BGP sessions even if the contact list is undefined


commit a9b06c840a94c91863b2cbd0ad1f248005160713
Author: Nick Hilliard <***@foobar.org>
Date: Sun Jul 24 21:48:48 2016 +0100

update BGP sessions even if the contact list is undefined

diff --git a/lib/Netdot/Model/Device.pm b/lib/Netdot/Model/Device.pm
index 631d6d7..32e0549 100644
--- a/lib/Netdot/Model/Device.pm
+++ b/lib/Netdot/Model/Device.pm
@@ -2743,7 +2743,9 @@ sub update_bgp_peering {
$pstate{last_changed} = $self->timestamp;

# Assign the first available contactlist from the device list
- $pstate{contactlist} = $self->contacts->first->contactlist;
+ if (defined ($self->contacts->first)) {
+ $pstate{contactlist} = $self->contacts->first->contactlist;
+ }

$p = BGPPeering->insert(\%pstate);
my $peer_label;

commit c4f719f0262dec61aae10baf0d67fcf701aa9248
Merge: 4dc2e5d a0f8ca6
Author: Carlos Vicente <***@gmail.com>
Date: Fri Jul 22 09:25:08 2016 -0400

Merge pull request #50 from reth-/master

Postgresql database dump support


commit a0f8ca6a6ca8a77b0ad44fa98f8e4114e8ac1bfc
Author: Robin Johansson <***@proceranetworks.com>
Date: Fri Jul 22 14:21:15 2016 +0200

merge correction

diff --git a/bin/dump-db.pl b/bin/dump-db.pl
index 5c29961..78e7515 100755
--- a/bin/dump-db.pl
+++ b/bin/dump-db.pl
@@ -58,7 +58,6 @@ my $file = $self{dir}."/$hostname-$date.sql";

## Dump the database
if ($self{dbtype} eq 'mysql'){
- system ("mysqldump --opt -u$self{dbuser} -p$self{dbpass} netdot >$file");
my @args = ('--opt', "-u$self{dbuser}", "-p$self{dbpass}");
push @args, '--master-data' if $self{master_data};
my $dump_args = join ' ', @args;

commit 1de07a738f321031248b3cbfffa8ebfbec8d3d1e
Merge: 9f9b532 4dc2e5d
Author: Robin Johansson <***@proceranetworks.com>
Date: Fri Jul 22 14:17:53 2016 +0200

Merge remote-tracking branch 'upstream/master'

diff --cc bin/dump-db.pl
index 231d8aa,e60261d..5c29961
--- a/bin/dump-db.pl
+++ b/bin/dump-db.pl
@@@ -56,9 -56,12 +58,13 @@@ my $file = $self{dir}."/$hostname-$date

## Dump the database
if ($self{dbtype} eq 'mysql'){
+ system ("mysqldump --opt -u$self{dbuser} -p$self{dbpass} netdot >$file");
+ my @args = ('--opt', "-u$self{dbuser}", "-p$self{dbpass}");
+ push @args, '--master-data' if $self{master_data};
+ my $dump_args = join ' ', @args;
+ system ("mysqldump $dump_args netdot >$file");
-}elsif ($self{dbtype} eq 'pg'){
- die "$self{dbtype} not yet implemented";
+}elsif ($self{dbtype} eq 'Pg'){
+ system ("export PGPASSWORD=\"$self{dbpass}\"; pg_dump -h $self{dbhost} -U $self{dbuser} -w $self{dbdatabase} >$file");
}else{
die "$self{dbtype} not yet implemented";
}

commit 9f9b5320f63dca056e45f4282a44ad2716d4a797
Author: Robin Johansson <***@proceranetworks.com>
Date: Sun Sep 13 00:56:50 2015 +0200

Correction of typo in usage info

diff --git a/bin/dump-db.pl b/bin/dump-db.pl
index 1788151..231d8aa 100755
--- a/bin/dump-db.pl
+++ b/bin/dump-db.pl
@@ -22,7 +22,7 @@ $self{dir} = '.';
my $USAGE = <<EOF;
usage: $0 [options]

- --dbtype <type> Database Type [mysql|pg] (default: $self{dbtype})
+ --dbtype <type> Database Type [mysql|Pg] (default: $self{dbtype})
--dbuser <username> Database DBA user (default: $self{dbuser})
--dbpass <password> Database DBA password
--dir <path> Directory where files should be written (default: $self{dir})

commit 0fb980b0d8a7a71b75637a7b1744884c9fdae6ee
Author: Robin Johansson <***@proceranetworks.com>
Date: Sun Sep 13 00:25:47 2015 +0200

Added dump support for postgresql

diff --git a/bin/dump-db.pl b/bin/dump-db.pl
index e34ce8b..1788151 100755
--- a/bin/dump-db.pl
+++ b/bin/dump-db.pl
@@ -14,6 +14,8 @@ my %self;

$self{dbtype} = Netdot->config->get('DB_TYPE');
$self{dbuser} = Netdot->config->get('DB_DBA');
+$self{dbhost} = Netdot->config->get('DB_HOST');
+$self{dbdatabase} = Netdot->config->get('DB_DATABASE');
$self{dbpass} = Netdot->config->get('DB_DBA_PASSWORD');
$self{dir} = '.';

@@ -55,8 +57,8 @@ my $file = $self{dir}."/$hostname-$date.sql";
## Dump the database
if ($self{dbtype} eq 'mysql'){
system ("mysqldump --opt -u$self{dbuser} -p$self{dbpass} netdot >$file");
-}elsif ($self{dbtype} eq 'pg'){
- die "$self{dbtype} not yet implemented";
+}elsif ($self{dbtype} eq 'Pg'){
+ system ("export PGPASSWORD=\"$self{dbpass}\"; pg_dump -h $self{dbhost} -U $self{dbuser} -w $self{dbdatabase} >$file");
}else{
die "$self{dbtype} not yet implemented";
}

-----------------------------------------------------------------------

Summary of changes:
bin/dump-db.pl | 8 +++++---
lib/Netdot/Model/Device.pm | 4 +++-
2 files changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive