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

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'

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)