From: Martin Klozik Date: Wed, 4 May 2016 12:21:14 +0000 (+0100) Subject: bugfix: Fix creation of vsperfenv in Ubuntu X-Git-Tag: colorado.1.0~79^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9bfdb9f76d95cc0d9e8266f85e244f0fac8f069d;p=vswitchperf.git bugfix: Fix creation of vsperfenv in Ubuntu Wrong version of virtualenv was executed in Ubuntu specific script. So python modules could not be installed and vsperf was not working. Hugepages mount point is newly created inside sudo environment to avoid issues with permissions. Change-Id: I4f5afc22bceb2eebbf018c42f42b7074a93e2293 JIRA: VSPERF-292 Signed-off-by: Martin Klozik Reviewed-by: Maryam Tahhan --- diff --git a/systems/ubuntu/14.04/prepare_python_env.sh b/systems/ubuntu/14.04/prepare_python_env.sh index f9c2def8..6ef8680d 100755 --- a/systems/ubuntu/14.04/prepare_python_env.sh +++ b/systems/ubuntu/14.04/prepare_python_env.sh @@ -23,7 +23,7 @@ fi # enable virtual environment in a subshell, so QEMU build can use python 2.7 -(virtualenv-3.4 "$VSPERFENV_DIR" +(virtualenv "$VSPERFENV_DIR" source "$VSPERFENV_DIR"/bin/activate pip install -r ../requirements.txt -pip install pylint) \ No newline at end of file +pip install pylint) diff --git a/tools/hugepages.py b/tools/hugepages.py index 71535922..3a434d6e 100644 --- a/tools/hugepages.py +++ b/tools/hugepages.py @@ -78,7 +78,8 @@ def mount_hugepages(): return if not os.path.exists(settings.getValue('HUGEPAGE_DIR')): - os.makedirs(settings.getValue('HUGEPAGE_DIR')) + tasks.run_task(['sudo', 'mkdir', settings.getValue('HUGEPAGE_DIR')], _LOGGER, + 'Creating directory ' + settings.getValue('HUGEPAGE_DIR'), True) try: tasks.run_task(['sudo', 'mount', '-t', 'hugetlbfs', 'nodev', settings.getValue('HUGEPAGE_DIR')],