Merge "NSXv3: allow use api_workers=-1"

This commit is contained in:
Zuul 2018-01-28 12:15:35 +00:00 committed by Gerrit Code Review
commit 2859a235e6

View File

@ -213,6 +213,7 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
router=l3_db_models.Router, router=l3_db_models.Router,
floatingip=l3_db_models.FloatingIP) floatingip=l3_db_models.FloatingIP)
def __init__(self): def __init__(self):
self.fwaas_callbacks = None
self._is_sub_plugin = tvd_utils.is_tvd_core_plugin() self._is_sub_plugin = tvd_utils.is_tvd_core_plugin()
self.init_is_complete = False self.init_is_complete = False
nsxlib_utils.set_is_attr_callback(validators.is_attr_set) nsxlib_utils.set_is_attr_callback(validators.is_attr_set)
@ -354,7 +355,6 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
}) })
def _init_fwaas(self): def _init_fwaas(self):
self.fwaas_callbacks = None
if fwaas_utils.is_fwaas_v1_plugin_enabled(): if fwaas_utils.is_fwaas_v1_plugin_enabled():
LOG.info("NSXv3 FWaaS v1 plugin enabled") LOG.info("NSXv3 FWaaS v1 plugin enabled")
self.fwaas_callbacks = fwaas_callbacks_v1.Nsxv3FwaasCallbacksV1() self.fwaas_callbacks = fwaas_callbacks_v1.Nsxv3FwaasCallbacksV1()