From 9ba220cedc4b962974376c34209faf1ae0462a01 Mon Sep 17 00:00:00 2001 From: shangxdy Date: Wed, 27 Apr 2016 07:29:43 -0400 Subject: Update the vRNC types(node types/relation types) definiton Update the vRNC type definition according to the nfv tosca definiton. include MM, CM, DM and LB. JIRA:PARSER-35 Change-Id: I3017c93081bc77fc2ac1e4633f4232f130f6b4de Signed-off-by: shangxdy --- .../tosca2heat/examples/Simple_RNC_definition.yaml | 207 ++++----------------- 1 file changed, 32 insertions(+), 175 deletions(-) (limited to 'docs') diff --git a/docs/parser_docs/tosca2heat/examples/Simple_RNC_definition.yaml b/docs/parser_docs/tosca2heat/examples/Simple_RNC_definition.yaml index 921da0d..b3dfd55 100644 --- a/docs/parser_docs/tosca2heat/examples/Simple_RNC_definition.yaml +++ b/docs/parser_docs/tosca2heat/examples/Simple_RNC_definition.yaml @@ -1,9 +1,22 @@ +# +## 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 +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +## WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +## License for the specific language governing permissions and limitations +## under the License. + # Required TOSCA Definitions version string -tosca_definitions_version: tosca_simple_yaml_1_0 +tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 metadata: - template_name: tosca_simple_profile_for_nfv - template_author: opnfv_parser_project + 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. @@ -13,11 +26,13 @@ description: > 1.1 MM: MaintainModule; 1.2 CM: Control Module; 1.3 DM: Data Module; - 1.4 LB: LineCard Module + 1.4 LB: LineCard Module. 2, Network Node VL and CP -imports: - - TOSCA_nfv_definition_1_0.yaml +# 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 # list of node type definitions node_types: @@ -30,23 +45,28 @@ node_types: default: UMTS required: false constraints: - - valid_values: [ TD, UMTS ] + - valid_values: [ TDS-CDMA, UMTS, CDMA ] requirements: - virtualLink_VNFM: capability: tosca.capabilities.nfv.VirtualLinkable + relationship: tosca.relationships.nfv.VirtualLinksTo + node: tosca.nodes.nfv.VL - virtualLink_EMS: capability: tosca.capabilities.nfv.VirtualLinkable + relationship: tosca.relationships.nfv.VirtualLinksTo + node: tosca.nodes.nfv.VL - virtualLink_TRAFFIC: capability: tosca.capabilities.nfv.VirtualLinkable - + relationship: tosca.relationships.nfv.VirtualLinksTo + node: tosca.nodes.nfv.VL + rnc.nodes.compute.MM: derived_from: tosca.nodes.nfv.VDU properties: activestatus: type: integer - description: active or passive + description: 1 for active or 0 for passive constraints: - # 1 active, 0 passive - valid_values: [ 0, 1 ] id: type: string @@ -55,30 +75,6 @@ node_types: A identifier of this VDU within the scope of the VNFD, including version functional description and other identification information. - requirements: - - host: - capability: tosca.capabilities.Container - node: rnc.nodes.compute.MM_Host - relationship: tosca.relationships.HostedOn - - rnc.nodes.compute.MM_Host: - derived_from: tosca.nodes.Compute - capabilities: - binding: - type: tosca.capabilities.network.Bindable - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - host: - type: rnc.capabilities.Container - valid_source_types: [ tosca.nodes.SoftwareComponent ] - storage: - type: tosca.capabilities.nfv.Storage - valid_source_types: [ tosca.nodes.SoftwareComponent ] - attributes: - ip_address: - type: string rnc.nodes.compute.CM: derived_from: tosca.nodes.nfv.VDU @@ -87,161 +83,22 @@ node_types: type: integer description: 1 for active or 0 for passive constraints: - # 1 active, 0 passive - - valid_values: [ 0, 1 ] - requirements: - - host: - capability: tosca.capabilities.Container - node: rnc.nodes.compute.CM_Host - relationship: tosca.relationships.HostedOn - - rnc.nodes.compute.CM_Host: - derived_from: tosca.nodes.Compute - capabilities: - binding: - type: tosca.capabilities.network.Bindable - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - host: - type: rnc.capabilities.Container - valid_source_types: [ tosca.nodes.SoftwareComponent ] - cpu_extension: - type: tosca.capabilities.nfv.CPU_extension - valid_source_types: [ tosca.nodes.SoftwareComponent ] - memory_extension: - type: tosca.capabilities.nfv.Memory_extension - valid_source_types: [ tosca.nodes.SoftwareComponent ] - hypervisors: - type: tosca.capabilities.nfv.Hypervisors - valid_source_types: [ tosca.nodes.SoftwareComponent ] - PCIe: - type: tosca.capabilities.nfv.PCIe - valid_source_types: [ tosca.nodes.SoftwareComponent ] - interfaces: - type: tosca.capabilities.nfv.network.Interfaces - valid_source_types: [ tosca.nodes.SoftwareComponent ] - virtual_switches: - type: tosca.capabilities.nfv.network.Virtual_switches - valid_source_types: [ tosca.nodes.SoftwareComponent ] - attributes: - ip_address: - type: string + - valid_values: [ 0, 1 ] rnc.nodes.compute.DM: derived_from: tosca.nodes.nfv.VDU - requirements: - - host: - capability: tosca.capabilities.Container - node: rnc.nodes.compute.DM_Host - relationship: tosca.relationships.HostedOn - - rnc.nodes.compute.DM_Host: - derived_from: tosca.nodes.Compute - capabilities: - binding: - type: tosca.capabilities.network.Bindable - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - host: - type: rnc.capabilities.Container - valid_source_types: [ tosca.nodes.SoftwareComponent ] - cpu_extension: - type: tosca.capabilities.nfv.CPU_extension - valid_source_types: [ tosca.nodes.SoftwareComponent ] - memory_extension: - type: tosca.capabilities.nfv.Memory_extension - valid_source_types: [ tosca.nodes.SoftwareComponent ] - hypervisors: - type: tosca.capabilities.nfv.Hypervisors - valid_source_types: [ tosca.nodes.SoftwareComponent ] - PCIe: - type: tosca.capabilities.nfv.PCIe - valid_source_types: [ tosca.nodes.SoftwareComponent ] - interfaces: - type: tosca.capabilities.nfv.network.Interfaces - valid_source_types: [ tosca.nodes.SoftwareComponent ] - virtual_switches: - type: tosca.capabilities.nfv.network.Virtual_switches - valid_source_types: [ tosca.nodes.SoftwareComponent ] - attributes: - ip_address: - type: string rnc.nodes.compute.LB: derived_from: tosca.nodes.nfv.VDU - requirements: - - host: - capability: tosca.capabilities.Container - node: rnc.nodes.compute.LB_Host - relationship: tosca.relationships.HostedOn - - rnc.nodes.compute.LB_Host: - derived_from: tosca.nodes.Compute - capabilities: - binding: - type: tosca.capabilities.network.Bindable - os: - type: tosca.capabilities.OperatingSystem - scalable: - type: tosca.capabilities.Scalable - host: - type: rnc.capabilities.Container - valid_source_types: [ tosca.nodes.SoftwareComponent ] - interfaces: - type: tosca.capabilities.nfv.network.Interfaces - valid_source_types: [ tosca.nodes.SoftwareComponent ] - virtual_switches: - type: tosca.capabilities.nfv.network.Virtual_switches - valid_source_types: [ tosca.nodes.SoftwareComponent ] - attributes: - ip_address: - type: string rnc.nodes.BlockStorage: derived_from: tosca.nodes.BlockStorage rnc.nodes.VL: - derived_from: tosca.nodes.nfv.VL.ELAN - properties: - ip_version: - type: integer - required: false - default: 4 - constraints: - - valid_values: [ 4, 6 ] - cidr: - type: string - required: false - network_name: - type: string - required: false - dhcp_enabled: - type: boolean - required: false - default: true - description: > - Indicates should DHCP service be enabled on the network or not. + derived_from: tosca.nodes.nfv.VL rnc.nodes.CP: derived_from: tosca.nodes.nfv.CP - properties: - ip_address: - type: string - required: false - order: - type: integer - required: true - default: 0 - constraints: - - greater_or_equal: 0 - is_default: - type: boolean - required: false - default: false # list of capability type definitions capability_types: -- cgit 1.2.3-korg