Merge "Fix programming error of ryu-plugin"

This commit is contained in:
Jenkins 2012-09-03 19:59:12 +00:00 committed by Gerrit Code Review
commit d03b79feaf

View File

@ -148,7 +148,7 @@ class OVSQuantumOFPRyuAgent:
def _all_bindings(self, db): def _all_bindings(self, db):
"""return interface id -> port which include network id bindings""" """return interface id -> port which include network id bindings"""
return dict((port.device_id, port) for port in db.ports.all()) return dict((port.id, port) for port in db.ports.all())
def _set_port_status(self, port, status): def _set_port_status(self, port, status):
port.status = status port.status = status
@ -190,13 +190,13 @@ class OVSQuantumOFPRyuAgent:
if old_b == new_b: if old_b == new_b:
continue continue
if not old_b: if old_b:
LOG.info("Removing binding to net-id = %s for %s", LOG.info("Removing binding to net-id = %s for %s",
old_b, str(port)) old_b, str(port))
if port.vif_id in all_bindings: if port.vif_id in all_bindings:
self._set_port_status(all_bindings[port.vif_id], self._set_port_status(all_bindings[port.vif_id],
constants.PORT_STATUS_DOWN) constants.PORT_STATUS_DOWN)
if not new_b: if new_b:
if port.vif_id in all_bindings: if port.vif_id in all_bindings:
self._set_port_status(all_bindings[port.vif_id], self._set_port_status(all_bindings[port.vif_id],
constants.PORT_STATUS_ACTIVE) constants.PORT_STATUS_ACTIVE)