set version to 2.0.17

jonstout · jonstout · commit 44b7f5018bc9 · 2023-02-10T16:28:13.000-05:00
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-OESS_VERSION=2.0.16
+OESS_VERSION=2.0.17
 OESS_NETWORK=oess
 TEST_FILES=
 
diff --git a/app/Makefile b/app/Makefile
@@ -1,5 +1,5 @@
 NAME= oess-core
-VERSION = 2.0.16
+VERSION = 2.0.17
 
 rpm:	dist
 	rpmbuild -ta dist/$(NAME)-$(VERSION).tar.gz
diff --git a/app/oess-core.spec b/app/oess-core.spec
@@ -1,5 +1,5 @@
 Name:		oess-core
-Version:	2.0.16
+Version:	2.0.17
 Release:	1%{?dist}
 Summary:	The core OESS service providers
 
@@ -20,7 +20,7 @@ Requires: /bin/bash
 Requires: /usr/bin/perl
 Requires: perl(base), perl(constant), perl(strict), perl(warnings)
 
-Requires: perl-OESS >= 2.0.16
+Requires: perl-OESS >= 2.0.17
 
 Requires: perl(AnyEvent), perl(AnyEvent::DBus), perl(AnyEvent::RabbitMQ)
 Requires: perl(CPAN), perl(CPAN::Shell)
diff --git a/frontend/Makefile b/frontend/Makefile
@@ -1,5 +1,5 @@
 NAME= oess-frontend
-VERSION = 2.0.16
+VERSION = 2.0.17
 
 rpm:	dist
 	rpmbuild -ta dist/$(NAME)-$(VERSION).tar.gz
diff --git a/frontend/oess-frontend.spec b/frontend/oess-frontend.spec
@@ -1,6 +1,6 @@
 Name:		oess-frontend
-Version:	2.0.16
-Release:	2%{?dist}
+Version:	2.0.17
+Release:	1%{?dist}
 Summary:	The OESS webservices and user interface
 
 Group:		Network
@@ -14,14 +14,14 @@ BuildRequires: python >= 2.6, python-libs >= 2.6
 BuildRequires: python-simplejson
 BuildRequires: rh-nodejs8-nodejs == 8.11.4
 
-Requires: oess-core >= 2.0.16
+Requires: oess-core >= 2.0.17
 Requires: yui
 Requires: httpd, mod_ssl
 Requires: nddi-tiles
 Requires: perl-Crypt-SSLeay
 Requires: xmlsec1, xmlsec1-openssl
 
-Requires: perl-OESS >= 2.0.16
+Requires: perl-OESS >= 2.0.17
 
 Requires: perl(strict), perl(warnings)
 Requires: perl(AnyEvent)
diff --git a/oess.spec b/oess.spec
@@ -1,14 +1,14 @@
 Summary: OESS Metapackage 
 Name: oess
-Version: 2.0.16
+Version: 2.0.17
 Release: 1%{?dist}
 License: Apache
 Group: GRNOC
 #Source: 
 URL: http://globalnoc.iu.edu
 Buildroot: %{_tmppath}/%{name}-root
-Requires: oess-core >= 2.0.16
-Requires: oess-frontend >= 2.0.16
+Requires: oess-core >= 2.0.17
+Requires: oess-frontend >= 2.0.17
 
 %description
 Package that installs all of the OESS packages
diff --git a/perl-lib/OESS/MANIFEST b/perl-lib/OESS/MANIFEST
@@ -92,7 +92,7 @@ lib/OESS/Webservice.pm
 lib/OESS/Workgroup.pm
 Makefile.PL
 MANIFEST			This list of files
-perl-OESS-2.0.16.tar.gz
+perl-OESS-2.0.17.tar.gz
 perl-OESS.spec
 share/customer-templates/cisco/2900/ios124/template.txt
 share/customer-templates/cisco/3700/ios124/template.txt
@@ -157,6 +157,7 @@ share/upgrade/oess-2.0.12-2.0.13
 share/upgrade/oess-2.0.13-2.0.14
 share/upgrade/oess-2.0.14-2.0.15
 share/upgrade/oess-2.0.15-2.0.16
+share/upgrade/oess-2.0.16-2.0.17
 share/upgrade/oess-2.0.2-2.0.3
 share/upgrade/oess-2.0.3-2.0.4
 share/upgrade/oess-2.0.4-2.0.5
diff --git a/perl-lib/OESS/lib/OESS/Database.pm b/perl-lib/OESS/lib/OESS/Database.pm
@@ -31,11 +31,11 @@ OESS::Database - Database Interaction Module
 
 =head1 VERSION
 
-Version 2.0.16
+Version 2.0.17
 
 =cut
 
-our $VERSION = '2.0.16';
+our $VERSION = '2.0.17';
 
 =head1 SYNOPSIS
 
@@ -84,7 +84,7 @@ use Data::Dumper;
 
 use Socket qw( inet_aton inet_ntoa);
 
-use constant VERSION => '2.0.16';
+use constant VERSION => '2.0.17';
 use constant MAX_VLAN_TAG => 4096;
 use constant MIN_VLAN_TAG => 1;
 use constant OESS_PW_FILE => "/etc/oess/.passwd.xml";
diff --git a/perl-lib/OESS/perl-OESS.spec b/perl-lib/OESS/perl-OESS.spec
@@ -1,6 +1,6 @@
 Summary: OESS Perl Libraries
 Name: perl-OESS
-Version: 2.0.16
+Version: 2.0.17
 Release: 1%{?dist}
 License: APL 2.0
 Group: Network
diff --git a/perl-lib/OESS/share/nddi.sql b/perl-lib/OESS/share/nddi.sql
@@ -773,7 +773,7 @@ CREATE TABLE `oess_version` (
 
 LOCK TABLES `oess_version` WRITE;
 /*!40000 ALTER TABLE `oess_version` DISABLE KEYS */;
-INSERT INTO `oess_version` VALUES ('2.0.16');
+INSERT INTO `oess_version` VALUES ('2.0.17');
 /*!40000 ALTER TABLE `oess_version` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/perl-lib/OESS/share/upgrade/oess-2.0.16-2.0.17 b/perl-lib/OESS/share/upgrade/oess-2.0.16-2.0.17
@@ -0,0 +1,88 @@
+#!/usr/bin/perl
+#-------------------------------------------------------------------
+#----- OESS 2.0.16 - 2.0.17 upgrade module                         
+#-----                                                               
+#----- Copyright(C) 2010 The Trustees of Indiana University          
+#--------------------------------------------------------------------
+#----- $HeadURL: $                                                   
+#----- $Id: $                                                        
+#-----                                                               
+#----- This is run when upgrading the database from     
+#----- version 2.0.16 to version 2.0.17                               
+#-------------------------------------------------------------------- 
+
+use strict;
+use warnings;
+use OESS::Database;
+
+my $prev_version = "2.0.16";
+my $version = "2.0.17";
+
+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){
+        eval {
+            $dbq->{'dbh'}->begin_work();
+            upgrade($dbq);
+            $dbq->{'dbh'}->commit();
+        };
+        if ($@) {
+            $dbq->{'dbh'}->rollback();
+            print "$@\n";
+            exit;
+        }
+    } 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;
+
+    $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";
+    }
+}
diff --git a/perl-lib/OESS/t/conf/integration.sql b/perl-lib/OESS/t/conf/integration.sql
@@ -775,7 +775,7 @@ CREATE TABLE `oess_version` (
 
 LOCK TABLES `oess_version` WRITE;
 /*!40000 ALTER TABLE `oess_version` DISABLE KEYS */;
-INSERT INTO `oess_version` VALUES ('2.0.16');
+INSERT INTO `oess_version` VALUES ('2.0.17');
 /*!40000 ALTER TABLE `oess_version` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/perl-lib/OESS/t/conf/mpls/discovery.sql b/perl-lib/OESS/t/conf/mpls/discovery.sql
@@ -780,7 +780,7 @@ CREATE TABLE `oess_version` (
 
 LOCK TABLES `oess_version` WRITE;
 /*!40000 ALTER TABLE `oess_version` DISABLE KEYS */;
-INSERT INTO `oess_version` VALUES ('2.0.16');
+INSERT INTO `oess_version` VALUES ('2.0.17');
 /*!40000 ALTER TABLE `oess_version` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/perl-lib/OESS/t/conf/oess_known_state.sql b/perl-lib/OESS/t/conf/oess_known_state.sql
@@ -763,7 +763,7 @@ CREATE TABLE `oess_version` (
 
 LOCK TABLES `oess_version` WRITE;
 /*!40000 ALTER TABLE `oess_version` DISABLE KEYS */;
-INSERT INTO `oess_version` VALUES ('2.0.16');
+INSERT INTO `oess_version` VALUES ('2.0.17');
 /*!40000 ALTER TABLE `oess_version` ENABLE KEYS */;
 UNLOCK TABLES;
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-OESS_VERSION=2.0.16`
	`1`	`+OESS_VERSION=2.0.17`
`2`	`2`	`OESS_NETWORK=oess`
`3`	`3`	`TEST_FILES=`
`4`	`4`