diff options
Diffstat (limited to 'yardstick')
| -rwxr-xr-x | yardstick/cmd/NSBperf.py | 6 | ||||
| -rw-r--r-- | yardstick/network_services/traffic_profile/rfc2544.py | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/yardstick/cmd/NSBperf.py b/yardstick/cmd/NSBperf.py index 7be44eeea..dd96b7fc8 100755 --- a/yardstick/cmd/NSBperf.py +++ b/yardstick/cmd/NSBperf.py @@ -25,11 +25,15 @@ import json import subprocess import signal + +from six.moves import input + CLI_PATH = os.path.dirname(os.path.realpath(__file__)) REPO_PATH = os.path.abspath(os.path.join(CLI_PATH, os.pardir)) PYTHONPATH = os.environ.get("PYTHONPATH", False) VIRTUAL_ENV = os.environ.get("VIRTUAL_ENV", False) + if not PYTHONPATH or not VIRTUAL_ENV: print("Please setup env PYTHONPATH & VIRTUAL_ENV environment varaible.") raise SystemExit(1) @@ -58,7 +62,7 @@ class YardstickNSCli(object): choice = int(choice) if not 1 <= choice <= choice_len: print("\nInvalid wrong choice...") - raw_input("Press Enter to continue...") + input("Press Enter to continue...") return 1 subprocess.call(['clear']) return 0 diff --git a/yardstick/network_services/traffic_profile/rfc2544.py b/yardstick/network_services/traffic_profile/rfc2544.py index c6facc9f5..99964d329 100644 --- a/yardstick/network_services/traffic_profile/rfc2544.py +++ b/yardstick/network_services/traffic_profile/rfc2544.py @@ -14,6 +14,7 @@ """ RFC2544 Throughput implemenation """ from __future__ import absolute_import +from __future__ import division import logging from yardstick.network_services.traffic_profile.traffic_profile \ |