aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-08-18 14:54:00 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-18 14:54:00 +0000
commit0c8fcab579d0027a6dd85722a3ba7f31bf966dba (patch)
tree6a72dc00c5433621998301ca740416ba603264f1
parent87e005df122512e2d1ba6af9f4656f4e5bf04a1e (diff)
parent1ec6e546d66b2735ceed2c93c53f8a30798b3071 (diff)
Merge "complement Parser related userguide"
-rw-r--r--docs/userguide/index.rst3
-rw-r--r--docs/userguide/introduction.rst11
-rw-r--r--docs/userguide/troubleshooting.rst2
3 files changed, 12 insertions, 4 deletions
diff --git a/docs/userguide/index.rst b/docs/userguide/index.rst
index c0c3aa1b2..0e13d3547 100644
--- a/docs/userguide/index.rst
+++ b/docs/userguide/index.rst
@@ -405,7 +405,7 @@ The Clearwater architecture is described as follows:
parser
^^^^^^
-See parser user guide for details: ** TODO link **
+See parser user guide for details: `[12]`_
.. include:: ./runfunctest.rst
@@ -490,6 +490,7 @@ References
.. _`[7]`: https://github.com/OpenSCAP/openscap
.. _`[9]`: https://git.opnfv.org/cgit/functest/tree/testcases/VIM/OpenStack/CI/libraries/os_defaults.yaml
.. _`[11]`: http://robotframework.org/
+.. _`[12]`: http://artifacts.opnfv.org/parser/docs/userguide/index.html
OPNFV main site: opnfvmain_.
diff --git a/docs/userguide/introduction.rst b/docs/userguide/introduction.rst
index ce84a9c43..53b3df4ad 100644
--- a/docs/userguide/introduction.rst
+++ b/docs/userguide/introduction.rst
@@ -135,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 |
+-------------+---------------+----------------+----------------------------------+
@@ -208,4 +214,5 @@ section `Executing the functest suites`_ of this document.
.. _`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/
diff --git a/docs/userguide/troubleshooting.rst b/docs/userguide/troubleshooting.rst
index c23b00602..0288d295c 100644
--- a/docs/userguide/troubleshooting.rst
+++ b/docs/userguide/troubleshooting.rst
@@ -384,7 +384,7 @@ described in the following table:
parser
^^^^^^
-See parser user guide for details: ** TODO link **
+For now log info is the only way to do trouble shooting
.. _`OPNFV Functest Developer Guide`: http://artifacts.opnfv.org/functest/docs/devguide/#