From e54f0cb05a3e10ad4234c672e2096da2a3eaa2da Mon Sep 17 00:00:00 2001 From: Jason Koelker Date: Fri, 22 Jul 2011 16:47:37 -0500 Subject: default to None in the method signature --- nova/db/sqlalchemy/migrate_repo/versions/035_secondary_dns.py | 2 ++ nova/db/sqlalchemy/models.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'nova/db') diff --git a/nova/db/sqlalchemy/migrate_repo/versions/035_secondary_dns.py b/nova/db/sqlalchemy/migrate_repo/versions/035_secondary_dns.py index d9f82d796..c938eb716 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/035_secondary_dns.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/035_secondary_dns.py @@ -26,6 +26,7 @@ def upgrade(migrate_engine): meta.bind = migrate_engine networks = Table('networks', meta, autoload=True) + networks.c.dns.alter(Column('dns1', String(255))) networks.create_column(dns2) @@ -33,4 +34,5 @@ def downgrade(migrate_engine): meta.bind = migrate_engine networks = Table('networks', meta, autoload=True) + networks.c.dns1.alter(Column('dns', String(255))) networks.drop_column(dns2) diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index cf00177c4..7e35c2cba 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -556,7 +556,7 @@ class Network(BASE, NovaBase): bridge_interface = Column(String(255)) gateway = Column(String(255)) broadcast = Column(String(255)) - dns = Column(String(255)) + dns1 = Column(String(255)) dns2 = Column(String(255)) vlan = Column(Integer) -- cgit