openstack
/
neutron-lbaas
Code Issues Proposed changes

Merge "Remove temporary local HasTenant"

This commit is contained in:
Jenkins 2016-08-16 18:53:24 +00:00 committed by Gerrit Code Review
parent 04650ce197 62e2d76a93
commit 4e7301e727
2 changed files with 17 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
neutron_lbaas/db/loadbalancer/loadbalancer_db.py
View File

@ -33,7 +33,6 @@ from sqlalchemy.orm import exc
from sqlalchemy.orm import validates
from neutron_lbaas._i18n import _, _LE
from neutron_lbaas.db.loadbalancer import models
from neutron_lbaas.extensions import loadbalancer
from neutron_lbaas.services.loadbalancer import constants as lb_const
@ -72,8 +71,8 @@ class PoolStatistics(model_base.BASEV2):
return value
class Vip(model_base.BASEV2, models_v2.HasId, models.HasTenant,
models_v2.HasStatusDescription):
class Vip(model_base.BASEV2, model_base.HasId, model_base.HasProject,
model_base.HasStatusDescription):
"""Represents a v2 neutron loadbalancer vip."""
name = sa.Column(sa.String(255))
@ -92,8 +91,8 @@ class Vip(model_base.BASEV2, models_v2.HasId, models.HasTenant,
port = orm.relationship(models_v2.Port)
class Member(model_base.BASEV2, models_v2.HasId, models.HasTenant,
models_v2.HasStatusDescription):
class Member(model_base.BASEV2, model_base.HasId, model_base.HasProject,
model_base.HasStatusDescription):
"""Represents a v2 neutron loadbalancer member."""
__table_args__ = (
@ -108,8 +107,8 @@ class Member(model_base.BASEV2, models_v2.HasId, models.HasTenant,
admin_state_up = sa.Column(sa.Boolean(), nullable=False)
class Pool(model_base.BASEV2, models_v2.HasId, models.HasTenant,
models_v2.HasStatusDescription):
class Pool(model_base.BASEV2, model_base.HasId, model_base.HasProject,
model_base.HasStatusDescription):
"""Represents a v2 neutron loadbalancer pool."""
vip_id = sa.Column(sa.String(36), sa.ForeignKey("vips.id"))
@ -143,7 +142,8 @@ class Pool(model_base.BASEV2, models_v2.HasId, models.HasTenant,
)
class HealthMonitor(model_base.BASEV2, models_v2.HasId, models.HasTenant):
class HealthMonitor(model_base.BASEV2, model_base.HasId,
model_base.HasProject):
"""Represents a v2 neutron loadbalancer healthmonitor."""
type = sa.Column(sa.Enum("PING", "TCP", "HTTP", "HTTPS",
@ -164,7 +164,7 @@ class HealthMonitor(model_base.BASEV2, models_v2.HasId, models.HasTenant):
class PoolMonitorAssociation(model_base.BASEV2,
models_v2.HasStatusDescription):
model_base.HasStatusDescription):
"""Many-to-many association between pool and healthMonitor classes."""
pool_id = sa.Column(sa.String(36),

40
neutron_lbaas/db/loadbalancer/models.py
View File

@ -13,8 +13,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from sqlalchemy.ext import declarative
from neutron.api.v2 import attributes as attr
from neutron.db import model_base
from neutron.db import models_v2
@ -27,29 +25,6 @@ from neutron_lbaas._i18n import _
from neutron_lbaas.services.loadbalancer import constants as lb_const
class HasTenant(object):
# NOTE(dasm): Temporary solution!
# Remove when I87a8ef342ccea004731ba0192b23a8e79bc382dc will be merged!
project_id = sa.Column(sa.String(attr.TENANT_ID_MAX_LEN), index=True)
def __init__(self, *args, **kwargs):
# NOTE(dasm): debtcollector requires init in class
super(HasTenant, self).__init__(*args, **kwargs)
def get_tenant_id(self):
return self.project_id
def set_tenant_id(self, value):
self.project_id = value
@declarative.declared_attr
def tenant_id(cls):
return orm.synonym(
'project_id',
descriptor=property(cls.get_tenant_id, cls.set_tenant_id))
class SessionPersistenceV2(model_base.BASEV2):
__tablename__ = "lbaas_sessionpersistences"
@ -91,7 +66,7 @@ class LoadBalancerStatistics(model_base.BASEV2):
return value
class MemberV2(model_base.BASEV2, models_v2.HasId, HasTenant):
class MemberV2(model_base.BASEV2, model_base.HasId, model_base.HasProject):
"""Represents a v2 neutron load balancer member."""
NAME = 'member'
@ -118,7 +93,8 @@ class MemberV2(model_base.BASEV2, models_v2.HasId, HasTenant):
return self.pool.loadbalancer
class HealthMonitorV2(model_base.BASEV2, models_v2.HasId, HasTenant):
class HealthMonitorV2(model_base.BASEV2, model_base.HasId,
model_base.HasProject):
"""Represents a v2 neutron load balancer healthmonitor."""
NAME = 'healthmonitor'
@ -144,7 +120,7 @@ class HealthMonitorV2(model_base.BASEV2, models_v2.HasId, HasTenant):
return self.pool.loadbalancer
class LoadBalancer(model_base.BASEV2, models_v2.HasId, HasTenant):
class LoadBalancer(model_base.BASEV2, model_base.HasId, model_base.HasProject):
"""Represents a v2 neutron load balancer."""
NAME = 'loadbalancer'
@ -186,7 +162,7 @@ class LoadBalancer(model_base.BASEV2, models_v2.HasId, HasTenant):
return self
class PoolV2(model_base.BASEV2, models_v2.HasId, HasTenant):
class PoolV2(model_base.BASEV2, model_base.HasId, model_base.HasProject):
"""Represents a v2 neutron load balancer pool."""
NAME = 'pool'
@ -267,7 +243,7 @@ class SNI(model_base.BASEV2):
return self.listener.loadbalancer
class L7Rule(model_base.BASEV2, models_v2.HasId, HasTenant):
class L7Rule(model_base.BASEV2, model_base.HasId, model_base.HasProject):
"""Represents L7 Rule."""
NAME = 'l7rule'
@ -294,7 +270,7 @@ class L7Rule(model_base.BASEV2, models_v2.HasId, HasTenant):
return self.policy.listener.loadbalancer
class L7Policy(model_base.BASEV2, models_v2.HasId, HasTenant):
class L7Policy(model_base.BASEV2, model_base.HasId, model_base.HasProject):
"""Represents L7 Policy."""
NAME = 'l7policy'
@ -335,7 +311,7 @@ class L7Policy(model_base.BASEV2, models_v2.HasId, HasTenant):
return self.listener.loadbalancer
class Listener(model_base.BASEV2, models_v2.HasId, HasTenant):
class Listener(model_base.BASEV2, model_base.HasId, model_base.HasProject):
"""Represents a v2 neutron listener."""
NAME = 'listener'