[neighbor advertiser] catch all exceptions while trying https endpoint (

sonic-net#757) * [neighbor advertiser] catch all exceptions while trying https endpoint When connecting https endpoint failed, we need to try http endpoint. Therefore we need to catch all exceptions. Signed-off-by: Ying Xie <[email protected]> * raise exception if https returned non-success status code
stepanblyschak · Dec 2, 2019 · 4e272c3 · 4e272c3
1 parent 0816948
commit 4e272c3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/scripts/neighbor_advertiser b/scripts/neighbor_advertiser
@@ -21,7 +21,6 @@ import sonic_device_util
 from swsssdk import ConfigDBConnector
 from swsssdk import SonicV2Connector
 from netaddr import IPAddress, IPNetwork
-from requests.exceptions import ConnectTimeout
 
 
 #
@@ -356,8 +355,9 @@ def wrapped_ferret_request(request_slice, https_endpoint, http_endpoint):
                                      json=request_slice,
                                      timeout=DEFAULT_REQUEST_TIMEOUT,
                                      verify=False)
-    except ConnectTimeout:
-        log_info("HTTPS Ferret endpoint not found, trying HTTP...")
+            response.raise_for_status()
+    except Exception as e:
+        log_info("Connect HTTPS Ferret endpoint failed (error: {}), trying HTTP...".format(e))
         response = requests.post(http_endpoint,
                                  json=request_slice,
                                  timeout=DEFAULT_REQUEST_TIMEOUT)