From 1acb699a6fb0ea7a7d84ba4598790d7c9d7abd14 Mon Sep 17 00:00:00 2001
From: Sandy Walsh <sandy.walsh@rackspace.com>
Date: Mon, 20 Jun 2011 07:45:21 -0700
Subject: working commit

---
 nova/db/sqlalchemy/models.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'nova/db')

diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index 239f6e96a..f28fb0778 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -21,7 +21,7 @@ SQLAlchemy models for nova data.
 
 from sqlalchemy.orm import relationship, backref, object_mapper
 from sqlalchemy import Column, Integer, String, schema
-from sqlalchemy import ForeignKey, DateTime, Boolean, Text
+from sqlalchemy import ForeignKey, DateTime, Boolean, Text, Float
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.schema import ForeignKeyConstraint
@@ -670,6 +670,8 @@ class Zone(BASE, NovaBase):
     api_url = Column(String(255))
     username = Column(String(255))
     password = Column(String(255))
+    weight_offset = Column(Float(), default=0.0)
+    weight_scale = Column(Float(), default=1.0)
 
 
 def register_models():
-- 
cgit 


From a1ee8e591e157a23390b1622b9c313da08ae9130 Mon Sep 17 00:00:00 2001
From: Sandy Walsh <sandy.walsh@rackspace.com>
Date: Tue, 21 Jun 2011 12:11:16 -0700
Subject: fixed zone update

---
 nova/db/api.py            | 2 +-
 nova/db/sqlalchemy/api.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova/db')

diff --git a/nova/db/api.py b/nova/db/api.py
index 5fd081ca8..2333e4caa 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -1253,7 +1253,7 @@ def zone_create(context, values):
 
 def zone_update(context, zone_id, values):
     """Update a child Zone entry."""
-    return IMPL.zone_update(context, values)
+    return IMPL.zone_update(context, zone_id, values)
 
 
 def zone_delete(context, zone_id):
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index a7e5125d5..64d67b17a 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -2675,7 +2675,7 @@ def zone_update(context, zone_id, values):
     if not zone:
         raise exception.ZoneNotFound(zone_id=zone_id)
     zone.update(values)
-    zone.save()
+    zone.save(session=session)
     return zone
 
 
-- 
cgit