Added logic to remove the ansi color esacpe sequence from devices(), links(), ports() functions
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 109a3b2..3318f71 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -24,6 +24,7 @@
import traceback
import os.path
import pydoc
+import re
sys.path.append("../")
from drivers.common.clidriver import CLI
@@ -416,6 +417,12 @@
str(grep_str)+"'")
self.handle.expect("devices -j | grep '"+str(grep_str)+"'")
self.handle.expect("onos>")
+ handle = self.handle.before
+ print "repr(handle) =", repr(handle)
+ ansi_escape = re.compile(r'\r\r\n\x1b[^m]*m')
+ handle1 = ansi_escape.sub('', handle)
+ print "repr(handle1) = ", repr(handle1)
+ return handle1
else:
if not grep_str:
self.handle.sendline("devices")
@@ -428,10 +435,16 @@
self.handle.expect("onos>")
self.handle.sendline("")
self.handle.expect("onos>")
+<<<<<<< HEAD
+ handle = self.handle.before
+ print "handle =",handle
+ return handle
+=======
handle = self.handle.before
return handle
+>>>>>>> d1192e144d179c68864828aa6a339764d69d1216
except pexpect.EOF:
main.log.error(self.name + ": EOF exception found")
main.log.error(self.name + ": " + self.handle.before)
@@ -464,6 +477,12 @@
str(grep_str)+"'")
self.handle.expect("links -j | grep '"+str(grep_str)+"'")
self.handle.expect("onos>")
+ handle = self.handle.before
+ print "repr(handle) =", repr(handle)
+ ansi_escape = re.compile(r'\r\r\n\x1b[^m]*m')
+ handle1 = ansi_escape.sub('', handle)
+ print "repr(handle1) = ", repr(handle1)
+ return handle1
else:
if not grep_str:
self.handle.sendline("links")
@@ -477,9 +496,15 @@
self.handle.sendline("")
self.handle.expect("onos>")
+<<<<<<< HEAD
+ handle = self.handle.before
+ print "handle =",handle
+ return handle
+=======
handle = self.handle.before
return handle
+>>>>>>> d1192e144d179c68864828aa6a339764d69d1216
except pexpect.EOF:
main.log.error(self.name + ": EOF exception found")
main.log.error(self.name + ": " + self.handle.before)
@@ -513,6 +538,12 @@
str(grep_str)+"'")
self.handle.expect("ports -j | grep '"+str(grep_str)+"'")
self.handle.expect("onos>")
+ print "repr(handle) =", repr(handle)
+ ansi_escape = re.compile(r'\r\r\n\x1b[^m]*m')
+ handle1 = ansi_escape.sub('', handle)
+ print "repr(handle1) = ", repr(handle1)
+ return handle1
+
else:
if not grep_str:
self.handle.sendline("ports")
@@ -525,10 +556,16 @@
self.handle.expect("onos>")
self.handle.sendline("")
self.handle.expect("onos>")
+<<<<<<< HEAD
+ handle = self.handle.before
+ print "handle =",handle
+ return handle
+=======
handle = self.handle.before
return handle
+>>>>>>> d1192e144d179c68864828aa6a339764d69d1216
except pexpect.EOF:
main.log.error(self.name + ": EOF exception found")
main.log.error(self.name + ": " + self.handle.before)