git://git.onelab.eu
/
tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
no more lxc-enter-namespace - use ssh
[tests.git]
/
system
/
tcptest.py
diff --git
a/system/tcptest.py
b/system/tcptest.py
index
3879a40
..
abdc6fb
100755
(executable)
--- a/
system/tcptest.py
+++ b/
system/tcptest.py
@@
-3,11
+3,19
@@
# Thierry Parmentelat <thierry.parmentelat@inria.fr>
# Copyright (C) 2010 INRIA
#
# Thierry Parmentelat <thierry.parmentelat@inria.fr>
# Copyright (C) 2010 INRIA
#
+
+# this is a small and simple standalone utility
+# designed to run in slice-space
+# we keep this in python2 for now until python3
+# can be taken for granted in sliceimage
+
+from __future__ import print_function
+
import sys
import time
import subprocess
import socket
import sys
import time
import subprocess
import socket
-import
sockets
erver
+import
SocketS
erver
import threading
from optparse import OptionParser
import threading
from optparse import OptionParser
@@
-22,12
+30,12
@@
def show_network_status(id):
myprint("ip route show", id=id)
subprocess.call(['ip', 'route', 'show'])
myprint("ip route show", id=id)
subprocess.call(['ip', 'route', 'show'])
-class EchoRequestHandler(
sockets
erver.StreamRequestHandler):
+class EchoRequestHandler(
SocketS
erver.StreamRequestHandler):
def handle(self):
line = self.rfile.readline()
self.wfile.write(line)
def handle(self):
line = self.rfile.readline()
self.wfile.write(line)
-class UppercaseRequestHandler(
sockets
erver.StreamRequestHandler):
+class UppercaseRequestHandler(
SocketS
erver.StreamRequestHandler):
def handle(self):
line = self.rfile.readline()
self.wfile.write(line.upper())
def handle(self):
line = self.rfile.readline()
self.wfile.write(line.upper())
@@
-52,7
+60,7
@@
class Server:
myprint("==================== tcptest.py server", id='server')
show_network_status(id='server')
myprint("==================== tcptest.py server", id='server')
show_network_status(id='server')
- server =
sockets
erver.TCPServer((options.address, options.port),
+ server =
SocketS
erver.TCPServer((options.address, options.port),
UppercaseRequestHandler)
try:
if options.timeout:
UppercaseRequestHandler)
try:
if options.timeout: