diff --git a/app/Makefile b/app/Makefile
index e5ef1a756..c9020e1cd 100644
--- a/app/Makefile
+++ b/app/Makefile
@@ -1,5 +1,5 @@
NAME= oess-core
-VERSION = 1.2.1
+VERSION = 1.2.2
rpm: dist
rpmbuild -ta dist/$(NAME)-$(VERSION).tar.gz
diff --git a/app/oess-core.spec b/app/oess-core.spec
index 58cb7eb72..f6e1fa4a7 100644
--- a/app/oess-core.spec
+++ b/app/oess-core.spec
@@ -1,5 +1,5 @@
Name: oess-core
-Version: 1.2.1
+Version: 1.2.2
Release: 1%{?dist}
Summary: The core OESS service providers
@@ -11,7 +11,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: perl
-Requires: nox >= 0.10.11
+Requires: nox >= 0.10.12
Requires: xmlsec1-devel
Requires: xmlsec1-openssl-devel
Requires(interp): /bin/sh
@@ -21,7 +21,7 @@ Requires: /bin/bash
Requires: /usr/bin/perl
Requires: perl(base), perl(constant), perl(strict), perl(warnings)
-Requires: perl-OESS >= 1.2.1
+Requires: perl-OESS >= 1.2.2
Requires: perl(AnyEvent), perl(AnyEvent::DBus), perl(AnyEvent::RabbitMQ)
Requires: perl(CPAN), perl(CPAN::Shell)
diff --git a/frontend/Makefile b/frontend/Makefile
index b94ff876a..567f47a93 100644
--- a/frontend/Makefile
+++ b/frontend/Makefile
@@ -1,5 +1,5 @@
NAME= oess-frontend
-VERSION = 1.2.1
+VERSION = 1.2.2
rpm: dist
rpmbuild -ta dist/$(NAME)-$(VERSION).tar.gz
diff --git a/frontend/oess-frontend.spec b/frontend/oess-frontend.spec
index 8a0b24bd7..15ba1b8b9 100644
--- a/frontend/oess-frontend.spec
+++ b/frontend/oess-frontend.spec
@@ -1,5 +1,5 @@
Name: oess-frontend
-Version: 1.2.1
+Version: 1.2.2
Release: 1%{?dist}
Summary: The OESS webservices and user interface
@@ -13,14 +13,14 @@ BuildRequires: perl
BuildRequires: python >= 2.6, python-libs >= 2.6
BuildRequires: python-simplejson
-Requires: oess-core >= 1.2.1, nox >= 0.10.11
+Requires: oess-core >= 1.2.2, nox >= 0.10.12
Requires: yui2
Requires: httpd, mod_ssl
Requires: nddi-tiles
Requires: perl-Crypt-SSLeay
Requires: xmlsec1, xmlsec1-openssl
-Requires: perl-OESS >= 1.2.1
+Requires: perl-OESS >= 1.2.2
Requires: perl(strict), perl(warnings)
Requires: perl(AnyEvent)
diff --git a/nox/nox.spec b/nox/nox.spec
index 5052f4132..e0aa00bec 100644
--- a/nox/nox.spec
+++ b/nox/nox.spec
@@ -1,5 +1,5 @@
Name: nox
-Version: 0.10.11
+Version: 0.10.12
Release: 1%{?dist}
Summary: NOX: an OpenFlow controller
diff --git a/oess.spec b/oess.spec
index b806e3773..1f078e87a 100644
--- a/oess.spec
+++ b/oess.spec
@@ -1,14 +1,14 @@
Summary: OESS Metapackage
Name: oess
-Version: 1.2.1
+Version: 1.2.2
Release: 1%{?dist}
License: Apache
Group: GRNOC
#Source:
URL: http://globalnoc.iu.edu
Buildroot: %{_tmppath}/%{name}-root
-Requires: oess-core >= 1.2.1
-Requires: oess-frontend >= 1.2.1
+Requires: oess-core >= 1.2.2
+Requires: oess-frontend >= 1.2.2
%description
Package that installs all of the OESS packages
diff --git a/perl-lib/OESS/lib/OESS/Database.pm b/perl-lib/OESS/lib/OESS/Database.pm
index 479c4a67c..fd68116ef 100644
--- 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 1.2.1
+Version 1.2.2
=cut
-our $VERSION = '1.2.1';
+our $VERSION = '1.2.2';
=head1 SYNOPSIS
@@ -83,7 +83,7 @@ use Data::Dumper;
use Socket qw( inet_aton inet_ntoa);
-use constant VERSION => '1.2.1';
+use constant VERSION => '1.2.2';
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
index 0896f2b03..b22333317 100644
--- 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: 1.2.1
+Version: 1.2.2
Release: 1%{?dist}
License: APL 2.0
Group: Network
diff --git a/perl-lib/OESS/share/mpls/templates/juniper/13.3R8/L2CCC/ep_config.xml b/perl-lib/OESS/share/mpls/templates/juniper/13.3R8/L2CCC/ep_config.xml
index 8d85091df..7f8e63b20 100755
--- a/perl-lib/OESS/share/mpls/templates/juniper/13.3R8/L2CCC/ep_config.xml
+++ b/perl-lib/OESS/share/mpls/templates/juniper/13.3R8/L2CCC/ep_config.xml
@@ -25,12 +25,11 @@
[% IF path.name == 'PRIMARY' %]
OESS-L2CCC-[% a_side %]-[% dest_node %]-LSP-[% circuit_id %]-[% path.name %]
-
[% ELSE %]
OESS-L2CCC-[% a_side %]-[% dest_node %]-LSP-[% circuit_id %]-[% path.name %]
-
+
[% END %]
[% END %]
@@ -48,7 +47,6 @@
[% ELSE %]
[% dest %]
-
[% END %]
diff --git a/perl-lib/OESS/share/nddi.sql b/perl-lib/OESS/share/nddi.sql
index 4af8c1388..f6eab20c4 100755
--- a/perl-lib/OESS/share/nddi.sql
+++ b/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.1');
+INSERT INTO `oess_version` VALUES ('1.2.2');
/*!40000 ALTER TABLE `oess_version` ENABLE KEYS */;
UNLOCK TABLES;
diff --git a/perl-lib/OESS/share/upgrade/oess-1.2.1-1.2.2 b/perl-lib/OESS/share/upgrade/oess-1.2.1-1.2.2
new file mode 100755
index 000000000..716e5048e
--- /dev/null
+++ b/perl-lib/OESS/share/upgrade/oess-1.2.1-1.2.2
@@ -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.1 to version 1.2.2
+#--------------------------------------------------------------------
+
+use strict;
+use warnings;
+use OESS::Database;
+
+my $prev_version = "1.2.1";
+my $version = "1.2.2";
+
+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";
+ }
+}