fixing issue with id not being displayed

doonhammer · Mar 17, 2016 · 25775e6 · 25775e6
1 parent 42c6df5
commit 25775e6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/neutron/db/migration/alembic_migrations/sfi_init_ops.py b/neutron/db/migration/alembic_migrations/sfi_init_ops.py
@@ -4,13 +4,13 @@
 def upgrade():
     op.create_table(
         'sfis',
-        sa.Column('tenant_id', sa.String(length=255), nullable=True),
+        sa.Column('tenant_id', sa.String(length=36), nullable=True),
         sa.Column('id', sa.String(length=36), nullable=False),
         sa.Column('name', sa.String(length=255), nullable=True),
-        sa.Column('network_id',sa.String(length=255), nullable=True),
-        sa.Column('app_port_id', sa.String(length=255), nullable=True),
-        sa.Column('in_port_id', sa.String(length=255), nullable=True),
-        sa.Column('out_port_id', sa.String(length=255), nullable=True),
+        sa.Column('network_id',sa.String(length=36), nullable=True),
+        sa.Column('app_port_id', sa.String(length=36), nullable=True),
+        sa.Column('in_port_id', sa.String(length=36), nullable=True),
+        sa.Column('out_port_id', sa.String(length=36), nullable=True),
         sa.Column('status', sa.String(length=16), nullable=True),
         sa.Column('device_owner', sa.String(length=255), nullable=True),
         sa.Column('standard_attr_id',sa.BigInteger()),

diff --git a/neutron/db/models_v2.py b/neutron/db/models_v2.py
@@ -164,6 +164,7 @@ class Sfi(model_base.HasStandardAttributes, model_base.BASEV2,
            HasId, HasTenant):
     """Represents a Service Function on a Neutron v2 network."""
 
+    id =  sa.Column(sa.String(attr.DEVICE_ID_MAX_LEN), nullable=False)
     name = sa.Column(sa.String(attr.NAME_MAX_LEN))
     network_id = sa.Column(sa.String(36), sa.ForeignKey("networks.id"),
                            nullable=False)