add two more columns, set string lengths)

2 files changed, 114 insertions, 94 deletions

diff --git a/nova/db/sqlalchemy/migrate_repo/versions/001_austin.py b/nova/db/sqlalchemy/migrate_repo/versions/001_austin.py
index 8a60bd890..a312a7190 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/001_austin.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/001_austin.py
@@ -32,19 +32,19 @@ auth_tokens = Table('auth_tokens', meta,
         Column('deleted_at', DateTime(timezone=False)),
         Column('deleted', Boolean(create_constraint=True, name=None)),
         Column('token_hash',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False),
                primary_key=True,
                nullable=False),
         Column('user_id', Integer()),
         Column('server_manageent_url',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('storage_url',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('cdn_management_url',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         )
 
@@ -71,7 +71,7 @@ fixed_ips = Table('fixed_ips', meta,
         Column('deleted', Boolean(create_constraint=True, name=None)),
         Column('id', Integer(),  primary_key=True, nullable=False),
         Column('address',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('network_id',
                Integer(),
@@ -94,17 +94,17 @@ floating_ips = Table('floating_ips', meta,
         Column('deleted', Boolean(create_constraint=True, name=None)),
         Column('id', Integer(),  primary_key=True, nullable=False),
         Column('address',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('fixed_ip_id',
                Integer(),
                ForeignKey('fixed_ips.id'),
                nullable=True),
         Column('project_id',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('host',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         )
 
@@ -117,63 +117,63 @@ instances = Table('instances', meta,
         Column('id', Integer(),  primary_key=True, nullable=False),
         Column('internal_id', Integer()),
         Column('admin_pass',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('user_id',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('project_id',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('image_id',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('kernel_id',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('ramdisk_id',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('launch_index', Integer()),
         Column('key_name',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('key_data',
                Text(length=None, convert_unicode=False, assert_unicode=None,
                     unicode_error=None, _warn_on_bytestring=False)),
         Column('state', Integer()),
         Column('state_description',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('memory_mb', Integer()),
         Column('vcpus', Integer()),
         Column('local_gb', Integer()),
         Column('hostname',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('host',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('instance_type',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('user_data',
                Text(length=None, convert_unicode=False, assert_unicode=None,
                     unicode_error=None, _warn_on_bytestring=False)),
         Column('reservation_id',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('mac_address',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('scheduled_at', DateTime(timezone=False)),
         Column('launched_at', DateTime(timezone=False)),
         Column('terminated_at', DateTime(timezone=False)),
         Column('display_name',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('display_description',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         )
 
@@ -186,7 +186,7 @@ iscsi_targets = Table('iscsi_targets', meta,
         Column('id', Integer(),  primary_key=True, nullable=False),
         Column('target_num', Integer()),
         Column('host',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('volume_id',
                Integer(),
@@ -202,13 +202,13 @@ key_pairs = Table('key_pairs', meta,
         Column('deleted', Boolean(create_constraint=True, name=None)),
         Column('id', Integer(),  primary_key=True, nullable=False),
         Column('name',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('user_id',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('fingerprint',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('public_key',
                Text(length=None, convert_unicode=False, assert_unicode=None,
@@ -224,39 +224,39 @@ networks = Table('networks', meta,
         Column('id', Integer(),  primary_key=True, nullable=False),
         Column('injected', Boolean(create_constraint=True, name=None)),
         Column('cidr',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('netmask',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('bridge',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('gateway',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('broadcast',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('dns',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('vlan', Integer()),
         Column('vpn_public_address',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('vpn_public_port', Integer()),
         Column('vpn_private_address',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('dhcp_start',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('project_id',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('host',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         )
 
@@ -267,18 +267,18 @@ projects = Table('projects', meta,
         Column('deleted_at', DateTime(timezone=False)),
         Column('deleted', Boolean(create_constraint=True, name=None)),
         Column('id',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False),
                primary_key=True,
                nullable=False),
         Column('name',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('description',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('project_manager',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False),
                ForeignKey('users.id')),
         )
@@ -291,7 +291,7 @@ quotas = Table('quotas', meta,
         Column('deleted', Boolean(create_constraint=True, name=None)),
         Column('id', Integer(),  primary_key=True, nullable=False),
         Column('project_id',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('instances', Integer()),
         Column('cores', Integer()),
@@ -308,16 +308,16 @@ security_groups = Table('security_groups', meta,
         Column('deleted', Boolean(create_constraint=True, name=None)),
         Column('id', Integer(),  primary_key=True, nullable=False),
         Column('name',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('description',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('user_id',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('project_id',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         )
 
@@ -345,12 +345,12 @@ security_group_rules = Table('security_group_rules', meta,
                Integer(),
                ForeignKey('security_groups.id')),
         Column('protocol',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('from_port', Integer()),
         Column('to_port', Integer()),
         Column('cidr',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('group_id',
                Integer(),
@@ -365,13 +365,13 @@ services = Table('services', meta,
         Column('deleted', Boolean(create_constraint=True, name=None)),
         Column('id', Integer(),  primary_key=True, nullable=False),
         Column('host',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('binary',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('topic',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('report_count', Integer(),  nullable=False),
         Column('disabled', Boolean(create_constraint=True, name=None)),
@@ -384,18 +384,18 @@ users = Table('users', meta,
         Column('deleted_at', DateTime(timezone=False)),
         Column('deleted', Boolean(create_constraint=True, name=None)),
         Column('id',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False),
                primary_key=True,
                nullable=False),
         Column('name',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('access_key',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('secret_key',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('is_admin', Boolean(create_constraint=True, name=None)),
         )
@@ -407,13 +407,13 @@ user_project_association = Table('user_project_association', meta,
         Column('deleted_at', DateTime(timezone=False)),
         Column('deleted', Boolean(create_constraint=True, name=None)),
         Column('user_id',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False),
                ForeignKey('users.id'),
                primary_key=True,
                nullable=False),
         Column('project_id',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False),
                ForeignKey('projects.id'),
                primary_key=True,
@@ -427,17 +427,17 @@ user_project_role_association = Table('user_project_role_association', meta,
         Column('deleted_at', DateTime(timezone=False)),
         Column('deleted', Boolean(create_constraint=True, name=None)),
         Column('user_id',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False),
                primary_key=True,
                nullable=False),
         Column('project_id',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False),
                primary_key=True,
                nullable=False),
         Column('role',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False),
                primary_key=True,
                nullable=False),
@@ -454,13 +454,13 @@ user_role_association = Table('user_role_association', meta,
         Column('deleted_at', DateTime(timezone=False)),
         Column('deleted', Boolean(create_constraint=True, name=None)),
         Column('user_id',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False),
                ForeignKey('users.id'),
                primary_key=True,
                nullable=False),
         Column('role',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False),
                primary_key=True,
                nullable=False),
@@ -474,45 +474,45 @@ volumes = Table('volumes', meta,
         Column('deleted', Boolean(create_constraint=True, name=None)),
         Column('id', Integer(),  primary_key=True, nullable=False),
         Column('ec2_id',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('user_id',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('project_id',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('host',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('size', Integer()),
         Column('availability_zone',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('instance_id',
                Integer(),
                ForeignKey('instances.id'),
                nullable=True),
         Column('mountpoint',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('attach_time',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('status',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('attach_status',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('scheduled_at', DateTime(timezone=False)),
         Column('launched_at', DateTime(timezone=False)),
         Column('terminated_at', DateTime(timezone=False)),
         Column('display_name',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('display_description',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         )
 
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/002_bexar.py b/nova/db/sqlalchemy/migrate_repo/versions/002_bexar.py
index 53da35233..bd3a3e6f8 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/002_bexar.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/002_bexar.py
@@ -31,10 +31,17 @@ instances = Table('instances', meta,
         Column('id', Integer(),  primary_key=True, nullable=False),
         )
 
+
 services = Table('services', meta,
         Column('id', Integer(),  primary_key=True, nullable=False),
         )
 
+
+networks = Table('networks', meta,
+        Column('id', Integer(),  primary_key=True, nullable=False),
+        )
+
+
 #
 # New Tables
 #
@@ -45,13 +52,13 @@ certificates = Table('certificates', meta,
         Column('deleted', Boolean(create_constraint=True, name=None)),
         Column('id', Integer(),  primary_key=True, nullable=False),
         Column('user_id',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('project_id',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('file_name',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         )
 
@@ -63,11 +70,11 @@ consoles = Table('consoles', meta,
         Column('deleted', Boolean(create_constraint=True, name=None)),
         Column('id', Integer(),  primary_key=True, nullable=False),
         Column('instance_name',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('instance_id', Integer()),
         Column('password',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('port', Integer(), nullable=True),
         Column('pool_id',
@@ -83,25 +90,25 @@ console_pools = Table('console_pools', meta,
         Column('deleted', Boolean(create_constraint=True, name=None)),
         Column('id', Integer(),  primary_key=True, nullable=False),
         Column('address',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('username',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('password',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('console_type',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('public_hostname',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('host',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('compute_host',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         )
 
@@ -116,7 +123,7 @@ instance_actions = Table('instance_actions', meta,
                Integer(),
                ForeignKey('instances.id')),
         Column('action',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('error',
                Text(length=None, convert_unicode=False, assert_unicode=None,
@@ -133,26 +140,26 @@ auth_tokens = Table('auth_tokens', meta,
         Column('deleted_at', DateTime(timezone=False)),
         Column('deleted', Boolean(create_constraint=True, name=None)),
         Column('token_hash',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False),
                primary_key=True,
                nullable=False),
         Column('user_id', Integer()),
         Column('server_manageent_url',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('storage_url',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         Column('cdn_management_url',
-               String(length=None, convert_unicode=False, assert_unicode=None,
+               String(length=255, convert_unicode=False, assert_unicode=None,
                       unicode_error=None, _warn_on_bytestring=False)),
         )
 
 
 instances_availability_zone = Column(
         'availability_zone',
-        String(length=None, convert_unicode=False, assert_unicode=None,
+        String(length=255, convert_unicode=False, assert_unicode=None,
                unicode_error=None, _warn_on_bytestring=False))
 
 
@@ -160,9 +167,20 @@ instances_locked = Column('locked',
                 Boolean(create_constraint=True, name=None))
 
 
+networks_cidr_v6 = Column(
+        'cidr_v6',
+        String(length=255, convert_unicode=False, assert_unicode=None,
+               unicode_error=None, _warn_on_bytestring=False))
+
+networks_ra_server = Column(
+        'ra_server',
+        String(length=255, convert_unicode=False, assert_unicode=None,
+               unicode_error=None, _warn_on_bytestring=False))
+
+
 services_availability_zone = Column(
         'availability_zone',
-        String(length=None, convert_unicode=False, assert_unicode=None,
+        String(length=255, convert_unicode=False, assert_unicode=None,
                unicode_error=None, _warn_on_bytestring=False))
 
 
@@ -178,7 +196,7 @@ def upgrade(migrate_engine):
             logging.exception('Exception while creating table')
             raise
 
-    auth_tokens.c.user_id.alter(type=String(length=None,
+    auth_tokens.c.user_id.alter(type=String(length=255,
                                             convert_unicode=False,
                                             assert_unicode=None,
                                             unicode_error=None,
@@ -186,4 +204,6 @@ def upgrade(migrate_engine):
 
     instances.create_column(instances_availability_zone)
     instances.create_column(instances_locked)
+    networks.create_column(networks_cidr_v6)
+    networks.create_column(networks_ra_server)
     services.create_column(services_availability_zone)