commit 69f347b72fcf28d9c314b6a0d8117bd4e87128ec
author You Wang <you@opennetworking.org> Wed Feb 27 16:50:47 2019 -0800
committer You Wang <you@opennetworking.org> Thu Feb 28 23:27:06 2019 +0000
tree 98bff1bcc7867adda4367b6ea389683449c26f09
parent cacd568b8de7b241280c82150ecb4a45bfb5a055

[ONOS-7937] Add option to skip alarm logging in cleanAndExit

Change-Id: Ibee1688e8ac426798c21f0c347af7d4e8c2ca6cf
(cherry picked from commit 7880b371b7ada1dfc1ef5ae2beee1e2b57070895)

TestON/drivers/common/api/controller/onosrestdriver.py

diff --git a/TestON/drivers/common/api/controller/onosrestdriver.py b/TestON/drivers/common/api/controller/onosrestdriver.py
index 915c29b..af4309d 100755
--- a/TestON/drivers/common/api/controller/onosrestdriver.py
+++ b/TestON/drivers/common/api/controller/onosrestdriver.py
@@ -123,9 +123,9 @@
             if debug:
                 main.log.debug( response )
             return ( response.status_code, response.text.encode( 'utf8' ) )
-        except requests.exceptions:
+        except requests.ConnectionError:
             main.log.exception( "Error sending request." )
-            return None
+            return ( None, None )
         except Exception:
             main.log.exception( self.name + ": Uncaught exception!" )
             main.cleanAndExit()