Minor fix to return values and error checks in OnosCliDriver
Change-Id: I72a77e1c3597a3751cefa91285159822395e0de5
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 6443467..61c38b7 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -2207,7 +2207,7 @@
return returnValue
except ( TypeError, ValueError ):
main.log.exception( "{}: Object not as expected: {!r}".format( self.name, intentsRaw ) )
- return None
+ return main.ERROR
except pexpect.EOF:
main.log.error( self.name + ": EOF exception found" )
main.log.error( self.name + ": " + self.handle.before )
@@ -2797,7 +2797,7 @@
"""
try:
topology = self.getTopology( topologyResult )
- if topology == {}:
+ if topology == {} or topology == None:
return main.ERROR
output = ""
# Is the number of switches is what we expected