From: Mark McClain <mark.mcclain@dreamhost.com>
Date: Mon, 14 Jan 2013 20:31:37 +0000 (-0500)
Subject: ensure all enums in loadbalancer models have names
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d77376e315127aa62ee2e80f4f0815358856bbd1;p=openstack-build%2Fneutron-build.git

ensure all enums in loadbalancer models have names

fixes bug 1099565

Postgres requires that enums types have names.  This fix adds the name
parameter to the Enum declaration.

Change-Id: Ica67c6cf0b8959761f3022552c1c6a807a4ced82
---

diff --git a/quantum/db/loadbalancer/loadbalancer_db.py b/quantum/db/loadbalancer/loadbalancer_db.py
index 41a7be830..db1262868 100644
--- a/quantum/db/loadbalancer/loadbalancer_db.py
+++ b/quantum/db/loadbalancer/loadbalancer_db.py
@@ -45,7 +45,7 @@ class SessionPersistence(model_base.BASEV2):
     type = sa.Column(sa.Enum("SOURCE_IP",
                              "HTTP_COOKIE",
                              "APP_COOKIE",
-                             name="type"),
+                             name="sesssionpersistences_type"),
                      nullable=False)
     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)
     address = sa.Column(sa.String(64))
     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)
     pool_id = sa.Column(sa.String(36), nullable=False)
     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)
     lb_method = sa.Column(sa.Enum("ROUND_ROBIN",
                                   "LEAST_CONNECTIONS",
-                                  "SOURCE_IP"),
+                                  "SOURCE_IP",
+                                  name="pools_lb_method"),
                           nullable=False)
     status = sa.Column(sa.String(16), 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):
     """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)
     delay = sa.Column(sa.Integer, nullable=False)
     timeout = sa.Column(sa.Integer, nullable=False)