x/vmware-nsx
Code Issues Proposed changes

NSX|P: Fix octavia operating status

Browse Source 
DISABLED status is not supported by octavia. Using OFFLINE instead.

Change-Id: Ia59bda7314d64c3f82f8d56450ccf149846d84bb
This commit is contained in:
asarfaty 2020-11-04 08:10:54 +02:00
parent 7545a29719
commit 32229c3760
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vmware_nsx/services/lbaas/lb_const.py
View File

@ -127,13 +127,16 @@ LISTENERS = 'listeners'
POOLS = 'pools' POOLS = 'pools'
MEMBERS = 'members' MEMBERS = 'members'
# Operating statuses
ONLINE = 'ONLINE' ONLINE = 'ONLINE'
OFFLINE = 'OFFLINE' OFFLINE = 'OFFLINE'
DEGRADED = 'DEGRADED' DEGRADED = 'DEGRADED'
ENABLED = 'ENABLED'
DISABLED = 'DISABLED'
ACTIVE = 'ACTIVE' ACTIVE = 'ACTIVE'
ERROR = 'ERROR' ERROR = 'ERROR'
UNKNOWN = 'UNKNOWN' UNKNOWN = 'UNKNOWN'
# Admin states
ENABLED = 'ENABLED'
DISABLED = 'DISABLED'
VMWARE_LB_VIP_OWNER = 'vmware-lb-vip' VMWARE_LB_VIP_OWNER = 'vmware-lb-vip'

5
vmware_nsx/services/lbaas/nsx_p/implementation/loadbalancer_mgr.py
View File

@ -235,10 +235,9 @@ def _nsx_status_to_lb_status(nsx_status):
'NO_STANDBY']: 'NO_STANDBY']:
return lb_const.ONLINE return lb_const.ONLINE
# Statuses that are considered OFFLINE: # Statuses that are considered OFFLINE:
if nsx_status.upper() in ['PRIMARY_DOWN', 'DETACHED', 'DOWN', 'ERROR']: if nsx_status.upper() in ['PRIMARY_DOWN', 'DETACHED', 'DOWN', 'ERROR',
'DISABLED']:
return lb_const.OFFLINE return lb_const.OFFLINE
if nsx_status.upper() == 'DISABLED':
return lb_const.DISABLED
# default fallback # default fallback
LOG.debug("NSX LB status %s - interpreted as ONLINE", nsx_status) LOG.debug("NSX LB status %s - interpreted as ONLINE", nsx_status)