Merge "Fix refstack_defcore"

diff --combined docker/Dockerfile
index 8fc735f,6f7aee7..d38713e
--- 1/docker/Dockerfile
--- 2/docker/Dockerfile
+++ b/docker/Dockerfile
@@@ -90,6 -90,7 +90,6 @@@ RUN ln -s /usr/local/lib/python2.7/dist
  # OPNFV repositories
  RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper ${REPOS_DIR}/copper
  RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/domino ${REPOS_DIR}/domino
 -RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/parser ${REPOS_DIR}/parser
  RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/doctor ${REPOS_DIR}/doctor
  RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/promise ${REPOS_DIR}/promise
  RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/netready ${REPOS_DIR}/netready
@@@ -117,7 -118,8 +117,7 @@@ RUN find -L ${FUNCTEST_REPO_DIR} -name 
      -not -path "*functest_venv*" \
      |xargs grep \#\! |cut -d\:  -f 1 |xargs chmod -c 755
  
 -RUN /bin/bash ${REPOS_DIR}/parser/tests/parser_install.sh ${REPOS_DIR}
 -RUN wget -q https://raw.githubusercontent.com/openstack/rally/${RALLY_TAG}/install_rally.sh \
 +RUN wget -q https://git.openstack.org/cgit/openstack/rally/plain/install_rally.sh?h=${RALLY_TAG} -O install_rally.sh \
      && bash install_rally.sh --branch ${RALLY_TAG} --yes && rm install_rally.sh
  
  RUN add_images.sh
@@@ -131,6 -133,7 +131,7 @@@ RUN /bin/bash -c ". /usr/local/lib/pyth
  # refstack-client integration
  RUN wget -q https://raw.githubusercontent.com/openstack/refstack-client/master/setup_env \
      && bash setup_env -t ${REFSTACK_TAG} && rm setup_env
+ RUN ln -s ${HOME}/.tempest /usr/local/lib/python2.7/dist-packages/.tempest
  
  RUN /bin/bash -c ". /etc/profile.d/rvm.sh \
      && cd ${REPOS_VNFS_DIR}/vims-test \

diff --combined docker/Dockerfile.aarch64
index 3affd4a,d68c490..77c94b0
--- 1/docker/Dockerfile.aarch64
--- 2/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@@ -85,6 -85,7 +85,6 @@@ RUN pip install ${PIP_OPTS} 
  # OPNFV repositories
  RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper ${REPOS_DIR}/copper
  RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/domino ${REPOS_DIR}/domino
 -RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/parser ${REPOS_DIR}/parser
  RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/doctor ${REPOS_DIR}/doctor
  RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/promise ${REPOS_DIR}/promise
  
@@@ -109,7 -110,8 +109,7 @@@ RUN find -L ${FUNCTEST_REPO_DIR} -name 
      -not -path "*functest_venv*" \
      |xargs grep \#\! |cut -d\:  -f 1 |xargs chmod -c 755
  
 -RUN /bin/bash ${REPOS_DIR}/parser/tests/parser_install.sh ${REPOS_DIR}
 -RUN wget -q https://raw.githubusercontent.com/openstack/rally/${RALLY_TAG}/install_rally.sh \
 +RUN wget -q https://git.openstack.org/cgit/openstack/rally/plain/install_rally.sh?h=${RALLY_TAG} -O install_rally.sh \
      && bash install_rally.sh --branch ${RALLY_TAG} --yes && rm install_rally.sh
  
  RUN add_images.sh
@@@ -123,6 -125,7 +123,7 @@@ RUN /bin/bash -c ". /usr/local/lib/pyth
  # refstack-client integration
  RUN wget -q https://raw.githubusercontent.com/openstack/refstack-client/master/setup_env \
      && bash setup_env -t ${REFSTACK_TAG} && rm setup_env
+ RUN ln -s ${HOME}/.tempest /usr/local/lib/python2.7/dist-packages/.tempest
  
  RUN /bin/bash -c ". /etc/profile.d/rvm.sh \
      && cd ${REPOS_VNFS_DIR}/vims-test \

diff --combined functest/ci/config_functest.yaml
index 2e86cc5,ed9df13..42daaa1
--- 1/functest/ci/config_functest.yaml
--- 2/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@@ -11,6 -11,7 +11,6 @@@ general
          repo_barometer:     /home/opnfv/repos/barometer
          repo_doctor:        /home/opnfv/repos/doctor
          repo_copper:        /home/opnfv/repos/copper
 -        repo_parser:        /home/opnfv/repos/parser
          repo_domino:        /home/opnfv/repos/domino
          repo_snaps:         /home/opnfv/repos/snaps
          repo_fds:           /home/opnfv/repos/fds
@@@ -23,7 -24,6 +23,6 @@@
          ims_data:           /home/opnfv/functest/data/ims/
          functest_images:    /home/opnfv/functest/images
          rally_inst:         /home/opnfv/.rally
-         refstack_client:    /home/opnfv/repos/refstack-client
  
      openstack:
          creds: /home/opnfv/functest/conf/openstack.creds