From 690c44f50c9b894cdc42c471ab9fbddeba6a84cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Mon, 4 Mar 2013 17:11:54 +0100
Subject: [PATCH] Feature #471: onedb migrator adds new elements

---
 src/onedb/3.8.1_to_3.9.80.rb | 10 +++++++++-
 src/vnm/FixedLeases.cc       |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/onedb/3.8.1_to_3.9.80.rb b/src/onedb/3.8.1_to_3.9.80.rb
index 5e160eb340..c2308dc609 100644
--- a/src/onedb/3.8.1_to_3.9.80.rb
+++ b/src/onedb/3.8.1_to_3.9.80.rb
@@ -140,6 +140,11 @@ module Migrator
 
         @db.run "DROP TABLE old_host_pool;"
 
+        ########################################################################
+        # Feature #1565: New cid column
+        # Feature #471: IPv6 addresses
+        ########################################################################
+
         @db.run "ALTER TABLE network_pool RENAME TO old_network_pool;"
         @db.run "CREATE TABLE network_pool (oid INTEGER PRIMARY KEY, name VARCHAR(128), body TEXT, uid INTEGER, gid INTEGER, owner_u INTEGER, group_u INTEGER, other_u INTEGER, cid INTEGER, UNIQUE(name,uid));"
 
@@ -148,10 +153,13 @@ module Migrator
 
             cluster_id = doc.root.get_text('CLUSTER_ID').to_s
 
+            doc.root.add_element("GLOBAL_PREFIX")
+            doc.root.add_element("SITE_PREFIX")
+
             @db[:network_pool].insert(
                 :oid            => row[:oid],
                 :name           => row[:name],
-                :body           => row[:body],
+                :body           => doc.root.to_s,
                 :uid            => row[:uid],
                 :gid            => row[:gid],
                 :owner_u        => row[:owner_u],
diff --git a/src/vnm/FixedLeases.cc b/src/vnm/FixedLeases.cc
index b780e4a0e4..fa2d30e42d 100644
--- a/src/vnm/FixedLeases.cc
+++ b/src/vnm/FixedLeases.cc
@@ -164,6 +164,7 @@ error_body:
     goto error_common;
 
 error_db:
+    oss.str("");
     oss << "Error inserting lease in database.";
     delete lease;