commit ba90deed4cdce7a9f7ceb4204ae5e5e5206e443f
author You Wang <you@onlab.us> Tue Mar 30 16:15:02 2021 +0000
committer Gerrit Code Review <gerrit@onosproject.org> Tue Mar 30 16:15:02 2021 +0000
tree f1ceb35fbe34064950510c7cdf3072e52404f5e5
parent 22e807efba96f596c3227b4f92d6f60f0bf65988
parent 327bad4729feabdca332c7baf7d9e27d44b081bb

Merge "Driver/utils fixes"

TestON/drivers/common/cli/onosclidriver.py

diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 2c63c0c..cc6fa9f 100755
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -4952,7 +4952,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" )