From 19be1cdc636cb6b5eb43b54ca002b6d200632072 Mon Sep 17 00:00:00 2001 From: junbo Date: Mon, 11 Jun 2018 17:34:02 +0800 Subject: [PATCH] add enabled/disable on lbaas listener copy listener.admin_state_up to vse dict Change-Id: Ib6e4747978033bfee4a1e6c1f955954d6ab08a63 --- .../services/lbaas/nsx_v/implementation/listener_mgr.py | 3 ++- .../tests/unit/nsx_v/test_edge_loadbalancer_driver_v2.py | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/vmware_nsx/services/lbaas/nsx_v/implementation/listener_mgr.py b/vmware_nsx/services/lbaas/nsx_v/implementation/listener_mgr.py index 56721b0e34..78a3a094f9 100644 --- a/vmware_nsx/services/lbaas/nsx_v/implementation/listener_mgr.py +++ b/vmware_nsx/services/lbaas/nsx_v/implementation/listener_mgr.py @@ -90,7 +90,8 @@ def listener_to_edge_vse(context, listener, vip_address, default_pool, 'defaultPoolId': default_pool, 'accelerationEnabled': ( listener['protocol'] == lb_const.LB_PROTOCOL_TCP), - 'applicationProfileId': app_profile_id} + 'applicationProfileId': app_profile_id, + 'enabled': listener['admin_state_up']} # Add the L7 policies if listener['l7_policies']: diff --git a/vmware_nsx/tests/unit/nsx_v/test_edge_loadbalancer_driver_v2.py b/vmware_nsx/tests/unit/nsx_v/test_edge_loadbalancer_driver_v2.py index 36daf534ac..42f1af7b67 100644 --- a/vmware_nsx/tests/unit/nsx_v/test_edge_loadbalancer_driver_v2.py +++ b/vmware_nsx/tests/unit/nsx_v/test_edge_loadbalancer_driver_v2.py @@ -51,7 +51,8 @@ EDGE_VIP_ID = 'vip-aaa' EDGE_VIP_DEF = {'protocol': 'http', 'name': 'vip_' + LISTENER_ID, 'connectionLimit': 0, 'defaultPoolId': None, 'ipAddress': LB_VIP, 'port': 80, 'accelerationEnabled': False, - 'applicationProfileId': EDGE_APP_PROFILE_ID, 'description': ''} + 'applicationProfileId': EDGE_APP_PROFILE_ID, 'description': '', + 'enabled': True} LISTENER_BINDING = {'loadbalancer_id': LB_ID, 'listener_id': LISTENER_ID, 'app_profile_id': EDGE_APP_PROFILE_ID, @@ -117,7 +118,8 @@ class BaseTestEdgeLbaasV2(base.BaseTestCase): self.listener = lb_models.Listener(LISTENER_ID, LB_TENANT_ID, 'l-name', '', None, LB_ID, 'HTTP', protocol_port=80, - loadbalancer=self.lb) + loadbalancer=self.lb, + admin_state_up=True) self.sess_persist = lb_models.SessionPersistence(type='HTTP_COOKIE') self.pool = lb_models.Pool(POOL_ID, LB_TENANT_ID, 'pool-name', '', None, 'HTTP', 'ROUND_ROBIN', @@ -449,7 +451,8 @@ class TestEdgeLbaasV2Listener(BaseTestEdgeLbaasV2): new_listener = lb_models.Listener(LISTENER_ID, LB_TENANT_ID, 'l-name', '', None, LB_ID, 'HTTP', protocol_port=8000, - loadbalancer=self.lb) + loadbalancer=self.lb, + admin_state_up=True) new_listener.default_pool = self.pool with mock.patch.object(nsxv_db, 'get_nsxv_lbaas_listener_binding'