x
/
vmware-nsx
Code Issues Proposed changes

Make sure Octavia status reports has the member id 

In case the member ID is missing from the report, the driver agent will fail.
This patch:
1. remove the member from the report with a warning if id was not found
2. look for the id in the octavia DB while normalizing the member-ip

Change-Id: I52fa087ea3d37c2e37250107ebdbeb97d6693f82
This commit is contained in:
asarfaty 2020-10-15 14:34:04 +02:00
parent be7d4e192d
commit 4ee5b62ead
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
vmware_nsx/services/lbaas/octavia/octavia_driver.py
View File

@ -14,6 +14,7 @@
# under the License.
import copy
import ipaddress
import socket
import time
@ -563,16 +564,31 @@ class NSXOctaviaDriverEndpoint(driver_lib.DriverLibrary):
def update_loadbalancer_status(self, ctxt, status):
# refresh the driver lib session
self.db_session = db_apis.get_session()
for member in status.get('members', []):
if member.get('id'):
pass
elif member.get('member_ip') and member.get('pool_id'):
db_member = self.repositories.member.get(
self.db_session,
pool_id=member['pool_id'],
ip_address=member['member_ip'])
if db_member:
member['id'] = db_member.id
if status.get('members', []):
# Make sure all the members have ids
fixed_members = []
for member in status['members']:
if member.get('id'):
fixed_members.append(member)
elif member.get('member_ip') and member.get('pool_id'):
# Find the member id by the normalized member-ip in the
# octavia DB
norm_ip = str(ipaddress.ip_address(member['member_ip']))
db_members, _ = self.repositories.member.get_all(
self.db_session,
pool_id=member['pool_id'])
for db_member in db_members:
norm_db = str(ipaddress.ip_address(
db_member.ip_address))
if norm_db == norm_ip:
member['id'] = db_member.id
fixed_members.append(member)
break
if not member.get('id'):
LOG.warning("update_loadbalancer_status: could not "
"find the ID of member %s of pool %s",
member['member_ip'], member['pool_id'])
status['members'] = fixed_members
try:
return super(NSXOctaviaDriverEndpoint,
self).update_loadbalancer_status(status)