From 5a2a6d28619133ce9be8d2705d820168a43dabc0 Mon Sep 17 00:00:00 2001 From: Brian Haley Date: Wed, 8 Aug 2018 10:58:33 -0400 Subject: [PATCH] Fix import style Based on the current import style guide, https://docs.openstack.org/charm-guide/latest/coding-guidelines.html#import-style it is recommended to not import a function directly, but instead import the module and use module.function(). Do this for the is_distributed_router function in l3_hamode_db. Trivialfix Change-Id: Ie52f3a2480f337d90535baed90a4b6d824d3a51f --- neutron/db/l3_hamode_db.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neutron/db/l3_hamode_db.py b/neutron/db/l3_hamode_db.py index 2bec742ce50..4ef1daa79d3 100644 --- a/neutron/db/l3_hamode_db.py +++ b/neutron/db/l3_hamode_db.py @@ -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)