Browse Source

Merge "NSX|P: Fix octavia operating status" into stable/train

changes/02/761502/1
Zuul 2 months ago
committed by Gerrit Code Review
parent
commit
a5d9b64c0e
2 changed files with 7 additions and 5 deletions
  1. +5
    -2
      vmware_nsx/services/lbaas/lb_const.py
  2. +2
    -3
      vmware_nsx/services/lbaas/nsx_p/implementation/loadbalancer_mgr.py

+ 5
- 2
vmware_nsx/services/lbaas/lb_const.py View File

@@ -127,13 +127,16 @@ LISTENERS = 'listeners'
POOLS = 'pools'
MEMBERS = 'members'

# Operating statuses
ONLINE = 'ONLINE'
OFFLINE = 'OFFLINE'
DEGRADED = 'DEGRADED'
ENABLED = 'ENABLED'
DISABLED = 'DISABLED'
ACTIVE = 'ACTIVE'
ERROR = 'ERROR'
UNKNOWN = 'UNKNOWN'

# Admin states
ENABLED = 'ENABLED'
DISABLED = 'DISABLED'

VMWARE_LB_VIP_OWNER = 'vmware-lb-vip'

+ 2
- 3
vmware_nsx/services/lbaas/nsx_p/implementation/loadbalancer_mgr.py View File

@@ -303,10 +303,9 @@ def _nsx_status_to_lb_status(nsx_status):
'NO_STANDBY']:
return lb_const.ONLINE
# 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
if nsx_status.upper() == 'DISABLED':
return lb_const.DISABLED

# default fallback
LOG.debug("NSX LB status %s - interpreted as ONLINE", nsx_status)


Loading…
Cancel
Save