Merge "Committer promotion: Serena Feng"

[functest.git] / docs / userguide / introduction.rst

diff --git a/docs/userguide/introduction.rst b/docs/userguide/introduction.rst
index 065213a..fc8e668 100644 (file)
--- a/docs/userguide/introduction.rst
+++ b/docs/userguide/introduction.rst
@@ -81,12 +81,13 @@ Features and VNF (Virtual Network Functions).
 |             |               |                | details.                         |
 |             |               +----------------+----------------------------------+
 |             |               | Doctor         | Doctor platform, as of Colorado  |
-|             |               |                | release, provides the two        |
+|             |               |                | release, provides the three      |
 |             |               |                | features:                        |
 |             |               |                | * Immediate Notification         |
 |             |               |                | * Consistent resource state      |
-|             |               |                | awareness (compute)              |
-|             |               |                | * Get Valid Server state         |
+|             |               |                | awareness for compute host down  |
+|             |               |                | * Valid compute host status      |
+|             |               |                | given to VM owner                |
 |             |               |                | See `Doctor User Guide`_ for     |
 |             |               |                | details                          |
 |             |               +----------------+----------------------------------+
@@ -134,8 +135,14 @@ Features and VNF (Virtual Network Functions).
 |             |               |                | It provides a fully functional   |
 |             |               |                | VoIP System                      |
 +             +---------------+----------------+----------------------------------+
-|             |               | parser         | Service template translation     |
-|             |               |                | TODO See for details             |
+|             |               | parser         | Parser is an integration project |
+|             |               |                | which aims to provide            |
+|             |               |                | placement/deployment templates   |
+|             |               |                | translation for OPNFV platform,  |
+|             |               |                | including TOSCA -> HOT, POLICY ->|
+|             |               |                | TOSCA and YANG -> TOSCA.         |
+|             |               |                | See `Parser User Guide`_ for     |
+|             |               |                | details                          |
 +-------------+---------------+----------------+----------------------------------+
 
 
@@ -202,9 +209,10 @@ section `Executing the functest suites`_ of this document.
 
 .. _`[2]`: http://docs.openstack.org/developer/tempest/overview.html
 .. _`[3]`: https://rally.readthedocs.org/en/latest/index.html
-.. _`Doctor User Guide`: http://artifacts.opnfv.org/opnfvdocs/brahmaputra/docs/userguide/featureusage-doctor.html
-.. _`Promise User Guide`: http://artifacts.opnfv.org/promise/brahmaputra/docs/userguide/index.html
+.. _`Doctor User Guide`: http://artifacts.opnfv.org/doctor/colorado/userguide/index.html
+.. _`Promise User Guide`: http://artifacts.opnfv.org/promise/colorado/userguide/index.html
 .. _`ONOSFW User Guide`: http://artifacts.opnfv.org/onosfw/brahmaputra/docs/userguide/index.html
 .. _`SDNVPN User Guide`: http://artifacts.opnfv.org/sdnvpn/brahmaputra/docs/userguide/featureusage.html
 .. _`Domino User Guide`: http://artifacts.opnfv.org/domino/docs/userguide/index.html
+.. _`Parser User Guide`: http://artifacts.opnfv.org/parser/docs/userguide/index.html
 .. _`Functest Dashboard`: http://testresults.opnfv.org/kibana_dashboards/