On Friday 28 June 2013 13:04:39 Stefan Stanacar wrote:
> Python's telnetlib Telnet class connects only to AF_INET sockets, but we
> want to use Unix domain socket for the qemu serial connection.
> Also add a new read_all_timeout method similar to Telnet's read_all
>
> Signed-off-by: Stefan Stanacar <stefanx.stana...@intel.com>
> ---
> meta/lib/oeqa/utils/oetelnetlib.py | 49
> ++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+)
> create mode 100644 meta/lib/oeqa/utils/oetelnetlib.py
>
> diff --git a/meta/lib/oeqa/utils/oetelnetlib.py
> b/meta/lib/oeqa/utils/oetelnetlib.py new file mode 100644
> index 0000000..cdebac1
> --- /dev/null
> +++ b/meta/lib/oeqa/utils/oetelnetlib.py
> @@ -0,0 +1,49 @@
> +import socket
> +import time
> +import re
> +from telnetlib import Telnet
> +
> +class oeTelnet(Telnet):
> +
> + """
> + Override Telnet class to use unix domain sockets,
> + Telnet uses AF_INET for socket, we don't want that.
> + Also, provide a read_all variant with timeout, that
> + returns whatever output there is.
> + """
> +
> + def __init__(self, stream=None, logfile=None):
> +
> + Telnet.__init__(self, host=None)
> + self.stream = stream
> + self.logfile = logfile
> + if stream is not None:
> + self.open(stream)
> +
> + def log(self, msg):
> + if self.logfile:
> + with open(self.logfile, "a") as f:
> + f.write("%s\n" % msg)
> +
> + def open(self, stream):
> +
> + self.eof = 0
> + self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
> + self.sock.connect(stream)
> +
> + def read_all_timeout(self, match, timeout=120):
> + """Read until EOF or until timeout or until match.
> + """
> + ret = False
> + self.process_rawq()
> + endtime = time.time() + timeout
> + while not self.eof and time.time() < endtime:
> + self.fill_rawq()
> + self.process_rawq()
> + if re.search(match, self.cookedq):
> + ret = True
> + break
> + buf = self.cookedq
> + self.cookedq = ''
> + self.log(buf)
> + return (ret, buf)
Just a minor bit of feedback about this; I think it's probably best not to
call it something relating to "telnet" since it's no longer really telnet when
using unix domain sockets.
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
