x/vmware-nsx
Code Issues Proposed changes

NSXv3: Add new tags for LBaaS resources

Browse Source 
Multiple LBaaS load balancers can share the same LB service. But
listener and virtual server is 1:1 mapping. So, in this patch, we
add os-lbaas-lb-name and os-lbaas-lb-id on virtual server to map
LBaaS load balancer. Also, add member name and member id as
display_name for NSXv3 LB member.

Change-Id: I7a52ec704b33a1596c41892c4d9a45a462c9d4a1
This commit is contained in:
Tong Liu 2017-08-14 17:53:22 +00:00
parent 803a6bffe4
commit b1335ea1a0
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vmware_nsx/services/lbaas/nsx_v3/listener_mgr.py
View File

@ -46,6 +46,10 @@ class EdgeListenerManager(base_mgr.Nsxv3LoadbalancerBaseManager):
lb_const.LB_LISTENER_TYPE, lb_const.LB_LISTENER_TYPE,
listener.tenant_id, listener.tenant_id,
context.project_name) context.project_name)
tags.append({'scope': 'os-lbaas-lb-name',
'tag': listener.loadbalancer.name})
tags.append({'scope': 'os-lbaas-lb-id',
'tag': lb_id})
if listener.protocol == 'HTTP' or listener.protocol == 'HTTPS': if listener.protocol == 'HTTP' or listener.protocol == 'HTTPS':
profile_type = lb_const.LB_HTTP_PROFILE profile_type = lb_const.LB_HTTP_PROFILE
elif listener.protocol == 'TCP': elif listener.protocol == 'TCP':

2
vmware_nsx/services/lbaas/nsx_v3/member_mgr.py
View File

@ -131,7 +131,7 @@ class EdgeMemberManager(base_mgr.Nsxv3LoadbalancerBaseManager):
lb_pool = pool_client.get(lb_pool_id) lb_pool = pool_client.get(lb_pool_id)
old_m = lb_pool.get('members', None) old_m = lb_pool.get('members', None)
new_m = [{'display_name': member.name, new_m = [{'display_name': member.name[:219] + '_' + member.id,
'ip_address': fixed_ip, 'ip_address': fixed_ip,
'port': member.protocol_port, 'port': member.protocol_port,
'weight': member.weight}] 'weight': member.weight}]

4
vmware_nsx/tests/unit/services/lbaas/test_nsxv3_driver.py
View File

@ -68,7 +68,7 @@ POOL_BINDING = {'loadbalancer_id': LB_ID,
'lb_vs_id': LB_VS_ID} 'lb_vs_id': LB_VS_ID}
MEMBER_ID = 'mmm-mmm' MEMBER_ID = 'mmm-mmm'
MEMBER_ADDRESS = '10.0.0.200' MEMBER_ADDRESS = '10.0.0.200'
LB_MEMBER = {'display_name': 'member-' + MEMBER_ID, LB_MEMBER = {'display_name': 'member1_' + MEMBER_ID,
'weight': 1, 'ip_address': MEMBER_ADDRESS, 'port': 80} 'weight': 1, 'ip_address': MEMBER_ADDRESS, 'port': 80}
LB_POOL_WITH_MEMBER = { LB_POOL_WITH_MEMBER = {
"display_name": "httppool1", "display_name": "httppool1",
@ -135,7 +135,7 @@ class BaseTestEdgeLbaasV2(base.BaseTestCase):
loadbalancer=self.lb) loadbalancer=self.lb)
self.member = lb_models.Member(MEMBER_ID, LB_TENANT_ID, POOL_ID, self.member = lb_models.Member(MEMBER_ID, LB_TENANT_ID, POOL_ID,
MEMBER_ADDRESS, 80, 1, pool=self.pool, MEMBER_ADDRESS, 80, 1, pool=self.pool,
name='member-mmm-mmm') name='member1')
self.hm = lb_models.HealthMonitor(HM_ID, LB_TENANT_ID, 'PING', 3, 3, self.hm = lb_models.HealthMonitor(HM_ID, LB_TENANT_ID, 'PING', 3, 3,
1, pool=self.pool, name='hm1') 1, pool=self.pool, name='hm1')
self.l7policy = lb_models.L7Policy(L7POLICY_ID, LB_TENANT_ID, self.l7policy = lb_models.L7Policy(L7POLICY_ID, LB_TENANT_ID,