From 84057593a306781e692203b9a13fd22b1859bee7 Mon Sep 17 00:00:00 2001 From: asarfaty Date: Wed, 4 Nov 2020 08:10:54 +0200 Subject: [PATCH] NSX|P: Fix octavia operating status DISABLED status is not supported by octavia. Using OFFLINE instead. Change-Id: Ia59bda7314d64c3f82f8d56450ccf149846d84bb --- vmware_nsx/services/lbaas/lb_const.py | 7 +++++-- .../lbaas/nsx_p/implementation/loadbalancer_mgr.py | 5 ++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/vmware_nsx/services/lbaas/lb_const.py b/vmware_nsx/services/lbaas/lb_const.py index 5f7dc5d838..880c06e336 100644 --- a/vmware_nsx/services/lbaas/lb_const.py +++ b/vmware_nsx/services/lbaas/lb_const.py @@ -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' diff --git a/vmware_nsx/services/lbaas/nsx_p/implementation/loadbalancer_mgr.py b/vmware_nsx/services/lbaas/nsx_p/implementation/loadbalancer_mgr.py index 1d97d886b9..3f96c813bd 100644 --- a/vmware_nsx/services/lbaas/nsx_p/implementation/loadbalancer_mgr.py +++ b/vmware_nsx/services/lbaas/nsx_p/implementation/loadbalancer_mgr.py @@ -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)