x/vmware-nsx
Code Issues Proposed changes

Merge "ensure all enums in loadbalancer models have names"

Browse Source
This commit is contained in:
Jenkins
2013-01-15 03:00:48 +00:00
committed by Gerrit Code Review
parent 890558e763 e0285a3048
commit 25a1279f1c
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
quantum/db/loadbalancer/loadbalancer_db.py
View File

@@ -45,7 +45,7 @@ class SessionPersistence(model_base.BASEV2):
type = sa.Column(sa.Enum("SOURCE_IP", type = sa.Column(sa.Enum("SOURCE_IP",
"HTTP_COOKIE", "HTTP_COOKIE",
"APP_COOKIE", "APP_COOKIE",
name="type"), name="sesssionpersistences_type"),
nullable=False) nullable=False)
cookie_name = sa.Column(sa.String(1024)) cookie_name = sa.Column(sa.String(1024))
@@ -67,7 +67,7 @@ class Vip(model_base.BASEV2, models_v2.HasId, models_v2.HasTenant):
subnet_id = sa.Column(sa.String(36), nullable=False) subnet_id = sa.Column(sa.String(36), nullable=False)
address = sa.Column(sa.String(64)) address = sa.Column(sa.String(64))
port = sa.Column(sa.Integer, nullable=False) port = sa.Column(sa.Integer, nullable=False)
protocol = sa.Column(sa.Enum("HTTP", "HTTPS", name="protocol"), protocol = sa.Column(sa.Enum("HTTP", "HTTPS", name="vip_protocol"),
nullable=False) nullable=False)
pool_id = sa.Column(sa.String(36), nullable=False) pool_id = sa.Column(sa.String(36), nullable=False)
session_persistence = orm.relationship(SessionPersistence, session_persistence = orm.relationship(SessionPersistence,
@@ -99,7 +99,8 @@ class Pool(model_base.BASEV2, models_v2.HasId, models_v2.HasTenant):
protocol = sa.Column(sa.String(64), nullable=False) protocol = sa.Column(sa.String(64), nullable=False)
lb_method = sa.Column(sa.Enum("ROUND_ROBIN", lb_method = sa.Column(sa.Enum("ROUND_ROBIN",
"LEAST_CONNECTIONS", "LEAST_CONNECTIONS",
"SOURCE_IP"), "SOURCE_IP",
name="pools_lb_method"),
nullable=False) nullable=False)
status = sa.Column(sa.String(16), nullable=False) status = sa.Column(sa.String(16), nullable=False)
admin_state_up = sa.Column(sa.Boolean(), nullable=False) admin_state_up = sa.Column(sa.Boolean(), nullable=False)
@@ -115,7 +116,8 @@ class Pool(model_base.BASEV2, models_v2.HasId, models_v2.HasTenant):
class HealthMonitor(model_base.BASEV2, models_v2.HasId, models_v2.HasTenant): class HealthMonitor(model_base.BASEV2, models_v2.HasId, models_v2.HasTenant):
"""Represents a v2 quantum loadbalancer healthmonitor.""" """Represents a v2 quantum loadbalancer healthmonitor."""
type = sa.Column(sa.Enum("PING", "TCP", "HTTP", "HTTPS", name="type"), type = sa.Column(sa.Enum("PING", "TCP", "HTTP", "HTTPS",
name="healthmontiors_type"),
nullable=False) nullable=False)
delay = sa.Column(sa.Integer, nullable=False) delay = sa.Column(sa.Integer, nullable=False)
timeout = sa.Column(sa.Integer, nullable=False) timeout = sa.Column(sa.Integer, nullable=False)