openstack
/
fuel-web
Code Issues Proposed changes

Extend length of vip_name and vip_namespace fields of IPAddr entity 

Change-Id: If7b239873cdf520936e46f994dc7750ea8ca8610
Closes-Bug: #1551320
This commit is contained in:
Artem Roma 2016-03-14 18:43:13 +02:00
parent fb12cc5b22
commit b71c751deb
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nailgun/nailgun/consts.py
View File

@ -177,10 +177,6 @@ NETWORK_VIP_NAMES_V6_1 = Enum(
'vrouter',
)
VIP_NAME_MAX_LEN = 25
VIP_NAMESPACE_MAX_LEN = 25
NETWORK_GROUP_NAME_MAX_LEN = 50
BOND_MODES = Enum(
# same for both OVS and linux
'active-backup',

4
nailgun/nailgun/db/migration/alembic_migrations/versions/fuel_9_0.py
View File

@ -516,7 +516,7 @@ def upgrade_ip_address():
'ip_addrs',
sa.Column(
'vip_namespace',
sa.String(length=25),
sa.String(length=50),
nullable=True,
default=None,
server_default=None
@ -527,7 +527,7 @@ def upgrade_ip_address():
'ip_addrs',
'vip_type',
new_column_name='vip_name',
type_=sa.String(length=25)
type_=sa.String(length=50)
)

7
nailgun/nailgun/db/sqlalchemy/models/network.py
View File

@ -21,7 +21,6 @@ from sqlalchemy import Integer
from sqlalchemy.orm import relationship
from sqlalchemy import String
from nailgun import consts
from nailgun.db.sqlalchemy.models.base import Base
from nailgun.db.sqlalchemy.models.fields import JSON
from nailgun.db.sqlalchemy.models.mutable import MutableDict
@ -34,9 +33,9 @@ class IPAddr(Base):
ondelete="CASCADE"))
node = Column(Integer, ForeignKey('nodes.id', ondelete="CASCADE"))
ip_addr = Column(psql.INET, nullable=False)
vip_name = Column(String(consts.VIP_NAME_MAX_LEN), nullable=True)
vip_name = Column(String(50), nullable=True)
vip_namespace = Column(
String(consts.VIP_NAMESPACE_MAX_LEN),
String(50),
nullable=True,
server_default=None
)
@ -63,7 +62,7 @@ class NetworkGroup(Base):
__tablename__ = 'network_groups'
id = Column(Integer, primary_key=True)
name = Column(String(consts.NETWORK_GROUP_NAME_MAX_LEN), nullable=False)
name = Column(String(50), nullable=False)
# can be nullable only for fuelweb admin net
release = Column(Integer, ForeignKey('releases.id', ondelete='CASCADE'))
# can be nullable only for fuelweb admin net