From 315c1354318f7cb118bfada4bb107267d81c0eb6 Mon Sep 17 00:00:00 2001 From: Tong Liu Date: Sun, 28 May 2017 00:04:03 +0000 Subject: [PATCH] LBaaS: Share lb_const module for nsxv and nsxv3 Since nsxv and nsxv3 LBaaS driver use most of the same constant definitions, move the lb_const module under base lbaas directory to share between nsxv and nsxv3 driver. Change-Id: I314939675ebbed8a0bd571514c0075f1cf6af999 --- .../services/lbaas/{nsx_v/lbaas_const.py => lb_const.py} | 0 vmware_nsx/services/lbaas/nsx_v/v2/healthmon_mgr.py | 2 +- vmware_nsx/services/lbaas/nsx_v/v2/l7policy_mgr.py | 2 +- vmware_nsx/services/lbaas/nsx_v/v2/listener_mgr.py | 2 +- vmware_nsx/services/lbaas/nsx_v/v2/pool_mgr.py | 4 ++-- 5 files changed, 5 insertions(+), 5 deletions(-) rename vmware_nsx/services/lbaas/{nsx_v/lbaas_const.py => lb_const.py} (100%) diff --git a/vmware_nsx/services/lbaas/nsx_v/lbaas_const.py b/vmware_nsx/services/lbaas/lb_const.py similarity index 100% rename from vmware_nsx/services/lbaas/nsx_v/lbaas_const.py rename to vmware_nsx/services/lbaas/lb_const.py diff --git a/vmware_nsx/services/lbaas/nsx_v/v2/healthmon_mgr.py b/vmware_nsx/services/lbaas/nsx_v/v2/healthmon_mgr.py index 592e6653ef..6d06289ce7 100644 --- a/vmware_nsx/services/lbaas/nsx_v/v2/healthmon_mgr.py +++ b/vmware_nsx/services/lbaas/nsx_v/v2/healthmon_mgr.py @@ -21,8 +21,8 @@ from vmware_nsx.common import locking from vmware_nsx.db import nsxv_db from vmware_nsx.plugins.nsx_v.vshield.common import exceptions as nsxv_exc from vmware_nsx.services.lbaas import base_mgr +from vmware_nsx.services.lbaas import lb_const from vmware_nsx.services.lbaas.nsx_v import lbaas_common as lb_common -from vmware_nsx.services.lbaas.nsx_v import lbaas_const as lb_const LOG = logging.getLogger(__name__) diff --git a/vmware_nsx/services/lbaas/nsx_v/v2/l7policy_mgr.py b/vmware_nsx/services/lbaas/nsx_v/v2/l7policy_mgr.py index 1ebeff33c6..d06521fc4d 100644 --- a/vmware_nsx/services/lbaas/nsx_v/v2/l7policy_mgr.py +++ b/vmware_nsx/services/lbaas/nsx_v/v2/l7policy_mgr.py @@ -24,8 +24,8 @@ from vmware_nsx._i18n import _ from vmware_nsx.common import locking from vmware_nsx.db import nsxv_db from vmware_nsx.services.lbaas import base_mgr +from vmware_nsx.services.lbaas import lb_const from vmware_nsx.services.lbaas.nsx_v import lbaas_common as lb_common -from vmware_nsx.services.lbaas.nsx_v import lbaas_const as lb_const LOG = logging.getLogger(__name__) diff --git a/vmware_nsx/services/lbaas/nsx_v/v2/listener_mgr.py b/vmware_nsx/services/lbaas/nsx_v/v2/listener_mgr.py index 9ecfdea620..3b311fd709 100644 --- a/vmware_nsx/services/lbaas/nsx_v/v2/listener_mgr.py +++ b/vmware_nsx/services/lbaas/nsx_v/v2/listener_mgr.py @@ -23,8 +23,8 @@ from vmware_nsx.common import locking from vmware_nsx.db import nsxv_db from vmware_nsx.plugins.nsx_v.vshield.common import exceptions as vcns_exc from vmware_nsx.services.lbaas import base_mgr +from vmware_nsx.services.lbaas import lb_const from vmware_nsx.services.lbaas.nsx_v import lbaas_common as lb_common -from vmware_nsx.services.lbaas.nsx_v import lbaas_const as lb_const LOG = logging.getLogger(__name__) diff --git a/vmware_nsx/services/lbaas/nsx_v/v2/pool_mgr.py b/vmware_nsx/services/lbaas/nsx_v/v2/pool_mgr.py index e249100e0b..f766110a02 100644 --- a/vmware_nsx/services/lbaas/nsx_v/v2/pool_mgr.py +++ b/vmware_nsx/services/lbaas/nsx_v/v2/pool_mgr.py @@ -23,8 +23,8 @@ from vmware_nsx.common import locking from vmware_nsx.db import nsxv_db from vmware_nsx.plugins.nsx_v.vshield.common import exceptions as nsxv_exc from vmware_nsx.services.lbaas import base_mgr +from vmware_nsx.services.lbaas import lb_const from vmware_nsx.services.lbaas.nsx_v import lbaas_common as lb_common -from vmware_nsx.services.lbaas.nsx_v import lbaas_const as lb_const from vmware_nsx.services.lbaas.nsx_v.v2 import listener_mgr LOG = logging.getLogger(__name__) @@ -160,7 +160,7 @@ class EdgePoolManager(base_mgr.EdgeLoadbalancerBaseManager): # the pool session persistence may affect the associated # pool application profile if (pool.session_persistence and listener.default_pool and - listener.default_pool.id == pool.id): + listener.default_pool.id == pool.id): listeners_to_update.append(listener) listener_binding = nsxv_db.get_nsxv_lbaas_listener_binding(