From 1274e5c3d00d1bac9843b74ee72b617accf98c44 Mon Sep 17 00:00:00 2001 From: shangxdy Date: Mon, 21 Dec 2015 19:37:39 +0800 Subject: Define a general nfv Tosca template(new) Define a general nfv Tosca template, which supports ETSI/MANO standard. Recheck for changed documents architecture. JIRA:PARSER-6 Change-Id: I0c6f0571c8a5dffbe0bc281d68f2b9542952bf7d Signed-off-by: shangxdy --- .../simple_rnc_definition/image/vRNC_Definition.PNG | Bin 10888 -> 0 bytes .../simple_rnc_definition/image/vRNC_Definition.bmp | Bin 0 -> 165158 bytes .../simple_rnc_definition/vRNC_tosca_intro.rst | 18 +++++++++--------- 3 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 docs/tosca2heat/simple_rnc_definition/image/vRNC_Definition.PNG create mode 100644 docs/tosca2heat/simple_rnc_definition/image/vRNC_Definition.bmp (limited to 'docs/tosca2heat/simple_rnc_definition') diff --git a/docs/tosca2heat/simple_rnc_definition/image/vRNC_Definition.PNG b/docs/tosca2heat/simple_rnc_definition/image/vRNC_Definition.PNG deleted file mode 100644 index dd299e3..0000000 Binary files a/docs/tosca2heat/simple_rnc_definition/image/vRNC_Definition.PNG and /dev/null differ diff --git a/docs/tosca2heat/simple_rnc_definition/image/vRNC_Definition.bmp b/docs/tosca2heat/simple_rnc_definition/image/vRNC_Definition.bmp new file mode 100644 index 0000000..775e4d2 Binary files /dev/null and b/docs/tosca2heat/simple_rnc_definition/image/vRNC_Definition.bmp differ diff --git a/docs/tosca2heat/simple_rnc_definition/vRNC_tosca_intro.rst b/docs/tosca2heat/simple_rnc_definition/vRNC_tosca_intro.rst index 7dde943..d81e530 100644 --- a/docs/tosca2heat/simple_rnc_definition/vRNC_tosca_intro.rst +++ b/docs/tosca2heat/simple_rnc_definition/vRNC_tosca_intro.rst @@ -8,30 +8,30 @@ The simple vRNC topology is shown below: |vRNC Topology| - 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 vds. + 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 vds. + 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 vds. + 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 vds. + 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| +are shown below: |vRNC Definition| - TOSCA\_definition\_1.0.yaml should be the lastest version, which is - updated by tosca-parser community, but some keynames (such as + 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-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. + "tosca-nfv-v1.0-wd02-rev02" is not complete now. .. |vRNC Topology| image:: image/vRNC_Topology.bmp -.. |vRNC Definition| image:: image/vRNC_Definition.png +.. |vRNC Definition| image:: image/vRNC_Definition.bmp -- cgit 1.2.3-korg