summaryrefslogtreecommitdiffstats
path: root/docs/parser_docs/tosca2heat
diff options
context:
space:
mode:
authorRyota MIBU <r-mibu@cq.jp.nec.com>2016-02-26 03:38:12 +0900
committerRyota MIBU <r-mibu@cq.jp.nec.com>2016-02-26 09:41:12 +0900
commit4e4c86a06d58b1816c074c7f9da4c58bbf10368c (patch)
treef6265994d5fa51494ee2c3b87c5b1fe4f8dffa2b /docs/parser_docs/tosca2heat
parentb48e6c1b13c021bbedd2bf3a04e7a561e66d1faa (diff)
docs: fix issues
Change-Id: Ie0917b70674a7a16c89c8e6bc79aed5e436cabdd Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
Diffstat (limited to 'docs/parser_docs/tosca2heat')
-rw-r--r--docs/parser_docs/tosca2heat/image/vRNC_Definition.bmpbin165158 -> 0 bytes
-rw-r--r--docs/parser_docs/tosca2heat/image/vRNC_Topology.bmpbin483126 -> 0 bytes
-rw-r--r--docs/parser_docs/tosca2heat/parser_new_keywords.rst81
-rw-r--r--docs/parser_docs/tosca2heat/vRNC_tosca_intro.rst44
4 files changed, 39 insertions, 86 deletions
diff --git a/docs/parser_docs/tosca2heat/image/vRNC_Definition.bmp b/docs/parser_docs/tosca2heat/image/vRNC_Definition.bmp
deleted file mode 100644
index 775e4d2..0000000
--- a/docs/parser_docs/tosca2heat/image/vRNC_Definition.bmp
+++ /dev/null
Binary files differ
diff --git a/docs/parser_docs/tosca2heat/image/vRNC_Topology.bmp b/docs/parser_docs/tosca2heat/image/vRNC_Topology.bmp
deleted file mode 100644
index d4eea84..0000000
--- a/docs/parser_docs/tosca2heat/image/vRNC_Topology.bmp
+++ /dev/null
Binary files differ
diff --git a/docs/parser_docs/tosca2heat/parser_new_keywords.rst b/docs/parser_docs/tosca2heat/parser_new_keywords.rst
index 361c74c..f430b1d 100644
--- a/docs/parser_docs/tosca2heat/parser_new_keywords.rst
+++ b/docs/parser_docs/tosca2heat/parser_new_keywords.rst
@@ -1,8 +1,5 @@
-..
- This work is licensed under a Creative Commons Attribution 3.0 Unported
- License.
-..
- http://creativecommons.org/licenses/by/3.0/legalcode
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
===================
New Parser keywords
@@ -20,17 +17,17 @@ implemented by parser.
Basic types
^^^^^^^^^^^
-- tosca.nodes.nfv.VDU
-- tosca.nodes.nfv.CP
-- tosca.nodes.nfv.VL
+* tosca.nodes.nfv.VDU
+* tosca.nodes.nfv.CP
+* tosca.nodes.nfv.VL
Extend types
^^^^^^^^^^^^
-- tosca.nodes.nfv.VL.ELine
-- tosca.nodes.nfv.VL.ELAN
-- tosca.nodes.nfv.VL.ETree
-- tosca.nodes.nfv.FP
+* tosca.nodes.nfv.VL.ELine
+* tosca.nodes.nfv.VL.ELAN
+* tosca.nodes.nfv.VL.ETree
+* tosca.nodes.nfv.FP
1.2 Capability types
~~~~~~~~~~~~~~~~~~~~
@@ -38,23 +35,23 @@ Extend types
Basic types
^^^^^^^^^^^
-- tosca.capabilities.nfv.VirtualBindable
-- tosca.capabilities.nfv.VirtualLinkable
-- tosca.capabilities.nfv.HA.ActiveActive
-- tosca.capabilities.nfv.HA.ActivePassive
-- tosca.capabilities.nfv.Metric
+* tosca.capabilities.nfv.VirtualBindable
+* tosca.capabilities.nfv.VirtualLinkable
+* tosca.capabilities.nfv.HA.ActiveActive
+* tosca.capabilities.nfv.HA.ActivePassive
+* tosca.capabilities.nfv.Metric
Extend types
^^^^^^^^^^^^
-- tosca.capabilities.nfv.Forwarder
-- tosca.capabilities.nfv.CPU\_extension
-- tosca.capabilities.nfv.Memory\_extension
-- tosca.capabilities.nfv.Hypervisors
-- tosca.capabilities.nfv.PCIe
-- tosca.capabilities.nfv.network.Interfaces
-- tosca.capabilities.nfv.network.Virtual\_switches
-- tosca.capabilities.nfv.Storage
+* tosca.capabilities.nfv.Forwarder
+* tosca.capabilities.nfv.CPU\_extension
+* tosca.capabilities.nfv.Memory\_extension
+* tosca.capabilities.nfv.Hypervisors
+* tosca.capabilities.nfv.PCIe
+* tosca.capabilities.nfv.network.Interfaces
+* tosca.capabilities.nfv.network.Virtual\_switches
+* tosca.capabilities.nfv.Storage
1.3 Relationship types
~~~~~~~~~~~~~~~~~~~~~~
@@ -62,20 +59,20 @@ Extend types
Basic types
^^^^^^^^^^^
-- tosca.relationships.nfv.VirtualBindsTo
-- tosca.relationships.nfv.VirtualLinksTo
-- tosca.relationships.nfv.HA
-- tosca.relationships.nfv.Monitor
+* tosca.relationships.nfv.VirtualBindsTo
+* tosca.relationships.nfv.VirtualLinksTo
+* tosca.relationships.nfv.HA
+* tosca.relationships.nfv.Monitor
Extend types
^^^^^^^^^^^^
-- tosca.relationships.nfv.ForwardsTo
+* tosca.relationships.nfv.ForwardsTo
1.4 Group Types
~~~~~~~~~~~~~~~
-- tosca.groups.nfv.VNFFG
+* tosca.groups.nfv.VNFFG
2.Simple-tosca new keywords
---------------------------
@@ -87,10 +84,10 @@ completely so far.
2.1 topology template keyname
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-- "substitution\_mappings" syntax
+* "substitution\_mappings" syntax
- An optional declaration that exports the topology template as an
- impletmentation of a node type, which is not supported by tosca-parser.
+ An optional declaration that exports the topology template as an
+ impletmentation of a node type, which is not supported by tosca-parser.
2.2 Group types
~~~~~~~~~~~~~~~
@@ -98,7 +95,7 @@ completely so far.
Basic types
^^^^^^^^^^^
-- tosca.group.root
+* tosca.group.root
2.3 Policy Types
~~~~~~~~~~~~~~~~
@@ -106,15 +103,15 @@ Basic types
Basic types
^^^^^^^^^^^
-- tosca.policies.Root
-- tosca.policies.Placement
-- tosca.policies.Scaling
+* tosca.policies.Root
+* tosca.policies.Placement
+* tosca.policies.Scaling
Extend types
^^^^^^^^^^^^
-- tosca.policies.Update
-- tosca.policies.Performance
-- tosca.policy.placement.Antilocate
-- tosca.policy.placement.Colocate
+* tosca.policies.Update
+* tosca.policies.Performance
+* tosca.policy.placement.Antilocate
+* tosca.policy.placement.Colocate
diff --git a/docs/parser_docs/tosca2heat/vRNC_tosca_intro.rst b/docs/parser_docs/tosca2heat/vRNC_tosca_intro.rst
deleted file mode 100644
index 7da100d..0000000
--- a/docs/parser_docs/tosca2heat/vRNC_tosca_intro.rst
+++ /dev/null
@@ -1,44 +0,0 @@
-..
- This work is licensed under a Creative Commons Attribution 3.0 Unported
- License.
-..
- http://creativecommons.org/licenses/by/3.0/legalcode
-
-================
-1. vRNC Topology
-================
-
-The simple vRNC topology is shown below: |vRNC Topology|
-
-- vRNC includes four networks: EMS\_network, CTRL\_network,
- Intermedia\_network and extermedia\_network;
-- vRNC includes four node types: MM, LB, CM and DM;
-- MM: Stands for Maintain Module, which links to EMS\_network,
- CTRL\_network and extermedia\_network. It composes of active vdu and
- standby vdu.
-- CM: Stands for Control Module, which links to CTRL\_network and
- intermedia\_network. All CM nodes form resource pool and each node
- composes of active vdu and standby vdu.
-- DM: Stands for Data Module, which links to CTRL\_network and
- intermedia\_network. All DM nodes form resource pool and each node is
- a vdu.
-- LB: Stands for LineCard Module, which links to CTRL\_network and
- intermedia\_network and extermedia\_network. All LB nodes form
- resource pool and each node is a vdu.
-
-2. vRNC Definition
-==================
-
-The files dependency and correspoding specificaiton of vRNC definition
-are shown below: |vRNC Definition|
-
-- TOSCA\_definition\_1.0.yaml should be the lastest version, which is
- updated by tosca-parser community, but some keywords (such as
- substitution\_mappings) in the correspoding standard of
- "TOSCA-simple-profile-YAML-v1.0" is not supported.
-- TOSCA\_nfv\_definition\_1.0.yaml is a new file, and not implemented
- in code, and the correspoding standard of
- "tosca-nfv-v1.0-wd02-rev02" is not complete now.
-
-.. |vRNC Topology| image:: image/vRNC_Topology.bmp
-.. |vRNC Definition| image:: image/vRNC_Definition.bmp