summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/parser_docs/tosca2heat/examples/Simple_RNC.yaml46
-rw-r--r--docs/parser_docs/tosca2heat/examples/Simple_RNC_definition.yaml24
2 files changed, 33 insertions, 37 deletions
diff --git a/docs/parser_docs/tosca2heat/examples/Simple_RNC.yaml b/docs/parser_docs/tosca2heat/examples/Simple_RNC.yaml
index e22a1c8..76fd002 100644
--- a/docs/parser_docs/tosca2heat/examples/Simple_RNC.yaml
+++ b/docs/parser_docs/tosca2heat/examples/Simple_RNC.yaml
@@ -1,4 +1,3 @@
-#
## Licensed under the Apache License, Version 2.0 (the "License"); you may
## not use this file except in compliance with the License. You may obtain
## a copy of the License at
@@ -11,7 +10,6 @@
## License for the specific language governing permissions and limitations
## under the License.
-# Required TOSCA Definitions version string
tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
metadata:
@@ -22,12 +20,12 @@ metadata:
# Optional description of the definitions inside the file.
description: >
TOSCA simple profile for RNC
- 1, Compute Node MM, CM, DM, LB...
+ 1. Compute Node MM, CM, DM, LB...
1.1 MM: MaintainModule;
1.2 CM: Control Module;
1.3 DM: Data Module;
1.4 LB: LineCard Module
- 2, Network Node VL and CP
+ 2. Network Node VL and CP
imports:
- Simple_RNC_definition.yaml
@@ -79,7 +77,7 @@ topology_template:
substitution_mappings:
node_type: rnc.nodes.VNF
properties:
- vnfmtype: TDS-CDMA
+ vnfmtype: UMTS
requirements:
virtualLink_VNFM: [ MM_Port_CTRL, virtualLink ]
virtualLink_EMS: [ MM_Port_EMS, virtualLink ]
@@ -305,7 +303,7 @@ topology_template:
order: 0
is_default: true
requirements:
- - virtualbinding: MM_Active
+ - virtualBinding: MM_Active
- virtualLink: EMS_Net
MM_Port_CTRL:
@@ -314,7 +312,7 @@ topology_template:
order: 1
is_default: false
requirements:
- - virtualbinding: MM_Active
+ - virtualBinding: MM_Active
- virtualLink: CTRL_Net
MM_Port_EXTERMEDIA:
@@ -323,7 +321,7 @@ topology_template:
order: 2
is_default: false
requirements:
- - virtualbinding: MM_Active
+ - virtualBinding: MM_Active
- virtualLink: EXTERMEDIA_Net
CM_Port_CTRL:
@@ -332,7 +330,7 @@ topology_template:
order: 0
is_default: true
requirements:
- - virtualbinding: CM_Active
+ - virtualBinding: CM_Active
- virtualLink: CTRL_Net
CM_Port_INTERMEDIA:
@@ -341,7 +339,7 @@ topology_template:
order: 1
is_default: false
requirements:
- - virtualbinding: CM_Active
+ - virtualBinding: CM_Active
- virtualLink: INTERMEDIA_Net
DM_Port_CTRL:
@@ -350,7 +348,7 @@ topology_template:
order: 0
is_default: true
requirements:
- - virtualbinding: DM
+ - virtualBinding: DM
- virtualLink: CTRL_Net
DM_Port_INTERMEDIA:
@@ -359,7 +357,7 @@ topology_template:
order: 1
is_default: false
requirements:
- - virtualbinding: DM
+ - virtualBinding: DM
- virtualLink: INTERMEDIA_Net
LB_Port_CTRL:
@@ -368,7 +366,7 @@ topology_template:
order: 0
is_default: true
requirements:
- - virtualbinding: LB
+ - virtualBinding: LB
- virtualLink: CTRL_Net
LB_Port_INTERMEDIA:
@@ -377,7 +375,7 @@ topology_template:
order: 1
is_default: false
requirements:
- - virtualbinding: LB
+ - virtualBinding: LB
- virtualLink: INTERMEDIA_Net
LB_Port_EXTERMEDIA:
@@ -386,7 +384,7 @@ topology_template:
order: 2
is_default: false
requirements:
- - virtualbinding: LB
+ - virtualBinding: LB
- virtualLink: EXTERMEDIA_Net
# definition of the relationship templates of the topology
@@ -400,19 +398,19 @@ topology_template:
outputs:
private_ip_of_MM:
description: The private IP address of the MM.
- value: { get_attribute: [ MM_Active, ip_address ] }
+ value: { get_attribute: [ MM_Active, private_address ] }
private_ip_of_CM:
description: The private IP address of the CM.
- value: { get_attribute: [ CM_Active, ip_address ] }
+ value: { get_attribute: [ CM_Active, private_address ] }
private_ip_of_DM:
description: The private IP address of the DM.
- value: { get_attribute: [ DM, ip_address ] }
+ value: { get_attribute: [ DM, private_address ] }
private_ip_of_LB:
description: The private IP address of the LB.
- value: { get_attribute: [ LB, ip_address ] }
+ value: { get_attribute: [ LB, private_address ] }
# definition of logical groups of node templates within the topology
# To be continue about this section
@@ -423,7 +421,7 @@ topology_template:
Logical component grouping for anti affinity placement,
MM_Acitve, MM_Passive, CM_Acitve, CM_Passive, LB must host
on different host to reduce the impact to each other.
- members: [ MM_Acitve, MM_Passive, CM_Acitve, CM_Passive, LB ]
+ members: [ MM_Active, MM_Passive, CM_Active, CM_Passive, LB ]
policies:
type: tosca.policy.placement.Antilocate
@@ -432,19 +430,19 @@ topology_template:
description: >
Logical component grouping for affinity placement,
CM and DM will be host on the same host to get high performence
- members: [ CM, DM ]
+ members: [ CM_Active, DM ]
policies:
type: tosca.policy.placement.Antilocate
policies:
- AnitAffinityPolicy:
type: tosca.policies.Placement.Antilocate
- description: Apply anti-locate placement policy to group
+ description: Apply anti-locate placement policy to group
targets: [ AnitAffinityServerGroup ]
-
+
- AffinityPolicy:
type: tosca.policies.Placement.Colocate
- description: Apply anti-locate placement policy to group
+ description: Apply anti-locate placement policy to group
targets: [ AffinityServerGroup ]
# ServerGroupScaling_DM: # added future
diff --git a/docs/parser_docs/tosca2heat/examples/Simple_RNC_definition.yaml b/docs/parser_docs/tosca2heat/examples/Simple_RNC_definition.yaml
index b3dfd55..7478d98 100644
--- a/docs/parser_docs/tosca2heat/examples/Simple_RNC_definition.yaml
+++ b/docs/parser_docs/tosca2heat/examples/Simple_RNC_definition.yaml
@@ -1,4 +1,3 @@
-#
## Licensed under the Apache License, Version 2.0 (the "License"); you may
## not use this file except in compliance with the License. You may obtain
## a copy of the License at
@@ -11,25 +10,24 @@
## License for the specific language governing permissions and limitations
## under the License.
-# Required TOSCA Definitions version string
tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
-metadata:
- template_name: tosca_simple_profile_for_nfv_vRNC
- template_author: opnfv_parser_project_from_zte
- template_version: tosca_simple_profile_for_nfv_1_0
+#metadata:
+# template_name: tosca_simple_profile_for_nfv_vRNC
+# template_author: opnfv_parser_project_from_zte
+# template_version: tosca_simple_profile_for_nfv_1_0
# Optional description of the definitions inside the file.
description: >
NFV TOSCA simple profile for RNC types
- 1, Compute Node MM, CM, DM, LB...
+ 1. Compute Node MM, CM, DM, LB...
1.1 MM: MaintainModule;
1.2 CM: Control Module;
1.3 DM: Data Module;
1.4 LB: LineCard Module.
- 2, Network Node VL and CP
+ 2. Network Node VL and CP
-# The import section shall be ignored if the value of tosca_definitions_version
+# The import section shall be ignored if the value of tosca_definitions_version
# is tosca_simple_profile_for_nfv_1_0_0, otherwise will be needed.
#imports:
# - TOSCA_nfv_definition_1_0.yaml
@@ -41,7 +39,7 @@ node_types:
properties:
vnftype:
type: string
- description: type of the vnf
+ description: type of the RNC
default: UMTS
required: false
constraints:
@@ -50,15 +48,15 @@ node_types:
- virtualLink_VNFM:
capability: tosca.capabilities.nfv.VirtualLinkable
relationship: tosca.relationships.nfv.VirtualLinksTo
- node: tosca.nodes.nfv.VL
+ node: rnc.nodes.VL
- virtualLink_EMS:
capability: tosca.capabilities.nfv.VirtualLinkable
relationship: tosca.relationships.nfv.VirtualLinksTo
- node: tosca.nodes.nfv.VL
+ node: rnc.nodes.VL
- virtualLink_TRAFFIC:
capability: tosca.capabilities.nfv.VirtualLinkable
relationship: tosca.relationships.nfv.VirtualLinksTo
- node: tosca.nodes.nfv.VL
+ node: rnc.nodes.VL
rnc.nodes.compute.MM:
derived_from: tosca.nodes.nfv.VDU