Merge pull request #497 from jonstout/master

 bumping verion number 1.2.5

app/Makefile

@@ -1,5 +1,5 @@
 NAME= oess-core
-VERSION = 1.2.4
+VERSION = 1.2.5
 
 rpm:	dist
 	rpmbuild -ta dist/$(NAME)-$(VERSION).tar.gz

app/oess-core.spec

@@ -1,5 +1,5 @@
 Name:		oess-core		
-Version:	1.2.4
+Version:	1.2.5
 Release:	1%{?dist}
 Summary:	The core OESS service providers
 

frontend/Makefile

@@ -1,5 +1,5 @@
 NAME= oess-frontend
-VERSION = 1.2.4
+VERSION = 1.2.5
 
 rpm:	dist
 	rpmbuild -ta dist/$(NAME)-$(VERSION).tar.gz

frontend/oess-frontend.spec

@@ -1,5 +1,5 @@
 Name:		oess-frontend
-Version:	1.2.4
+Version:	1.2.5
 Release:	1%{?dist}
 Summary:	The OESS webservices and user interface
 

oess.spec

@@ -1,14 +1,14 @@
 Summary: OESS Metapackage 
 Name: oess
-Version: 1.2.4
+Version: 1.2.5
 Release: 1%{?dist}
 License: Apache
 Group: GRNOC
 #Source: 
 URL: http://globalnoc.iu.edu
 Buildroot: %{_tmppath}/%{name}-root
-Requires: oess-core >= 1.2.4
-Requires: oess-frontend >= 1.2.4
+Requires: oess-core >= 1.2.5
+Requires: oess-frontend >= 1.2.5
 
 %description
 Package that installs all of the OESS packages

perl-lib/OESS/lib/OESS/Database.pm

@@ -31,11 +31,11 @@ OESS::Database - Database Interaction Module
 
 =head1 VERSION
 
-Version 1.2.4
+Version 1.2.5
 
 =cut
 
-our $VERSION = '1.2.4';
+our $VERSION = '1.2.5';
 
 =head1 SYNOPSIS
 
@@ -83,7 +83,7 @@ use Data::Dumper;
 
 use Socket qw( inet_aton inet_ntoa);
 
-use constant VERSION => '1.2.4';
+use constant VERSION => '1.2.5';
 use constant MAX_VLAN_TAG => 4096;
 use constant MIN_VLAN_TAG => 1;
 use constant OESS_PW_FILE => "/etc/oess/.passwd.xml";

perl-lib/OESS/perl-OESS.spec

@@ -1,6 +1,6 @@
 Summary: OESS Perl Libraries
 Name: perl-OESS
-Version: 1.2.4
+Version: 1.2.5
 Release: 1%{?dist}
 License: APL 2.0
 Group: Network

perl-lib/OESS/share/nddi.sql

@@ -632,7 +632,7 @@ CREATE TABLE `oess_version` (
 
 LOCK TABLES `oess_version` WRITE;
 /*!40000 ALTER TABLE `oess_version` DISABLE KEYS */;
-INSERT INTO `oess_version` VALUES ('1.2.4');
+INSERT INTO `oess_version` VALUES ('1.2.5');
 /*!40000 ALTER TABLE `oess_version` ENABLE KEYS */;
 UNLOCK TABLES;
 

perl-lib/OESS/share/upgrade/oess-1.2.4-1.2.5

@@ -0,0 +1,84 @@
+#!/usr/bin/perl
+#-------------------------------------------------------------------
+#----- OESS 1.0.12 - 1.1.0 upgrade module                         
+#-----                                                               
+#----- Copyright(C) 2010 The Trustees of Indiana University          
+#--------------------------------------------------------------------
+#----- $HeadURL: $                                                   
+#----- $Id: $                                                        
+#-----                                                               
+#----- This is run when upgrading the database from     
+#----- version 1.2.4 to version 1.2.5                               
+#-------------------------------------------------------------------- 
+
+use strict;
+use warnings;
+use OESS::Database;
+
+my $prev_version = "1.2.4";
+my $version = "1.2.5";
+
+sub main{
+    print "*******************************************************************\n";
+    print "*********             OESS DB UPGRADE           ************\n";
+    print "*******************************************************************\n";
+    print "********* This will upgrade from $prev_version to $version **********\n";
+    print "********* of the OESS DB any other version will not work ************\n";
+
+    continue_parameter("Do you wish to continue");
+
+    my $dbq = new OESS::Database();
+    my $current_version = $dbq->get_oess_schema_version();    
+    if($current_version eq $prev_version){
+        $dbq->{'dbh'}->begin_work();
+        upgrade($dbq);
+        $dbq->{'dbh'}->commit();
+    } else{
+        print "Wrong version of OESS DB\n";
+        print "This script only upgrades from version $prev_version to $version\n";
+        exit;
+    }
+
+    print STDERR "Upgrade Successful!!\n";
+}
+
+
+sub upgrade{
+    my $dbq = shift;
+    my $term = shift;
+    my $dbh = $dbq->{'dbh'};
+    my $str;
+    my $sth;
+
+
+    # Done with the rest of the upgrade update our version
+    $str = "update oess_version set version = '$version'";
+    $sth = $dbh->prepare($str) or die "Unable to prepare version update \n";
+    $sth->execute() or die "Unable to update version\n";
+}
+
+main();
+
+sub continue_parameter {
+    my $name = shift;
+
+    print "$name [y/n]: ";
+    my $yes_or_no = <>;
+    chomp($yes_or_no);
+
+    exit(0) if ($yes_or_no !~ /y/i || $yes_or_no =~ /n/i);
+}
+
+sub required_parameter {
+    my $name = shift;
+
+    while (1) {
+	print "$name (required): ";
+        my $response = <>;
+	chomp($response);
+
+        return $response if ($response);
+
+	print "\nThis option is required!\n\n";
+    }
+}

perl-lib/OESS/t/TEST

@@ -34,7 +34,7 @@ if (defined $ENV{'TEST_FILES'}){
 }
 else {
     # Build list of all .t files in all sub-directories of t/
-    @tests = split(/\n/, `find t -type f | grep -v ".svn" | grep -v "~" | grep .t`);
+    @tests = split(/\n/, `find t -type f | grep -v "\\.svn" | grep -v "~" | grep "\\.t"`);
     @tests = sort @tests;
 }
 

perl-lib/OESS/t/mpls/mx-connected.t

@@ -6,7 +6,7 @@ use Data::Dumper;
 use OESS::Mock;
 use OESS::MPLS::Device::Juniper::MX;
 
-use Test::More tests => 2;
+use Test::More tests => 3;
 
 
 my $device = OESS::MPLS::Device::Juniper::MX->new(