commit 327bad4729feabdca332c7baf7d9e27d44b081bb
author You Wang <you@opennetworking.org> Wed Mar 24 14:19:58 2021 -0700
committer You Wang <you@opennetworking.org> Mon Mar 29 17:03:57 2021 -0700
tree 8a9dd0311a36f2c1a9c4485e7ff2565bd279bf5a
parent be3a2acb195a7e7f39081138409a5b9e5dd22fb3

Driver/utils fixes

Change-Id: I4aa1d3c6a1cc48ad788ed33650fb4b00292602ef

TestON/drivers/common/cli/onosclidriver.py

diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 80dfe7c..1e31f31 100755
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -4955,7 +4955,7 @@
             address = json.loads( output ).get( 'node' )
             self.address = address
             return address
-        except TypeError:
+        except ( TypeError, ValueError ):
             main.log.exception( self.name + ": Object not as expected" )
             return None
         except Exception:

TestON/tests/dependencies/utils.py

diff --git a/TestON/tests/dependencies/utils.py b/TestON/tests/dependencies/utils.py
index de61ae2..8aaca08 100644
--- a/TestON/tests/dependencies/utils.py
+++ b/TestON/tests/dependencies/utils.py
@@ -88,7 +88,7 @@
                                                               "/tmp/karaf.log",
                                                               direction="from" )
             else:
-                scpResult = scpResult and main.ONOSbench.scp( ctrl,
+                scpResult = scpResult and main.ONOSbench.scp( ctrl.server,
                                                               "/opt/onos/log/karaf.log",
                                                               "/tmp/karaf.log",
                                                               direction="from" )