fixed nova-combined debug hack and renamed ChildZone to Zone

4 files changed, 14 insertions, 14 deletions

diff --git a/nova/db/api.py b/nova/db/api.py
index fa73d86ad..939f1a069 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -986,25 +986,25 @@ def console_get(context, console_id, instance_id=None):
 
 
 def zone_create(context, values):
-    """Create a new ChildZone entry in this Zone."""
+    """Create a new child Zone entry."""
     return IMPL.zone_create(context, values)
 
 
 def zone_update(context, zone_id, values):
-    """Update a ChildZone entry in this Zone."""
+    """Update a child Zone entry."""
     return IMPL.zone_update(context, values)
 
 
 def zone_delete(context, zone_id):
-    """Delete a ChildZone."""
+    """Delete a child Zone."""
     return IMPL.zone_delete(context, zone_id)
 
 
 def zone_get(context, zone_id):
-    """Get a specific ChildZone."""
+    """Get a specific child Zone."""
     return IMPL.zone_get(context, zone_id)
 
 
 def zone_get_all(context):
-    """Get all ChildZone's."""
+    """Get all child Zones."""
     return IMPL.zone_get_all(context)
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index b3320c819..abd65b67b 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -2021,7 +2021,7 @@ def console_get(context, console_id, instance_id=None):
 
 @require_admin_context
 def zone_create(context, values):
-    zone = models.ChildZone()
+    zone = models.Zone()
     zone.update(values)
     zone.save()
     return zone
@@ -2029,7 +2029,7 @@ def zone_create(context, values):
 
 @require_admin_context
 def zone_update(context, zone_id, values):
-    zone = session.query(models.ChildZone).filter_by(id=zone_id).first()
+    zone = session.query(models.Zone).filter_by(id=zone_id).first()
     if not zone:
         raise exception.NotFound(_("No zone with id %(zone_id)s") % locals())
     zone.update(values)
@@ -2041,14 +2041,14 @@ def zone_update(context, zone_id, values):
 def zone_delete(context, zone_id):
     session = get_session()
     with session.begin():
-        session.execute('delete from child_zones '
+        session.execute('delete from zones '
                         'where id=:id', {'id': zone_id})
 
 
 @require_admin_context
 def zone_get(context, zone_id):
     session = get_session()
-    result = session.query(models.ChildZone).filter_by(id=zone_id).first()
+    result = session.query(models.Zone).filter_by(id=zone_id).first()
     if not result:
         raise exception.NotFound(_("No zone with id %(zone_id)s") % locals())
     return result
@@ -2057,4 +2057,4 @@ def zone_get(context, zone_id):
 @require_admin_context
 def zone_get_all(context):
     session = get_session()
-    return session.query(models.ChildZone).all()
+    return session.query(models.Zone).all()
diff --git a/nova/db/sqlalchemy/migration.py b/nova/db/sqlalchemy/migration.py
index 194ecc627..1d9c041f5 100644
--- a/nova/db/sqlalchemy/migration.py
+++ b/nova/db/sqlalchemy/migration.py
@@ -45,7 +45,7 @@ def db_version():
         engine = sqlalchemy.create_engine(FLAGS.sql_connection, echo=False)
         meta.reflect(bind=engine)
         try:
-            for table in ('auth_tokens', 'child_zones', 'export_devices', 
+            for table in ('auth_tokens', 'zones', 'export_devices',
                           'fixed_ips', 'floating_ips', 'instances',
                           'key_pairs', 'networks', 'projects', 'quotas',
                           'security_group_instance_association',
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index 071d57fca..4930c7a2a 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -535,9 +535,9 @@ class Console(BASE, NovaBase):
     pool = relationship(ConsolePool, backref=backref('consoles'))
 
 
-class ChildZone(BASE, NovaBase):
+class Zone(BASE, NovaBase):
     """Represents a child zone of this zone."""
-    __tablename__ = 'child_zones'
+    __tablename__ = 'zones'
     id = Column(Integer, primary_key=True)
     api_url = Column(String(255))
     username = Column(String(255))
@@ -556,7 +556,7 @@ def register_models():
               Volume, ExportDevice, IscsiTarget, FixedIp, FloatingIp,
               Network, SecurityGroup, SecurityGroupIngressRule,
               SecurityGroupInstanceAssociation, AuthToken, User,
-              Project, Certificate, ConsolePool, Console, ChildZone)
+              Project, Certificate, ConsolePool, Console, Zone)
     engine = create_engine(FLAGS.sql_connection, echo=False)
     for model in models:
         model.metadata.create_all(engine)