openstack
/
neutron
Code Issues Proposed changes

Merge "Fix import style"

This commit is contained in:
Zuul 2018-09-06 10:59:57 +00:00 committed by Gerrit Code Review
parent c98159e580 5a2a6d2861
commit eaff4be1c1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/db/l3_hamode_db.py
View File

@ -51,7 +51,6 @@ from neutron.db import _utils as db_utils
from neutron.db import api as db_api
from neutron.db.availability_zone import router as router_az_db
from neutron.db import l3_dvr_db
from neutron.db.l3_dvr_db import is_distributed_router
from neutron.db.models import l3ha as l3ha_model
from neutron.objects import base
from neutron.objects import l3_hamode
@ -337,7 +336,8 @@ class L3_HA_NAT_db_mixin(l3_dvr_db.L3_NAT_with_dvr_db_mixin,
router_is_uuid = isinstance(router, six.string_types)
if router_is_uuid:
router = self._get_router(context, router)
if is_ha_router(router) and not is_distributed_router(router):
if (is_ha_router(router) and not
l3_dvr_db.is_distributed_router(router)):
return constants.DEVICE_OWNER_HA_REPLICATED_INT
return super(L3_HA_NAT_db_mixin,
self)._get_device_owner(context, router)