From c347879b5e3ecf85c82cb724efd6596406a269d5 Mon Sep 17 00:00:00 2001
From: "jose.lausuch" <jose.lausuch@ericsson.com>
Date: Wed, 7 Oct 2015 18:28:41 +0200
Subject: ODL test suite requirements.pip moved to general requirements

create_env script removed. Modules already installed in the docker image

Change-Id: Ied166532b47f0f3b6189251776c984df9cf3570d
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
---
 docker/requirements.pip                       |  6 ++++-
 testcases/Controllers/ODL/CI/create_venv.sh   | 35 ---------------------------
 testcases/Controllers/ODL/CI/requirements.pip |  4 ---
 testcases/Controllers/ODL/CI/start_tests.sh   | 12 ---------
 4 files changed, 5 insertions(+), 52 deletions(-)
 delete mode 100755 testcases/Controllers/ODL/CI/create_venv.sh
 delete mode 100644 testcases/Controllers/ODL/CI/requirements.pip

diff --git a/docker/requirements.pip b/docker/requirements.pip
index 22c8199d..e8b09271 100644
--- a/docker/requirements.pip
+++ b/docker/requirements.pip
@@ -6,4 +6,8 @@ python-glanceclient==1.1.0
 python-keystoneclient==1.6.0
 cloudify==3.2.1
 virtualenv==1.11.4
-pexpect==4.0
\ No newline at end of file
+pexpect==4.0
+requests==2.8.0
+robotframework==2.9.1
+robotframework-requests==0.3.8
+robotframework-sshlibrary==2.1.1
diff --git a/testcases/Controllers/ODL/CI/create_venv.sh b/testcases/Controllers/ODL/CI/create_venv.sh
deleted file mode 100755
index 19d9b49c..00000000
--- a/testcases/Controllers/ODL/CI/create_venv.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash -e
-
-# Script checks that venv exists. If it doesn't it will be created
-# It requires python2.7 and virtualenv packages installed
-
-BASEDIR=`dirname $0`
-
-function venv_install() {
-    if command -v virtualenv-2.7; then
-        virtualenv-2.7 $1
-    elif command -v virtualenv2; then
-        virtualenv2 $1
-    elif command -v virtualenv; then
-        virtualenv $1
-    else
-        echo Cannot find virtualenv command.
-        return 1
-    fi
-}
-
-# exit when something goes wrong during venv install
-set -e
-if [ ! -d "$BASEDIR/venv" ]; then
-    venv_install $BASEDIR/venv
-    echo "Virtualenv created."
-fi
-
-if [ ! -f "$BASEDIR/venv/updated" -o $BASEDIR/requirements.pip -nt $BASEDIR/venv/updated ]; then
-    source $BASEDIR/venv/bin/activate
-    pip install -r $BASEDIR/requirements.pip
-    touch $BASEDIR/venv/updated
-    echo "Requirements installed."
-    deactivate
-fi
-set +e
diff --git a/testcases/Controllers/ODL/CI/requirements.pip b/testcases/Controllers/ODL/CI/requirements.pip
deleted file mode 100644
index 43845e25..00000000
--- a/testcases/Controllers/ODL/CI/requirements.pip
+++ /dev/null
@@ -1,4 +0,0 @@
-requests
-robotframework
-robotframework-requests
-robotframework-sshlibrary
diff --git a/testcases/Controllers/ODL/CI/start_tests.sh b/testcases/Controllers/ODL/CI/start_tests.sh
index 56f4d564..0b1c4a7f 100755
--- a/testcases/Controllers/ODL/CI/start_tests.sh
+++ b/testcases/Controllers/ODL/CI/start_tests.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
-# Script requires that test environment is created already
 # it includes python2.7 virtual env with robot packages and git
-# use create_env.sh script for creating python virtualenv
 
 BASEDIR=`dirname $0`
 # Colors
@@ -62,12 +60,6 @@ sed -i "s/\"password\": \".*\"/\"password\": \"${PASS}\"/" ${BASEDIR}/integratio
 sed -i "/^Documentation.*/a Suite Teardown     Stop Suite" ${BASEDIR}/integration/test/csit/suites/openstack/neutron/__init__.robot
 sed -i "/^Documentation.*/a Suite Setup        Start Suite" ${BASEDIR}/integration/test/csit/suites/openstack/neutron/__init__.robot
 
-if source $BASEDIR/venv/bin/activate; then
-    echo -e "${green}Python virtualenv activated.${nc}"
-else
-    echo -e "${red}ERROR${nc}"
-    exit 1
-fi
 
 # add custom tests to suite, if there are more custom tests needed this will be reworked
 echo -e "${green}Copy custom tests to suite.${nc}"
@@ -100,7 +92,3 @@ done
 
 echo -e "${green}Final report is located:${nc}"
 rebot $rebot_params
-
-# deactivate venv
-echo -e "${green}Deactivate venv.${nc}"
-deactivate
-- 
cgit 1.2.3-korg