Merge "Doc updates"

1 files changed, 25 insertions, 26 deletions

diff --git a/docs/userguide/description.rst b/docs/userguide/description.rst
index 288ad95af..b47d5ef62 100644
--- a/docs/userguide/description.rst
+++ b/docs/userguide/description.rst
@@ -1,12 +1,9 @@
-Description of the test cases
+Overview of the test suites
 =============================
 
-Functest is an OPNFV project dedicated to functional testing.
-In the continuous integration, it is launched after an OPNFV fresh installation.
-The Functest target is to verify the basic functions of the infrastructure.
-
-Functest includes different test suites which several test cases within.
-Test cases are developed in Functest and in feature projects.
+Functest is the OPNFV project primarily targeting function testing.
+In the Continuous Integration pipeline, it is launched after an OPNFV fresh
+installation to validate and verify the basic functions of the infrastructure.
 
 The current list of test suites can be distributed in 3 main domains::
 
@@ -21,8 +18,8 @@ The current list of test suites can be distributed in 3 main domains::
  |                +----------------+-------------------------------------------+
  |(Virtualised    | Tempest        | OpenStack reference test suite `[2]`_     |
  | Infrastructure +----------------+-------------------------------------------+
- | Manager)       | Rally scenario | OpenStack testing tool testing OpenStack  |
- |                |                | modules `[3]`_                            |
+ | Manager)       | Rally bench    | OpenStack testing tool benchmarking       |
+ |                |                | OpenStack modules `[3]`_                  |
  +----------------+----------------+-------------------------------------------+
  |                | OpenDaylight   | Opendaylight Test suite                   |
  |                +----------------+-------------------------------------------+
@@ -30,8 +27,8 @@ The current list of test suites can be distributed in 3 main domains::
  |                +----------------+-------------------------------------------+
  |                | OpenContrail   |                                           |
  +----------------+----------------+-------------------------------------------+
- | Features       | vIMS           | Show the capability to deploy a real NFV  |
- |                |                | test cases.                               |
+ | Features       | vIMS           | Example of a real VNF deployment to show  |
+ |                |                | the NFV capabilities of the platform.     |
  |                |                | The IP Multimedia Subsytem is a typical   |
  |                |                | Telco test case, referenced by ETSI.      |
  |                |                | It provides a fully functional VoIP System|
@@ -46,31 +43,33 @@ The current list of test suites can be distributed in 3 main domains::
  |                | SDNVPN         |                                           |
  +----------------+----------------+-------------------------------------------+
 
-
-Most of the test suites are developed upstream.
-For example, `Tempest <http://docs.openstack.org/developer/tempest/overview.html>`_ is the
-OpenStack integration test suite.
-Functest is in charge of the integration of different functional test suites.
+Functest includes different test suites with several test cases within. Some
+of the tests are developed by Functest team members whereas others are integrated
+from upstream communities or other OPNFV projects. For example,
+`Tempest <http://docs.openstack.org/developer/tempest/overview.html>`_ is the
+OpenStack integration test suite and Functest is in charge of the selection,
+integration and automation of the tests that fit in OPNFV.
 
 The Tempest suite has been customized but no new test cases have been created.
-Some OPNFV feature projects (e.g. SDNVPN) have created Tempest tests cases and
-pushed to upstream.
+Some OPNFV feature projects (e.g. SDNVPN) have written some Tempest tests cases
+and pushed upstream to be used by Functest.
 
-The tests run from CI are pushed into a database.
-The goal is to populate the database with results and to show them on a Test
-Dashboard.
+The results produced by the tests run from CI are pushed and collected in a NoSQL
+database. The goal is to populate the database with results from different sources
+and scenarios and to show them on a Dashboard.
 
-There is no real notion of Test domain or Test coverage yet.
-Basic components (VIM, controllers) are tested through their own suites.
-Feature projects also provide their own test suites.
+There is no real notion of Test domain or Test coverage. Basic components
+(VIM, controllers) are tested through their own suites. Feature projects also
+provide their own test suites with different ways of running their tests.
 
 vIMS test case was integrated to demonstrate the capability to deploy a
 relatively complex NFV scenario on top of the OPNFV infrastructure.
 
 Functest considers OPNFV as a black box.
-OPNFV, since Brahmaputra, offers lots of possible combinations:
+OPNFV, since the Brahmaputra release, offers lots of potential combinations:
 
   * 3 controllers (OpenDayligh, ONOS, OpenContrail)
   * 4 installers (Apex, Compass, Fuel, Joid)
 
-However most of the tests shall be runnable on any configuration.
+Most of the tests are runnable on any combination, but some others might have
+restrictions imposed by the installers or the available deployed features.