Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Adding new test case for prox Standalone L3FWD."
[yardstick.git]
/
yardstick
/
network_services
/
traffic_profile
/
http_ixload.py
diff --git
a/yardstick/network_services/traffic_profile/http_ixload.py
b/yardstick/network_services/traffic_profile/http_ixload.py
index
3ccec63
..
9210f3c
100644
(file)
--- a/
yardstick/network_services/traffic_profile/http_ixload.py
+++ b/
yardstick/network_services/traffic_profile/http_ixload.py
@@
-16,6
+16,14
@@
import sys
import os
import logging
import collections
import os
import logging
import collections
+import subprocess
+try:
+ libs = subprocess.check_output(
+ 'python -c "import site; print(site.getsitepackages())"', shell=True)
+
+ sys.path.extend(libs[1:-1].replace("'", "").split(','))
+except subprocess.CalledProcessError:
+ pass
# ixload uses its own py2. So importing jsonutils fails. So adding below
# workaround to support call from yardstick
# ixload uses its own py2. So importing jsonutils fails. So adding below
# workaround to support call from yardstick
@@
-24,7
+32,7
@@
try:
except ImportError:
import json as jsonutils
except ImportError:
import json as jsonutils
-from yardstick.common import exceptions
+from yardstick.common import exceptions
#pylint: disable=wrong-import-position
try:
from IxLoad import IxLoad, StatCollectorUtils
try:
from IxLoad import IxLoad, StatCollectorUtils