x/vmware-nsx
Code Issues Proposed changes

Merge "change port bindings shim"

Browse Source
This commit is contained in:
Zuul 2018-07-08 09:25:31 +00:00 committed by Gerrit Code Review
commit 1588c0306d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vmware_nsx/db/nsx_portbindings_db.py
View File

@ -24,10 +24,10 @@ from neutron_lib import constants
from neutron_lib import exceptions
from neutron_lib.plugins import directory
from neutron.common import utils as common_utils
from neutron.db import _resource_extend as resource_extend
from neutron.db import api as db_api
from neutron.db import portbindings_db as pbin_db
from neutron.plugins.common import utils as p_utils
from neutron.plugins.ml2 import models as pbin_model
from vmware_nsx._i18n import _
from vmware_nsx.common import nsx_constants
@ -158,10 +158,10 @@ class NsxPortBindingMixin(pbin_db.PortBindingMixin):
if port_db.nsx_port_attributes:
port_res[pbin.VNIC_TYPE] = port_db.nsx_port_attributes.vnic_type
# TODO(boden): remove p_utils check when neutron patch lands
# see https://review.openstack.org/#/c/571041
if hasattr(p_utils, 'get_port_binding_by_status_and_host'):
binding = p_utils.get_port_binding_by_status_and_host(
# TODO(boden): remove common_utils check when neutron patch lands
# see https://review.openstack.org/#/c/414251
if hasattr(common_utils, 'get_port_binding_by_status_and_host'):
binding = common_utils.get_port_binding_by_status_and_host(
port_db.port_bindings, constants.ACTIVE)
else:
binding = port_db.port_binding