From e20a279b28f572a6ef2a5dee6cd38b973ff98248 Mon Sep 17 00:00:00 2001 From: Oleg Bondarev Date: Fri, 10 Apr 2015 12:03:09 +0300 Subject: [PATCH] Use 'port' instead of 'ports' to reference port from IPAllocation 'ports' is just confusing as IPAllocation can be associated with only one port. Closes-Bug: #1442527 Change-Id: I36bfa65956f54e4b290bb7568499a47eca7c126f --- neutron/db/models_v2.py | 2 +- neutron/plugins/ml2/plugin.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/neutron/db/models_v2.py b/neutron/db/models_v2.py index 5067f8ae330..a93676198db 100644 --- a/neutron/db/models_v2.py +++ b/neutron/db/models_v2.py @@ -132,7 +132,7 @@ class Port(model_base.BASEV2, HasId, HasTenant): name = sa.Column(sa.String(attr.NAME_MAX_LEN)) network_id = sa.Column(sa.String(36), sa.ForeignKey("networks.id"), nullable=False) - fixed_ips = orm.relationship(IPAllocation, backref='ports', lazy='joined') + fixed_ips = orm.relationship(IPAllocation, backref='port', lazy='joined') mac_address = sa.Column(sa.String(32), nullable=False) admin_state_up = sa.Column(sa.Boolean(), nullable=False) status = sa.Column(sa.String(16), nullable=False) diff --git a/neutron/plugins/ml2/plugin.py b/neutron/plugins/ml2/plugin.py index f3f8b2ab38c..6656a88d290 100644 --- a/neutron/plugins/ml2/plugin.py +++ b/neutron/plugins/ml2/plugin.py @@ -884,7 +884,7 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2, "having IP allocation on subnet " "%(subnet)s, cannot delete"), {'ip': user_alloc.ip_address, - 'port_id': user_alloc.ports.id, + 'port_id': user_alloc.port_id, 'subnet': id}) raise exc.SubnetInUse(subnet_id=id) else: @@ -915,7 +915,7 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2, data = {attributes.PORT: {'fixed_ips': [{'subnet_id': ip.subnet_id, 'ip_address': ip.ip_address} - for ip in a.ports.fixed_ips + for ip in a.port.fixed_ips if ip.subnet_id != id]}} try: self.update_port(context, a.port_id, data)