Updating drivers
Changes Include:
* Modifying some log levels
* Remove some IDE injected code
* Fix for some disconnect bug which resulted in a loop of disconnect calls
* Add json support for Leaders in onosclidriver
* Add json support for pendingMap in onosclidriver
* Add json support for partitions in onosclidriver
* Add json support for nodes in onosclidriver
* In git pull function, add option to fast forward only and set as default
* Add more expects in git pull, mostly for when pulling results in a merge
* Add another expect for onosStop function
diff --git a/TestON/drivers/common/cli/emulator/remotemininetdriver.py b/TestON/drivers/common/cli/emulator/remotemininetdriver.py
index 8e445a9..e451335 100644
--- a/TestON/drivers/common/cli/emulator/remotemininetdriver.py
+++ b/TestON/drivers/common/cli/emulator/remotemininetdriver.py
@@ -299,7 +299,7 @@
self.handle.sendline( "" )
i = self.handle.expect( [ 'No\ssuch\device', 'listening\son',
pexpect.TIMEOUT, "\$" ], timeout=10 )
- main.log.warn( self.handle.before + self.handle.after )
+ main.log.info( self.handle.before + self.handle.after )
if i == 0:
main.log.error( self.name + ": tcpdump - No such device exists.\
tcpdump attempted on: " + intf )
@@ -591,7 +591,6 @@
if actionType == 'remove':
# -D is the 'delete' rule of iptables
actionRemove = '-D'
- # noinspection PyBroadException
try:
self.handle.sendline( "" )
# Delete a specific rule specified into the function