Wrap the Functest and install it as module by pip.

JIRA: FUNCTEST-538

1. PYTHONPATH is removed.
2. Functest will be installed by pip.
3. Dockerfile is updated accordingly.

Change-Id: Ie4eed9df045b121e2688dcb34c25779db775f104
Signed-off-by: helenyao <yaohelan@huawei.com>

diff --git a/docker/Dockerfile b/docker/Dockerfile
index b0f5cc9..995d1ca 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -40,9 +40,7 @@ ENV repos_dir /home/opnfv/repos
 ENV creds /home/opnfv/functest/conf/openstack.creds
 ENV TERM xterm
 ENV COLORTERM gnome-terminal
-ENV PYTHONPATH $PYTHONPATH:/home/opnfv/repos/
 ENV CONFIG_FUNCTEST_YAML /home/opnfv/repos/functest/functest/ci/config_functest.yaml
-ENV PYTHONPATH $PYTHONPATH:/home/opnfv/repos/:/home/opnfv/repos/functest
 WORKDIR /home/opnfv
 
 # Packaged dependencies
@@ -105,6 +103,7 @@ RUN git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwat
 RUN git clone --depth 1 https://github.com/wuwenbin2/OnosSystemTest.git ${repos_dir}/onos
 
 RUN pip install -r ${repos_dir}/functest/docker/requirements.pip
+RUN cd ${repos_dir}/functest && pip install .
 RUN pip install -r ${repos_dir}/rally/requirements.txt
 RUN pip install -r ${repos_dir}/tempest/requirements.txt
 
@@ -152,4 +151,3 @@ RUN echo set nocompatible >> /home/opnfv/.exrc
 RUN echo "alias ll='ls -lh' \n\
 . /home/opnfv/repos/functest/functest/cli/functest-complete.sh" \
 >> /home/opnfv/.bashrc
-RUN cd ${repos_dir}/functest/functest/cli && pip install .

diff --git a/setup.py b/setup.py
index c192bd9..872b089 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,22 +1,29 @@
-##############################################################################
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-from setuptools import setup, find_packages
-
-
-setup(
-    name="functest",
-    version="master",
-    packages=find_packages(),
-    include_package_data=True,
-    package_data={
-    },
-    url="https://www.opnfv.org",
-    install_requires=["coverage==4.1",
-                      "mock==1.3.0",
-                      "nose==1.3.7"],
-)
+##############################################################################\r
+# All rights reserved. This program and the accompanying materials\r
+# are made available under the terms of the Apache License, Version 2.0\r
+# which accompanies this distribution, and is available at\r
+# http://www.apache.org/licenses/LICENSE-2.0\r
+##############################################################################\r
+\r
+from setuptools import setup, find_packages\r
+\r
+\r
+setup(\r
+    name="functest",\r
+    version="master",\r
+    py_modules=['cli_base'],\r
+    packages=find_packages(),\r
+    include_package_data=True,\r
+    package_data={\r
+    },\r
+    url="https://www.opnfv.org",\r
+    install_requires=["coverage==4.1",\r
+                      "mock==1.3.0",\r
+                      "nose==1.3.7",\r
+                      "click"],\r
+    entry_points={\r
+        'console_scripts': [\r
+            'functest=functest.cli.cli_base:cli'\r
+        ],\r
+    },\r
+)\r