shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

Feature #471: onedb migrator adds new elements

Browse Source
This commit is contained in:
Carlos Martín 2013-03-04 17:11:54 +01:00
parent 70b2018f0a
commit 690c44f50c
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/onedb/3.8.1_to_3.9.80.rb
View File

@ -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],

1
src/vnm/FixedLeases.cc
View File

@ -164,6 +164,7 @@ error_body:
goto error_common;
error_db:
oss.str("");
oss << "Error inserting lease in database.";
delete lease;