summaryrefslogtreecommitdiffstats
path: root/docs/tosca2heat
diff options
context:
space:
mode:
authorzhipengh <huangzhipeng@huawei.com>2016-01-26 00:37:07 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-26 00:37:07 +0000
commit759f6bcb79adcf60917bf90ca67148e536b24ab3 (patch)
tree8968f0f667c6ea8b292c12a18c321fc8969708b9 /docs/tosca2heat
parent6aa28409d5b570e350af3c72717f48f1c641084e (diff)
parent342f5e82a6d2b8619d07e260bac07235ef228415 (diff)
Merge "JIRA:PARSER-17 Clean up documentation setup" into stable/brahmaputra
Diffstat (limited to 'docs/tosca2heat')
-rw-r--r--docs/tosca2heat/examples/Simple_RNC.yaml (renamed from docs/tosca2heat/simple_rnc_definition/Simple_RNC.yaml)0
-rw-r--r--docs/tosca2heat/examples/Simple_RNC_definition.yaml (renamed from docs/tosca2heat/simple_rnc_definition/Simple_RNC_definition.yaml)0
-rw-r--r--docs/tosca2heat/examples/TOSCA_nfv_definition_1_0.yaml (renamed from docs/tosca2heat/TOSCA_nfv_definition_1_0.yaml)0
-rw-r--r--docs/tosca2heat/image/vRNC_Definition.bmp (renamed from docs/tosca2heat/simple_rnc_definition/image/vRNC_Definition.bmp)bin165158 -> 165158 bytes
-rw-r--r--docs/tosca2heat/image/vRNC_Topology.bmp (renamed from docs/tosca2heat/simple_rnc_definition/image/vRNC_Topology.bmp)bin483126 -> 483126 bytes
-rw-r--r--docs/tosca2heat/index.rst24
-rw-r--r--docs/tosca2heat/parser_new_keywords.rst7
-rw-r--r--docs/tosca2heat/vRNC_tosca_intro.rst (renamed from docs/tosca2heat/simple_rnc_definition/vRNC_tosca_intro.rst)7
8 files changed, 38 insertions, 0 deletions
diff --git a/docs/tosca2heat/simple_rnc_definition/Simple_RNC.yaml b/docs/tosca2heat/examples/Simple_RNC.yaml
index 9f99c57..9f99c57 100644
--- a/docs/tosca2heat/simple_rnc_definition/Simple_RNC.yaml
+++ b/docs/tosca2heat/examples/Simple_RNC.yaml
diff --git a/docs/tosca2heat/simple_rnc_definition/Simple_RNC_definition.yaml b/docs/tosca2heat/examples/Simple_RNC_definition.yaml
index 921da0d..921da0d 100644
--- a/docs/tosca2heat/simple_rnc_definition/Simple_RNC_definition.yaml
+++ b/docs/tosca2heat/examples/Simple_RNC_definition.yaml
diff --git a/docs/tosca2heat/TOSCA_nfv_definition_1_0.yaml b/docs/tosca2heat/examples/TOSCA_nfv_definition_1_0.yaml
index 432cee5..432cee5 100644
--- a/docs/tosca2heat/TOSCA_nfv_definition_1_0.yaml
+++ b/docs/tosca2heat/examples/TOSCA_nfv_definition_1_0.yaml
diff --git a/docs/tosca2heat/simple_rnc_definition/image/vRNC_Definition.bmp b/docs/tosca2heat/image/vRNC_Definition.bmp
index 775e4d2..775e4d2 100644
--- a/docs/tosca2heat/simple_rnc_definition/image/vRNC_Definition.bmp
+++ b/docs/tosca2heat/image/vRNC_Definition.bmp
Binary files differ
diff --git a/docs/tosca2heat/simple_rnc_definition/image/vRNC_Topology.bmp b/docs/tosca2heat/image/vRNC_Topology.bmp
index d4eea84..d4eea84 100644
--- a/docs/tosca2heat/simple_rnc_definition/image/vRNC_Topology.bmp
+++ b/docs/tosca2heat/image/vRNC_Topology.bmp
Binary files differ
diff --git a/docs/tosca2heat/index.rst b/docs/tosca2heat/index.rst
new file mode 100644
index 0000000..c7ae649
--- /dev/null
+++ b/docs/tosca2heat/index.rst
@@ -0,0 +1,24 @@
+****************
+TOSCA To Heat Documents
+****************
+
+This is the directory to store documents regarding tosca to heat translation.
+
+The "parser_new_keywords" document demonstrate a set of keywords concluded by
+Parser team that need to be supported in tosca to heat translation. However
+it should be noted that these keywords only serve as a roadmap. We will start
+from Release C to indicate which specific set of keywords are supported in
+Parser.
+
+The "vRNC_tosca_intro" document describes Parser's use case analysis on vRNC scenario.
+
+The "example" folder contains examples of tosca-nfv standard and vRNC scenario.
+
+See also https://wiki.opnfv.org/parser .
+
+.. toctree::
+ :numbered:
+ :maxdepth: 4
+
+ parser_new_keywords.rst
+ vRNC_tosca_intro.rst
diff --git a/docs/tosca2heat/parser_new_keywords.rst b/docs/tosca2heat/parser_new_keywords.rst
index d705d17..f91cacd 100644
--- a/docs/tosca2heat/parser_new_keywords.rst
+++ b/docs/tosca2heat/parser_new_keywords.rst
@@ -1,3 +1,10 @@
+..
+ This work is licensed under a Creative Commons Attribution 3.0 Unported
+ License.
+
+ http://creativecommons.org/licenses/by/3.0/legalcode
+
+===================
New Parser keywords
===================
diff --git a/docs/tosca2heat/simple_rnc_definition/vRNC_tosca_intro.rst b/docs/tosca2heat/vRNC_tosca_intro.rst
index d81e530..30f0f8c 100644
--- a/docs/tosca2heat/simple_rnc_definition/vRNC_tosca_intro.rst
+++ b/docs/tosca2heat/vRNC_tosca_intro.rst
@@ -1,3 +1,10 @@
+..
+ This work is licensed under a Creative Commons Attribution 3.0 Unported
+ License.
+
+ http://creativecommons.org/licenses/by/3.0/legalcode
+
+================
1. vRNC Topology
================