Rebase openshift/kuryr-kubernetes from https://opendev.org/openstack/kuryr-kubernetes

kuryr_kubernetes/controller/drivers/lbaasv2.py

@@ -877,7 +877,7 @@ def _wait_for_provisioning(self, loadbalancer, timeout,
                           {'status': status, 'lb': loadbalancer,
                            'rem': remaining})
 
-        raise k_exc.ResourceNotReady(loadbalancer)
+        raise k_exc.LoadBalancerNotReady(loadbalancer['id'], status)
 
     def _wait_for_deletion(self, loadbalancer, timeout,
                            interval=_LB_STS_POLL_FAST_INTERVAL):

kuryr_kubernetes/controller/drivers/nested_vlan_vif.py

@@ -122,7 +122,7 @@ def request_vifs(self, pod, project_id, subnets, security_groups,
     def activate_vif(self, vif, pod=None, retry_info=None):
         try:
             super().activate_vif(vif)
-        except k_exc.ResourceNotReady:
+        except k_exc.PortNotReady:
             if retry_info and retry_info.get('elapsed', 0) > ACTIVE_TIMEOUT:
                 parent_port = self._get_parent_port(pod)
                 trunk_id = self._get_trunk_id(parent_port)

kuryr_kubernetes/controller/drivers/neutron_vif.py

@@ -105,7 +105,7 @@ def activate_vif(self, vif, **kwargs):
             raise k_exc.ResourceNotReady(vif)
 
         if port['status'] != kl_const.PORT_STATUS_ACTIVE:
-            raise k_exc.ResourceNotReady(vif)
+            raise k_exc.PortNotReady(vif.id, port['status'])
 
         vif.active = True
 

kuryr_kubernetes/exceptions.py

@@ -38,6 +38,23 @@ def __init__(self, resource):
         super(ResourceNotReady, self).__init__("Resource not ready: %r" % msg)
 
 
+class LoadBalancerNotReady(ResourceNotReady):
+    def __init__(self, loadbalancer_id, status):
+        super().__init__(
+            'Loadbalancer %s is stuck in %s status for several minutes. This '
+            'is unexpected and indicates problem with OpenStack Octavia. '
+            'Please contact your OpenStack administrator.' % (
+                loadbalancer_id, status))
+
+
+class PortNotReady(ResourceNotReady):
+    def __init__(self, port_id, status):
+        super().__init__(
+            'Port %s is stuck in %s status for several minutes. This '
+            'is unexpected and indicates problem with OpenStack Neutron. '
+            'Please contact your OpenStack administrator.' % (port_id, status))
+
+
 class K8sResourceNotFound(K8sClientException):
     def __init__(self, resource):
         super(K8sResourceNotFound, self).__init__("Resource not "