From 95f2491ed89ac99b0d8bd006b4a13cbeb1eb96ce Mon Sep 17 00:00:00 2001 From: "Michael S. Pedersen" Date: Tue, 3 Dec 2019 11:38:32 +0000 Subject: NFVBENCH-153 Add support for python3 JIRA: NFVBENCH-153 Done using 2to3-3.6 with additional changes to fix data parsing and testing (tox) Signed-off-by: Michael S. Pedersen Change-Id: I242902f800da543d780507828c9bd1fbf409da6d --- nfvbench/traffic_server.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nfvbench/traffic_server.py') diff --git a/nfvbench/traffic_server.py b/nfvbench/traffic_server.py index 8d1cf0f..c87f8c3 100644 --- a/nfvbench/traffic_server.py +++ b/nfvbench/traffic_server.py @@ -16,7 +16,7 @@ import os import subprocess import yaml -from log import LOG +from .log import LOG class TrafficServerException(Exception): @@ -71,7 +71,7 @@ class TRexTrafficServer(TrafficServer): try: result = yaml.safe_load(stream) except yaml.YAMLError as exc: - print exc + print(exc) 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: - LOG.warn("No threads defined for socket %s", core.socket) + LOG.warning("No threads defined for socket %s", core.socket) core_result = """ - socket : {socket} threads : [{threads}]""".format(socket=core.socket, threads=threads) -- cgit 1.2.3-korg