aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/python/TrafficGenerator.py
diff options
context:
space:
mode:
authorMiroslav Los <miroslav.los@pantheon.tech>2019-08-14 17:29:33 +0200
committerMiroslav Los <miroslav.los@pantheon.tech>2019-08-14 17:29:33 +0200
commit669d320bc64e41f879c047a39a66b8ec99bf4b1e (patch)
tree969f5240ed44dc38bcc3de55f6f3c51675c08f75 /resources/libraries/python/TrafficGenerator.py
parent37a9451377f7239365b5af778b8072d1585a2d2a (diff)
DO_NOT_MERGE CSIT-1194 - Framework easy pylint improvements
- force a python2 environment in tox for pylint - let pylint load some compiled modules for member checking - allow locally enabled pylint rules - ignore bad enum names - ignore complexity for code to be refactored by other tickets - broad excepts are acceptable sometimes Signed-off-by: Miroslav Los <miroslav.los@pantheon.tech> Change-Id: If4c3a1b85e8609f074e1de8ce91fc9c4fedbeb38
Diffstat (limited to 'resources/libraries/python/TrafficGenerator.py')
-rw-r--r--resources/libraries/python/TrafficGenerator.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py
index 334e299f3e..cc968f8e09 100644
--- a/resources/libraries/python/TrafficGenerator.py
+++ b/resources/libraries/python/TrafficGenerator.py
@@ -443,10 +443,10 @@ class TrafficGenerator(AbstractMeasurer):
# we need to encode them, so that repr() does not lead with 'u'.
if isinstance(rate, unicode):
rate = rate.encode("utf-8")
- if isinstance(duration, unicode):
- duration = duration.encode("utf-8")
- if isinstance(warmup_time, unicode):
- warmup_time = warmup_time.encode("utf-8")
+ if not isinstance(duration, (float, int)):
+ duration = float(duration)
+ if not isinstance(warmup_time, (float, int)):
+ warmup_time = float(warmup_time)
command = (
"sh -c '{tool}/resources/tools/trex/trex_stateless_profile.py"
" --profile {prof}/resources/traffic_profiles/trex/{traffic}.py"