Refine documentation

Change-Id: I0d3387a520e3decf51bb0f7db53996f148a611d0
Signed-off-by: JingLu5 <lvjing5@huawei.com>
(cherry picked from commit 2347f3977823bfd0c4b1fa832d9046b8a625596b)

1 files changed, 212 insertions, 230 deletions

diff --git a/docs/testing/user/userguide/04-installation.rst b/docs/testing/user/userguide/04-installation.rst
index 64955c782..cb7b76714 100644
--- a/docs/testing/user/userguide/04-installation.rst
+++ b/docs/testing/user/userguide/04-installation.rst
@@ -12,7 +12,7 @@ Abstract
 
 Yardstick supports installation by Docker or directly in Ubuntu. The
 installation procedure for Docker and direct installation are detailed in
-the section below.
+the sections below.
 
 To use Yardstick you should have access to an OpenStack environment, with at
 least Nova, Neutron, Glance, Keystone and Heat installed.
@@ -21,56 +21,50 @@ The steps needed to run Yardstick are:
 
 1. Install Yardstick.
 2. Load OpenStack environment variables.
-3. Create a Neutron external network.
-4. Build Yardstick flavor and a guest image.
-5. Load the guest image into the OpenStack environment.
-6. Create the test configuration .yaml file.
-7. Run the test case.
+#. Create Yardstick flavor.
+#. Build a guest image and load it into the OpenStack environment.
+#. Create the test configuration ``.yaml`` file and run the test case/suite.
 
 
 Prerequisites
 -------------
 
-The OPNFV deployment is out of the scope of this document but it can be
-found in http://artifacts.opnfv.org/opnfvdocs/colorado/docs/configguide/index.html.
-The OPNFV platform is considered as the System Under Test (SUT) in this
-document.
+The OPNFV deployment is out of the scope of this document and can be found `here <http://artifacts.opnfv.org/opnfvdocs/colorado/docs/configguide/index.html>`_. The OPNFV platform is considered as the System Under Test (SUT) in this document.
 
 Several prerequisites are needed for Yardstick:
 
-    #. A Jumphost to run Yardstick on
-    #. A Docker daemon shall be installed on the Jumphost
-    #. A public/external network created on the SUT
-    #. Connectivity from the Jumphost to the SUT public/external network
+#. A Jumphost to run Yardstick on
+#. A Docker daemon or a virtual environment installed on the Jumphost
+#. A public/external network created on the SUT
+#. Connectivity from the Jumphost to the SUT public/external network
 
-WARNING: Connectivity from Jumphost is essential and it is of paramount
+**NOTE:** *Jumphost* refers to any server which meets the previous
+requirements. Normally it is the same server from where the OPNFV
+deployment has been triggered.
+
+**WARNING:** Connectivity from Jumphost is essential and it is of paramount
 importance to make sure it is working before even considering to install
 and run Yardstick. Make also sure you understand how your networking is
 designed to work.
 
-NOTE: **Jumphost** refers to any server which meets the previous
-requirements. Normally it is the same server from where the OPNFV
-deployment has been triggered previously.
-
-NOTE: If your Jumphost is operating behind a company http proxy and/or
-Firewall, please consult first the section `Proxy Support`_, towards
-the end of this document. The section details some tips/tricks which
+**NOTE:** If your Jumphost is operating behind a company http proxy and/or
+Firewall, please consult first the section `Proxy Support (**Todo**)`_, towards
+the end of this document. That section details some tips/tricks which
 *may* be of help in a proxified environment.
 
 
-Installing Yardstick using Docker
----------------------------------
+Install Yardstick using Docker (**recommended**)
+---------------------------------------------------
 
-Yardstick has a Docker image,
-**It is recommended to use this Docker image to run Yardstick test**.
+Yardstick has a Docker image. It is recommended to use this Docker image to run Yardstick test.
 
-Pulling the Yardstick Docker image
+Prepare the Yardstick container
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. _dockerhub: https://hub.docker.com/r/opnfv/yardstick/
 
-Pull the Yardstick Docker image (**opnfv/yardstick**) from the public dockerhub
-registry under the OPNFV account: [dockerhub_], with the following docker
+Pull the Yardstick Docker image (``opnfv/yardstick``) from the public dockerhub
+registry under the OPNFV account: dockerhub_, with the following docker
 command::
 
   docker pull opnfv/yardstick:stable
@@ -82,14 +76,11 @@ following docker command::
   REPOSITORY         TAG       IMAGE ID        CREATED      SIZE
   opnfv/yardstick    stable    a4501714757a    1 day ago    915.4 MB
 
-Run the Docker image to get a Yardstick container
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-::
+Run the Docker image to get a Yardstick container::
 
   docker run -itd --privileged -v /var/run/docker.sock:/var/run/docker.sock -p 8888:5000 -e INSTALLER_IP=192.168.200.2 -e INSTALLER_TYPE=compass --name yardstick opnfv/yardstick:stable
 
-note:
+Note:
 
 +----------------------------------------------+------------------------------+
 | parameters                                   | Detail                       |
@@ -102,34 +93,34 @@ note:
 |                                              | background.                  |
 +----------------------------------------------+------------------------------+
 | --privileged                                 | If you want to build         |
-|                                              | yardstick-image in yardstick |
-|                                              | container, this parameter is |
-|                                              | needed.                      |
+|                                              | ``yardstick-image`` in       |
+|                                              | Yardstick container, this    |
+|                                              | parameter is needed.         |
 +----------------------------------------------+------------------------------+
 | -e INSTALLER_IP=192.168.200.2                | If you want to use yardstick |
 |                                              | env prepare command(or       |
 | -e INSTALLER_TYPE=compass                    | related API) to load the     |
-|                                              | images that yardstick needs, |
+|                                              | images that Yardstick needs, |
 |                                              | these parameters should be   |
 |                                              | provided.                    |
 |                                              | The INSTALLER_IP and         |
 |                                              | INSTALLER_TYPE are depending |
-|                                              | on your OpenStack installer, |
-|                                              | currently apex, compass,     |
-|                                              | fuel and joid are supported. |
+|                                              | on your OpenStack installer. |
+|                                              | Currently Apex, Compass,     |
+|                                              | Fuel and Joid are supported. |
 |                                              | If you use other installers, |
 |                                              | such as devstack, these      |
 |                                              | parameters can be ignores.   |
 +----------------------------------------------+------------------------------+
 | -p 8888:5000                                 | If you want to call          |
-|                                              | yardstick API out of         |
-|                                              | yardstick container, this    |
+|                                              | Yardstick API out of         |
+|                                              | Yardstick container, this    |
 |                                              | parameter is needed.         |
 +----------------------------------------------+------------------------------+
 | -v /var/run/docker.sock:/var/run/docker.sock | If you want to use yardstick |
 |                                              | env grafana/influxdb to      |
 |                                              | create a grafana/influxdb    |
-|                                              | container out of yardstick   |
+|                                              | container out of Yardstick   |
 |                                              | container, this parameter is |
 |                                              | needed.                      |
 +----------------------------------------------+------------------------------+
@@ -138,158 +129,92 @@ note:
 |                                              | defined by the user.         |
 +----------------------------------------------+------------------------------+
 
-Enter Yardstick container
-^^^^^^^^^^^^^^^^^^^^^^^^^
+Configure the Yardstick container environment
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-::
+There are three ways to configure environments for running Yardstick, which will be shown in the following sections. Before that, enter the Yardstick container::
 
   docker exec -it yardstick /bin/bash
 
-In the container, the Yardstick repository is located in the /home/opnfv/repos
-directory.
-
-In Danube release, we have improved the Yardstick installation steps.
-Now Yardstick provides a CLI to prepare openstack environment variables and
-load yardstick images::
-
-  yardstick env prepare
+and then configure Yardstick environments in the Yardstick container.
 
-If you ues this command. you can skip the following sections about how to
-prepare openstack environment variables, load yardstick images and load
-yardstick flavor manually.
+The first way (**recommended**)
+###################################
 
+In the Yardstick container, the Yardstick repository is located in the ``/home/opnfv/repos`` directory. Yardstick provides a CLI to prepare OpenStack environment variables and create Yardstick flavor and guest images automatically::
 
-Installing Yardstick directly in Ubuntu
----------------------------------------
-
-.. _install-framework:
-
-Alternatively you can install Yardstick framework directly in Ubuntu or in an Ubuntu Docker
-image. No matter which way you choose to install Yardstick framework, the
-following installation steps are identical.
-
-If you choose to use the Ubuntu Docker image, You can pull the Ubuntu
-Docker image from Docker hub:
-
-::
-
-  docker pull ubuntu:16.04
-
-
-Installing Yardstick framework
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Download source code and install Yardstick framework:
-
-::
+  yardstick env prepare
 
-  git clone https://gerrit.opnfv.org/gerrit/yardstick
-  cd yardstick
-  ./install.sh
+**NOTE**: The above command just works for four OPNFV installers -- **Apex**, **Compass**, **Fuel** and **Joid**.
 
-For installing yardstick directly in Ubuntu, the **yardstick env command** is not available.
-You need to prepare openstack environment variables, load yardstick images and load
-yardstick flavor manually.
 
+The second way
+################
 
-OpenStack parameters and credentials
-------------------------------------
+Export OpenStack environment variables
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
-Environment variables
-^^^^^^^^^^^^^^^^^^^^^
-Before running Yardstick it is necessary to export OpenStack environment variables
-from the OpenStack *openrc* file (using the ``source`` command) and export the
-external network name ``export EXTERNAL_NETWORK="external-network-name"``,
-the default name for the external network is ``net04_ext``.
+Before running Yardstick it is necessary to export OpenStack environment variables::
 
-Credential environment variables in the *openrc* file have to include at least:
+  source openrc
 
-* OS_AUTH_URL
-* OS_USERNAME
-* OS_PASSWORD
-* OS_TENANT_NAME
+Environment variables in the ``openrc`` file have to include at least:
 
-A sample openrc file may look like this:
+* ``OS_AUTH_URL``
+* ``OS_USERNAME``
+* ``OS_PASSWORD``
+* ``OS_TENANT_NAME``
+* ``EXTERNAL_NETWORK``
 
-* export OS_PASSWORD=console
-* export OS_TENANT_NAME=admin
-* export OS_AUTH_URL=http://172.16.1.222:35357/v2.0
-* export OS_USERNAME=admin
-* export OS_VOLUME_API_VERSION=2
-* export EXTERNAL_NETWORK=net04_ext
+A sample `openrc` file may look like this::
 
+  export OS_PASSWORD=console
+  export OS_TENANT_NAME=admin
+  export OS_AUTH_URL=http://172.16.1.222:35357/v2.0
+  export OS_USERNAME=admin
+  export OS_VOLUME_API_VERSION=2
+  export EXTERNAL_NETWORK=net04_ext
 
-Yardstick falvor and guest images
----------------------------------
+Manually create Yardstick falvor and guest images
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
-Before executing Yardstick test cases, make sure that yardstick guest image and
-yardstick flavor are available in OpenStack.
-Detailed steps about creating yardstick flavor and building yardstick-trusty-server
-image can be found below.
+Before executing Yardstick test cases, make sure that Yardstick flavor and guest image are available in OpenStack. Detailed steps about creating the Yardstick flavor and building the Yardstick guest image can be found below.
 
-Yardstick-flavor
-^^^^^^^^^^^^^^^^
 Most of the sample test cases in Yardstick are using an OpenStack flavor called
-*yardstick-flavor* which deviates from the OpenStack standard m1.tiny flavor by the
-disk size - instead of 1GB it has 3GB. Other parameters are the same as in m1.tiny.
-
-Create yardstick-flavor:
+``yardstick-flavor`` which deviates from the OpenStack standard ``m1.tiny`` flavor by the disk size - instead of 1GB it has 3GB. Other parameters are the same as in ``m1.tiny``.
 
-::
+Create ``yardstick-flavor``::
 
   nova flavor-create yardstick-flavor 100 512 3 1
 
-
-.. _guest-image:
-
-Building a guest image
-^^^^^^^^^^^^^^^^^^^^^^
 Most of the sample test cases in Yardstick are using a guest image called
-*yardstick-trusty-server* which deviates from an Ubuntu Cloud Server image
+``yardstick-image`` which deviates from an Ubuntu Cloud Server image
 containing all the required tools to run test cases supported by Yardstick.
 Yardstick has a tool for building this custom image. It is necessary to have
-sudo rights to use this tool.
+``sudo`` rights to use this tool.
 
 Also you may need install several additional packages to use this tool, by
-follwing the commands below:
-
-::
+follwing the commands below::
 
-  apt-get update && apt-get install -y \
-      qemu-utils \
-      kpartx
-
-This image can be built using the following command while in the directory where
-Yardstick is installed (``~/yardstick`` if the framework is installed
-by following the commands above):
-
-::
+  sudo apt-get update && sudo apt-get install -y qemu-utils kpartx
 
-  sudo ./tools/yardstick-img-modify tools/ubuntu-server-cloudimg-modify.sh
+This image can be built using the following command in the directory where Yardstick is installed::
 
-**Warning:** the script will create files by default in:
-``/tmp/workspace/yardstick`` and the files will be owned by root!
+  sudo tools/yardstick-img-modify tools/ubuntu-server-cloudimg-modify.sh
 
-If you are building this guest image in inside a docker container make sure the
-container is granted with privilege.
+**Warning:** Before building the guest image inside the Yardstick container, make sure the container is granted with privilege. The script will create files by default in ``/tmp/workspace/yardstick`` and the files will be owned by root!
 
-The created image can be added to OpenStack using the ``glance image-create`` or
-via the OpenStack Dashboard.
-
-Example command:
-
-::
+The created image can be added to OpenStack using the ``glance image-create`` or via the OpenStack Dashboard. Example command is::
 
   glance --os-image-api-version 1 image-create \
   --name yardstick-image --is-public true \
   --disk-format qcow2 --container-format bare \
   --file /tmp/workspace/yardstick/yardstick-image.img
 
-Some Yardstick test cases use a Cirros image and a Ubuntu 14.04 image, you can find one at
-http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img, https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img
+.. _`Cirros 0.3.5`: http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img
+.. _`Ubuntu 14.04`: https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img
 
-Add cirros and ubuntu image to OpenStack:
-
-::
+Some Yardstick test cases use a `Cirros 0.3.5`_ image and/or a `Ubuntu 14.04`_ image. Add Cirros and Ubuntu images to OpenStack::
 
   openstack image create \
       --disk-format qcow2 \
@@ -303,89 +228,146 @@ Add cirros and ubuntu image to OpenStack:
       --file $ubuntu_image_file \
       Ubuntu-14.04
 
-Automatic flavor and image creation
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Yardstick has a script for automatic creating yardstick flavor and building
-guest images. This script is mainly used in CI, but you can still use it in
-your local environment.
+The third way
+################
 
-Example command:
+Similar to the second way, the first step is also to `Export OpenStack environment variables`_. Then the following steps should be done.
 
-::
+Automatically create Yardstcik flavor and guest images
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+
+Yardstick has a script for automatically creating Yardstick flavor and building
+Yardstick guest images. This script is mainly used for CI and can be also used in the local environment::
 
   source $YARDSTICK_REPO_DIR/tests/ci/load_images.sh
 
 
-Examples and verifying the install
-----------------------------------
+Delete the Yardstick container
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If you want to uninstall Yardstick, just delete the Yardstick container::
+
+   docker stop yardstick && docker rm yardstick
+
+
+Install Yardstick directly in Ubuntu
+---------------------------------------
+
+.. _install-framework:
+
+Alternatively you can install Yardstick framework directly in Ubuntu or in an Ubuntu Docker image. No matter which way you choose to install Yardstick, the following installation steps are identical.
+
+If you choose to use the Ubuntu Docker image, you can pull the Ubuntu
+Docker image from Docker hub::
+
+  docker pull ubuntu:16.04
+
+
+Install Yardstick
+^^^^^^^^^^^^^^^^^^^^^
+
+Create a virtual environment::
+
+  virtualenv ~/yardstick_venv
+  source ~/yardstick_venv/bin/activate
+
+Download the source code and install Yardstick from it::
+
+  git clone https://gerrit.opnfv.org/gerrit/yardstick
+  cd yardstick
+  ./install.sh
+
+
+Configure the Yardstick environment (**Todo**)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+For installing Yardstick directly in Ubuntu, the ``yardstick env`` command is not available. You need to prepare OpenStack environment variables and create Yardstick flavor and guest images manually.
+
+
+Uninstall Yardstick
+^^^^^^^^^^^^^^^^^^^^^^
+
+For unistalling Yardstick, just delete the virtual environment::
+
+  rm -rf ~/yardstick_venv
+
+
+Verify the installation
+-----------------------------
 
 It is recommended to verify that Yardstick was installed successfully
-by executing some simple commands and test samples. Before executing yardstick
-test cases make sure yardstick flavor and building yardstick-trusty-server
-image can be found in glance and openrc file is sourced. Below is an example
-invocation of yardstick help command and ping.py test sample:
-::
+by executing some simple commands and test samples. Before executing Yardstick
+test cases make sure ``yardstick-flavor`` and ``yardstick-image`` can be found in OpenStack and the ``openrc`` file is sourced. Below is an example
+invocation of Yardstick ``help`` command and ``ping.py`` test sample::
 
   yardstick -h
   yardstick task start samples/ping.yaml
 
+**NOTE:** The above commands could be run in both the Yardstick container and the Ubuntu directly.
+
 Each testing tool supported by Yardstick has a sample configuration file.
-These configuration files can be found in the **samples** directory.
+These configuration files can be found in the ``samples`` directory.
 
 Default location for the output is ``/tmp/yardstick.out``.
 
 
-Deploy InfluxDB and Grafana locally
-------------------------------------
+Deploy InfluxDB and Grafana using Docker
+-------------------------------------------
 
-The 'yardstick env' command can also help you to build influxDB and Grafana in
-your local environment.
+Without InfluxDB, Yardstick stores results for runnning test case in the file
+``/tmp/yardstick.out``. However, it's unconvenient to retrieve and display
+test results. So we will show how to use InfluxDB to store data and use
+Grafana to display data in the following sections.
 
-Create InfluxDB container and config with the following command::
+Automatically deploy InfluxDB and Grafana containers (**recommended**)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-  yardstick env influxdb
+Firstly, enter the Yardstick container::
 
+  docker exec -it yardstick /bin/bash
 
-Create Grafana container and config::
+Secondly, create InfluxDB container and configure with the following command::
 
-  yardstick env grafana
+  yardstick env influxdb
+
+Thirdly, create and configure Grafana container::
 
-Then you can run a test case and visit http://host_ip:3000(user:admin,passwd:admin) to see the results.
+  yardstick env grafana
 
-note: Using **yardstick env** command to deploy InfluxDB and Grafana requires
-Jump Server's docker API version => 1.24. You can use the following command to
-check the docker API version:
+Then you can run a test case and visit http://host_ip:3000 (``admin``/``admin``) to see the results.
 
-::
+**NOTE:** Executing ``yardstick env`` command to deploy InfluxDB and Grafana requires Jumphost's docker API version => 1.24. Run the following command to check the docker API version on the Jumphost::
 
   docker version
 
-The following sections describe how to deploy influxDB and Grafana manually.
+Manually deploy InfluxDB and Grafana containers
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+You could also deploy influxDB and Grafana containers manually on the Jumphost.
+The following sections show how to do.
 
 .. pull docker images
 
 Pull docker images
-
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+####################
 
 ::
 
   docker pull tutum/influxdb
   docker pull grafana/grafana
 
-Run influxdb and config
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Run influxdb
-::
+Run and configure influxDB
+###############################
+
+Run influxDB::
 
   docker run -d --name influxdb \
   -p 8083:8083 -p 8086:8086 --expose 8090 --expose 8099 \
   tutum/influxdb
   docker exec -it influxdb bash
 
-Config influxdb
-::
+Configure influxDB::
 
   influx
   >CREATE USER root WITH PASSWORD 'root' WITH ALL PRIVILEGES
@@ -393,31 +375,30 @@ Config influxdb
   >use yardstick;
   >show MEASUREMENTS;
 
-Run grafana and config
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Run grafana
-::
+Run and configure Grafana
+###############################
 
-  docker run -d --name grafana -p 3000:3000 grafana/grafana
+Run Grafana::
 
-Config grafana
-::
+  docker run -d --name grafana -p 3000:3000 grafana/grafana
 
-  http://{YOUR_IP_HERE}:3000
-  log on using admin/admin and config database resource to be {YOUR_IP_HERE}:8086
+Log on http://{YOUR_IP_HERE}:3000 using ``admin``/``admin`` and configure database resource to be ``{YOUR_IP_HERE}:8086``.
 
 .. image:: images/Grafana_config.png
    :width: 800px
    :alt: Grafana data source configration
 
-Config yardstick conf
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-cp ./etc/yardstick/yardstick.conf.sample /etc/yardstick/yardstick.conf
+Configure ``yardstick.conf``
+##############################
 
-vi /etc/yardstick/yardstick.conf
-Config yardstick.conf
 ::
 
+  docker exec -it yardstick /bin/bash
+  cp etc/yardstick/yardstick.conf.sample /etc/yardstick/yardstick.conf
+  vi /etc/yardstick/yardstick.conf
+
+Modify ``yardstick.conf``::
+
   [DEFAULT]
   debug = True
   dispatcher = influxdb
@@ -429,23 +410,21 @@ Config yardstick.conf
   username = root
   password = root
 
-Now you can run yardstick test cases and store the results in influxdb
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Now you can run Yardstick test cases and store the results in influxDB.
+
 
+Deploy InfluxDB and Grafana directly in Ubuntu (**Todo**)
+-----------------------------------------------------------
 
-Create a test suite for yardstick
+
+Create a test suite for Yardstick
 ------------------------------------
 
 A test suite in yardstick is a yaml file which include one or more test cases.
-Yardstick is able to support running test suite task, so you can customize you
+Yardstick is able to support running test suite task, so you can customize your
 own test suite and run it in one task.
 
-"tests/opnfv/test_suites" is where yardstick put ci test-suite. A typical test
-suite is like below:
-
-fuel_test_suite.yaml
-
-::
+``tests/opnfv/test_suites`` is the folder where Yardstick puts CI test suite. A typical test suite is like below (the ``fuel_test_suite.yaml`` example)::
 
   ---
   # Fuel integration test task suite
@@ -460,17 +439,14 @@ fuel_test_suite.yaml
   -
     file_name: iperf3.yaml
 
-As you can see, there are two test cases in fuel_test_suite, the syntax is simple
-here, you must specify the schema and the name, then you just need to list the
-test cases in the tag "test_cases" and also mark their relative directory in the
-tag "test_cases_dir".
-
-Yardstick test suite also support constraints and task args for each test case.
-Here is another sample to show this, which is digested from one big test suite.
+As you can see, there are two test cases in the ``fuel_test_suite.yaml``. The
+``schema`` and the ``name`` must be specified. The test cases should be listed
+via the tag ``test_cases`` and their relative path is also marked via the tag
+``test_cases_dir``.
 
-os-nosdn-nofeature-ha.yaml
-
-::
+Yardstick test suite also supports constraints and task args for each test
+case. Here is another sample (the ``os-nosdn-nofeature-ha.yaml`` example) to
+show this, which is digested from one big test suite::
 
  ---
 
@@ -492,9 +468,15 @@ os-nosdn-nofeature-ha.yaml
            huawei-pod1: '{"pod_info": "etc/yardstick/.../pod.yaml",
            "host": "node4.LF","target": "node5.LF"}'
 
-As you can see in test case "opnfv_yardstick_tc043.yaml", there are two tags, "constraint" and
-"task_args". "constraint" is where you can specify which installer or pod it can be run in
-the ci environment. "task_args" is where you can specify the task arguments for each pod.
+As you can see in test case ``opnfv_yardstick_tc043.yaml``, there are two
+tags, ``constraint`` and ``task_args``. ``constraint`` is to specify which
+installer or pod it can be run in the CI environment. ``task_args`` is to
+specify the task arguments for each pod.
+
+All in all, to create a test suite in Yardstick, you just need to create a
+yaml file and add test cases, constraint or task arguments if necessary.
+
+
+Proxy Support (**Todo**)
+---------------------------
 
-All in all, to create a test suite in yardstick, you just need to create a suite yaml file
-and add test cases and constraint or task arguments if necessary.