Code Review
/
nfvbench.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
NFVBENCH-153 Add support for python3
[nfvbench.git]
/
nfvbench
/
traffic_server.py
diff --git
a/nfvbench/traffic_server.py
b/nfvbench/traffic_server.py
index
8d1cf0f
..
c87f8c3
100644
(file)
--- a/
nfvbench/traffic_server.py
+++ b/
nfvbench/traffic_server.py
@@
-16,7
+16,7
@@
import os
import subprocess
import yaml
import subprocess
import yaml
-from log import LOG
+from
.
log import LOG
class TrafficServerException(Exception):
class TrafficServerException(Exception):
@@
-71,7
+71,7
@@
class TRexTrafficServer(TrafficServer):
try:
result = yaml.safe_load(stream)
except yaml.YAMLError as exc:
try:
result = yaml.safe_load(stream)
except yaml.YAMLError as exc:
- print
exc
+ print
(exc)
return result
def __save_config(self, generator_config, filename):
return result
def __save_config(self, generator_config, filename):
@@
-119,7
+119,7
@@
class TRexTrafficServer(TrafficServer):
try:
threads = ",".join([repr(thread) for thread in core.threads])
except TypeError:
try:
threads = ",".join([repr(thread) for thread in core.threads])
except TypeError:
- LOG.warn("No threads defined for socket %s", core.socket)
+ LOG.warn
ing
("No threads defined for socket %s", core.socket)
core_result = """
- socket : {socket}
threads : [{threads}]""".format(socket=core.socket, threads=threads)
core_result = """
- socket : {socket}
threads : [{threads}]""".format(socket=core.socket, threads=threads)