X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=tosca%2FvCPE%2FDefinitions%2Fonap_dm.yaml;h=c047df88b05dd83e83f134bae7bc4858e747d08a;hb=676591091ff3c154193213b26103c694f1a5f1be;hp=bd185c757d49f17a26cea570defe006a48a71fce;hpb=7d6e84da8bec7fc0d3d141992b97b0bb2d16ebdb;p=demo.git diff --git a/tosca/vCPE/Definitions/onap_dm.yaml b/tosca/vCPE/Definitions/onap_dm.yaml index bd185c75..c047df88 100644 --- a/tosca/vCPE/Definitions/onap_dm.yaml +++ b/tosca/vCPE/Definitions/onap_dm.yaml @@ -233,7 +233,7 @@ data_types: type: tosca.datatypes.nfv.LogicalNodeData description: references (couples) the CP with any logical node I/O requirements (for network devices) that may have been created. Linking these attributes is necessary so that so that I/O requirements that need to be articulated at the logical node level can be associated with the network interface requirements associated with the CP. required: false - + tosca.datatypes.nfv.injectFile: #used for vCPE usecase derived_from: tosca.datatypes.Root properties: @@ -477,10 +477,10 @@ data_types: required: false constraints: - greater_than: 0 - segmentation_id: #Introduced from Beijing release, only used for vCPE usecase, outside the scope of SOL001 v2.5.1 + segmentation_id: #Introduced from Beijing release, only used for vCPE usecase, outside the scope of SOL001 v2.5.1 type: integer required: false - physical_network: #Introduced from Beijing release, only used for vCPE usecase, outside the scope of SOL001 v2.5.1 + physical_network: #Introduced from Beijing release, only used for vCPE usecase, outside the scope of SOL001 v2.5.1 type: string required: false tosca.datatypes.nfv.L3ProtocolData: @@ -526,20 +526,20 @@ data_types: description: describes one protocol layer and associated protocol data for a given virtual link used in a specific VNF deployment flavour properties: associated_layer_protocol: - type: string - description: Identifies one of the protocols a virtualLink gives access to (ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire) as specified by the connectivity_type property. - required: true - constraints: - - valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire ] + type: string + description: Identifies one of the protocols a virtualLink gives access to (ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire) as specified by the connectivity_type property. + required: true + constraints: + - valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire ] l2_protocol_data: - type: tosca.datatypes.nfv.L2ProtocolData - description: Specifies the L2 protocol data for a virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L2 protocol and shall be absent otherwise. - required: false + type: tosca.datatypes.nfv.L2ProtocolData + description: Specifies the L2 protocol data for a virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L2 protocol and shall be absent otherwise. + required: false l3_protocol_data: - type: tosca.datatypes.nfv.L3ProtocolData - description: Specifies the L3 protocol data for this virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L3 protocol and shall be absent otherwise. - required: false - + type: tosca.datatypes.nfv.L3ProtocolData + description: Specifies the L3 protocol data for this virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L3 protocol and shall be absent otherwise. + required: false + tosca.datatypes.nfv.VlProfile: derived_from: tosca.datatypes.Root description: Describes additional instantiation data for a given VL used in a specific VNF deployment flavour. @@ -767,7 +767,7 @@ data_types: description: Identifies a performance metric derived from those defined in ETSI GS NFV-IFA 027.The packetOutgoingVirtualLink and packetIncomingVirtualLink metrics shall be obtained by aggregation the PacketOutgoing and PacketIncoming measurements defined in clause 7.1 of GS NFV-IFA 027 of all virtual link ports attached to the virtual link to which the metrics apply. required: true constraints: - - valid_values: [ packet_outgoing_virtual_link, packet_incoming_virtual_link ] + - valid_values: [ packet_outgoing_virtual_link, packet_incoming_virtual_link ] collection_period: type: scalar-unit.time description: Describes the recommended periodicity at which to collect the performance information. @@ -854,7 +854,7 @@ data_types: description: Configuration parameters for the OperateVnf operation required: false change_ext_connectivity: - type: tosca.datatypes.nfv.VnfChangeExtConnectivityOperationConfiguration + type: tosca.datatypes.nfv.VnfChangeExtConnectivityOperationConfiguration description: Configuration parameters for the changeExtVnfConnectivityOpConfig operation required: false tosca.datatypes.nfv.CpProtocolData: @@ -1006,7 +1006,7 @@ data_types: required: true checksum: type: string - description: Checksum of the software image file + description: Checksum of the software image file required: true container_format: type: string @@ -1022,7 +1022,7 @@ data_types: - valid_values: [ aki, ami, ari, iso, qcow2, raw, vdi, vhd, vhdx, vmdk ] min_disk: type: scalar-unit.size # Number - description: The minimal disk size requirement for this software image + description: The minimal disk size requirement for this software image required: true min_ram: type: scalar-unit.size # Number @@ -1161,7 +1161,7 @@ interface_types: node_types: tosca.nodes.nfv.Vdu.Compute: derived_from: tosca.nodes.Root - description: Describes the virtual compute part of a VDU which is a construct supporting the description of the deployment and operational behavior of a VNFC + description: Describes the virtual compute part of a VDU which is a construct supporting the description of the deployment and operational behavior of a VNFC properties: name: type: string @@ -1256,10 +1256,10 @@ node_types: type: tosca.capabilities.nfv.VirtualStorage description: Defines the capabilities of virtual_storage. requirements: - - virtual_link: - capability: tosca.capabilities.nfv.VirtualLinkable - relationship: tosca.relationships.nfv.VirtualLinksTo - #description: Describes the requirements for linking to virtual link + - virtual_link: + capability: tosca.capabilities.nfv.VirtualLinkable + relationship: tosca.relationships.nfv.VirtualLinksTo + #description: Describes the requirements for linking to virtual link tosca.nodes.nfv.Vdu.VirtualObjectStorage: derived_from: tosca.nodes.Root description: This node type describes the specifications of requirements related to virtual object storage resources @@ -1274,7 +1274,7 @@ node_types: description: Defines the capabilities of virtual_storage. tosca.nodes.nfv.Cp: derived_from: tosca.nodes.Root - description: Provides information regarding the purpose of the connection point + description: Provides information regarding the purpose of the connection point properties: layer_protocols: type: list @@ -1334,7 +1334,7 @@ node_types: description: Describes the type of the virtual network interface realizing the CPs instantiated from this CPD required: false constraints: - - valid_values: [ normal, virtio, direct-physical ] + - valid_values: [ direct, normal, virtio, direct-physical ] vnic_name: # Introduced from Beijing release, aligned with ONAP resource IM, outside the scope of SOL001 v2.5.1 type: string required: false @@ -1347,38 +1347,38 @@ node_types: relationship: tosca.relationships.nfv.VirtualBindsTo node: tosca.nodes.nfv.Vdu.Compute tosca.nodes.nfv.VnfVirtualLink: - derived_from: tosca.nodes.Root - description: Describes the information about an internal VNF VL - properties: - connectivity_type: - type: tosca.datatypes.nfv.ConnectivityType - description: Specifies the protocol exposed by the VL and the flow pattern supported by the VL - required: true - description: + derived_from: tosca.nodes.Root + description: Describes the information about an internal VNF VL + properties: + connectivity_type: + type: tosca.datatypes.nfv.ConnectivityType + description: Specifies the protocol exposed by the VL and the flow pattern supported by the VL + required: true + description: + type: string + description: Provides human-readable information on the purpose of the VL + required: false + test_access: + type: list + description: Test access facilities available on the VL + required: false + entry_schema: type: string - description: Provides human-readable information on the purpose of the VL - required: false - test_access: - type: list - description: Test access facilities available on the VL - required: false - entry_schema: - type: string - constraints: - - valid_values: [ passive_monitoring, active_loopback ] - vl_profile: - type: tosca.datatypes.nfv.VlProfile - description: Defines additional data for the VL - required: true - monitoring_parameters: - type: list - description: Describes monitoring parameters applicable to the VL - required: false - entry_schema: - type: tosca.datatypes.nfv.VirtualLinkMonitoringParameter - capabilities: - virtual_linkable: - type: tosca.capabilities.nfv.VirtualLinkable + constraints: + - valid_values: [ passive_monitoring, active_loopback ] + vl_profile: + type: tosca.datatypes.nfv.VlProfile + description: Defines additional data for the VL + required: true + monitoring_parameters: + type: list + description: Describes monitoring parameters applicable to the VL + required: false + entry_schema: + type: tosca.datatypes.nfv.VirtualLinkMonitoringParameter + capabilities: + virtual_linkable: + type: tosca.capabilities.nfv.VirtualLinkable tosca.nodes.nfv.VNF: derived_from: tosca.nodes.Root description: The generic abstract type from which all VNF specific abstract node types shall be derived to form, together with other node types, the TOSCA service template(s) representing the VNFD @@ -1531,7 +1531,7 @@ policy_types: required: false # required if multiple entries in levels tosca.policies.nfv.VduInstantiationLevels: derived_from: tosca.policies.Root - description: The VduInstantiationLevels type is a policy type representing all the instantiation levels of resources to be instantiated within a deployment flavour in term of the number of VNFC instances to be created from each vdu.Compute. as defined in ETSI GS NFV-IFA 011 [1] + description: The VduInstantiationLevels type is a policy type representing all the instantiation levels of resources to be instantiated within a deployment flavour in term of the number of VNFC instances to be created from each vdu.Compute. as defined in ETSI GS NFV-IFA 011 [1] properties: levels: type: map # key: levelId @@ -1542,7 +1542,7 @@ policy_types: targets: [ tosca.nodes.nfv.Vdu.Compute ] tosca.policies.nfv.VirtualLinkInstantiationLevels: derived_from: tosca.policies.Root - description: The VirtualLinkInstantiationLevels type is a policy type representing all the instantiation levels of virtual link resources to be instantiated within a deployment flavour as defined in ETSI GS NFV-IFA 011 [1]. + description: The VirtualLinkInstantiationLevels type is a policy type representing all the instantiation levels of virtual link resources to be instantiated within a deployment flavour as defined in ETSI GS NFV-IFA 011 [1]. properties: levels: type: map # key: levelId @@ -1680,7 +1680,7 @@ policy_types: targets: [ tosca.nodes.nfv.VduCp, tosca.nodes.nfv.VnfExtCp ] tosca.policies.nfv.SupportedVnfInterface: derived_from: tosca.policies.Root - description: this policy type represents interfaces produced by a VNF, the details to access them and the applicable connection points to use to access these interfaces + description: this policy type represents interfaces produced by a VNF, the details to access them and the applicable connection points to use to access these interfaces properties: interface_name: type: string