Merge branch 'databecker_jetzt_lerne_ich_octavia' of github.com:SovereignCloudStack/openstack-workload-generator into databecker_jetzt_lerne_ich_octavia

Author: Marc Schöchlin

openstack_workload_generator

@@ -1,35 +1,35 @@
 #!/bin/bash
 
-rundir="$(dirname $(readlink -f $0))"
+rundir="$(dirname "$(readlink -f "$0")")"
 cd "$rundir" || exit 1
 
 modification_time(){
   python3 -c "import os; print(int(os.path.getmtime('$1')))"
 }
 
-export VIRTUAL_ENV="${VIRTUAL_ENV:-${rundir}/venv}"
+export OWG_VIRTUAL_ENV="${OWG_VIRTUAL_ENV:-${rundir}/venv}"
 
 create_env(){
    set -e
-   rm -rf "${VIRTUAL_ENV}"
-   python3 -m venv "${VIRTUAL_ENV}"
-   source "${VIRTUAL_ENV}/bin/activate"
+   rm -rf "${OWG_VIRTUAL_ENV}"
+   python3 -m venv "${OWG_VIRTUAL_ENV}"
+   source "${OWG_VIRTUAL_ENV}/bin/activate"
    pip install -r "${rundir}/requirements.txt"
-   touch -r "${rundir}/requirements.txt" "${VIRTUAL_ENV}/bin/activate"
+   touch -r "${rundir}/requirements.txt" "${OWG_VIRTUAL_ENV}/bin/activate"
    set +e
 }
 
 
-if ! [ -d "${VIRTUAL_ENV}" ] ;then
-   echo "Creating venv: ${VIRTUAL_ENV}" >&2
+if ! [ -d "${OWG_VIRTUAL_ENV}" ] ;then
+   echo "Creating venv: ${OWG_VIRTUAL_ENV}" >&2
    echo
    create_env
-elif [[ "$(modification_time "${rundir}/requirements.txt")" -gt "$(modification_time "${VIRTUAL_ENV}/bin/activate")" ]];then
-   echo "Recreating venv: ${VIRTUAL_ENV}" >&2
+elif [[ "$(modification_time "${rundir}/requirements.txt")" -gt "$(modification_time "${OWG_VIRTUAL_ENV}/bin/activate")" ]];then
+   echo "Recreating venv: ${OWG_VIRTUAL_ENV}" >&2
    echo
    create_env
 else
-   source "${VIRTUAL_ENV}/bin/activate"
+   source "${OWG_VIRTUAL_ENV}/bin/activate"
 fi
 
 
@@ -38,4 +38,4 @@ if [ "$1" = "deps" ];then
 fi
 
 export PYTHONPATH="$rundir/src/"
-exec "${VIRTUAL_ENV}/bin/python" -m openstack_workload_generator "$@"
+exec "${OWG_VIRTUAL_ENV}/bin/python" -m openstack_workload_generator "$@"

requirements.txt

@@ -2,7 +2,7 @@ requests==2.32.2
 cachetools==5.3.2
 requests==2.32.2
 coloredlogs==15.0.1
-setuptools==70.0.0
+setuptools==78.1.1
 Jinja2==3.1.6
 PyYAML==6.0.1
 types-pyyaml