aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorCarsten Koester <ckoester@cisco.com>2016-05-25 17:52:01 -0400
committerDave Wallace <dwallacelf@gmail.com>2016-06-02 16:51:10 +0000
commit5eb99d868051556dce3d509545d130971d74e1fa (patch)
treeb1bc04fad4c2bbb01e4e52f89b8ae4454618452f /resources
parentc6d2b44a6c8cd5184f9b923889de6d4f2cc529ad (diff)
CSIT-114: Eliminate repeated download of PIP packages
Allow VirtualEnv to use existing system-wide packages if they already exist. Change-Id: I6f39178d56e81affea0bee7b9065bef66712ddaa Signed-off-by: Carsten Koester <ckoester@cisco.com>
Diffstat (limited to 'resources')
-rw-r--r--resources/libraries/python/SetupFramework.py2
-rw-r--r--resources/libraries/python/TrafficScriptExecutor.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/resources/libraries/python/SetupFramework.py b/resources/libraries/python/SetupFramework.py
index ddc5514c4a..b81a3065c6 100644
--- a/resources/libraries/python/SetupFramework.py
+++ b/resources/libraries/python/SetupFramework.py
@@ -102,7 +102,7 @@ def create_env_directory_at_node(node):
ssh = SSH()
ssh.connect(node)
(ret_code, stdout, stderr) = ssh.exec_command(
- 'cd {0} && rm -rf env && virtualenv env && . env/bin/activate && '
+ 'cd {0} && rm -rf env && virtualenv --system-site-packages env && . env/bin/activate && '
'pip install -r requirements.txt'
.format(con.REMOTE_FW_DIR), timeout=100)
if 0 != ret_code:
diff --git a/resources/libraries/python/TrafficScriptExecutor.py b/resources/libraries/python/TrafficScriptExecutor.py
index fa4462393c..108b2b9815 100644
--- a/resources/libraries/python/TrafficScriptExecutor.py
+++ b/resources/libraries/python/TrafficScriptExecutor.py
@@ -52,7 +52,7 @@ class TrafficScriptExecutor(object):
logger.trace("{}".format(timeout))
ssh = SSH()
ssh.connect(node)
- cmd = ("cd {}; virtualenv env && " +
+ cmd = ("cd {}; virtualenv --system-site-packages env && " +
"export PYTHONPATH=${{PWD}}; " +
". ${{PWD}}/env/bin/activate; " +
"resources/traffic_scripts/{} {}") \