X-Git-Url: https://gerrit.onap.org/r/gitweb?p=demo.git;a=blobdiff_plain;f=tosca%2FpNF%2FDefinitions%2Fetsi_nfv_sol001_pnfd_2_5_1_types.yaml;h=2eae43f8dca4caaad61abef0573b9de0076f36fb;hp=f05d273a1db2e3af1d8836a61471f767c0c2f7b9;hb=0f11467f0bf1d20212f94be2bbed75896b30d73f;hpb=6305603f8cb54c28e93a7e4bfad265723638299c diff --git a/tosca/pNF/Definitions/etsi_nfv_sol001_pnfd_2_5_1_types.yaml b/tosca/pNF/Definitions/etsi_nfv_sol001_pnfd_2_5_1_types.yaml index f05d273a..2eae43f8 100644 --- a/tosca/pNF/Definitions/etsi_nfv_sol001_pnfd_2_5_1_types.yaml +++ b/tosca/pNF/Definitions/etsi_nfv_sol001_pnfd_2_5_1_types.yaml @@ -4,19 +4,19 @@ description: ETSI NFV SOL 001 pnfd types definitions version 2.5.1 imports: - etsi_nfv_sol001_vnfd_2_5_1_types.yaml -data_types: +data_types: tosca.datatypes.nfv.L2AddressData: derived_from: tosca.datatypes.Root - description: Describes the information on the MAC addresses to be assigned to a connection point. + description: Describes the information on the MAC addresses to be assigned to a connection point. properties: mac_address_assignment: type: boolean description: Specifies if the address assignment is the responsibility of management and orchestration function or not. If it is set to True, it is the management and orchestration function responsibility - required: true - + required: true + tosca.datatypes.nfv.L3AddressData: derived_from: tosca.datatypes.Root - description: Provides information about Layer 3 level addressing scheme and parameters applicable to a CP + description: Provides information about Layer 3 level addressing scheme and parameters applicable to a CP properties: ip_address_assignment: type: boolean @@ -24,7 +24,7 @@ data_types: required: true floating_ip_activated: type: boolean - description: Specifies if the floating IP scheme is activated on the Connection Point or not + description: Specifies if the floating IP scheme is activated on the Connection Point or not required: true ip_address_type: type: string @@ -34,14 +34,14 @@ data_types: - valid_values: [ ipv4, ipv6 ] number_of_ip_address: type: integer - description: Minimum number of IP addresses to be assigned + description: Minimum number of IP addresses to be assigned required: false constraints: - greater_than: 0 tosca.datatypes.nfv.AddressData: derived_from: tosca.datatypes.Root - description: Describes information about the addressing scheme and parameters applicable to a CP + description: Describes information about the addressing scheme and parameters applicable to a CP properties: address_type: type: string @@ -55,9 +55,9 @@ data_types: required: false l3_address_data: type: tosca.datatypes.nfv.L3AddressData - description: Provides the information on the IP addresses to be assigned to a connection point + description: Provides the information on the IP addresses to be assigned to a connection point required: false - + tosca.datatypes.nfv.CpProtocolData: derived_from: tosca.datatypes.Root description: Describes and associates the protocol layer that a CP uses together with other protocol and connection point information @@ -65,18 +65,18 @@ data_types: associated_layer_protocol: type: string required: true - description: One of the values of the property layer_protocols of the CP + description: One of the values of the property layer_protocols of the CP constraints: - valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire ] address_data: type: list description: Provides information on the addresses to be assigned to the CP - entry_schema: + entry_schema: type: tosca.datatypes.nfv.AddressData - + tosca.datatypes.nfv.LocationInfo: derived_from: tosca.datatypes.Root - description: Represents geographical information on the location where a PNF is deployed. + description: Represents geographical information on the location where a PNF is deployed. properties: country_code: type: string # two-letter ISO 3166 country code @@ -91,7 +91,7 @@ data_types: tosca.datatypes.nfv.CivicAddressElement: derived_from: tosca.datatypes.Root - description: Represents an element of a civic location as specified in IETF RFC 4776 [11]. + description: Represents an element of a civic location as specified in IETF RFC 4776 [11]. properties: ca_type: type: string # RFC4776 @@ -106,21 +106,21 @@ capability_types: tosca.capabilities.nfv.VirtualLinkable: derived_from: tosca.capabilities.Node description: A node type that includes the VirtualLinkable capability indicates that it can be pointed by tosca.relationships.nfv.VirtualLinksTo relationship type - + relationship_types: tosca.relationships.nfv.VirtualLinksTo: derived_from: tosca.relationships.DependsOn - description: Represents an association relationship between the VNF or PNF or Sap of a Nested NS and NsVirtualLink node types - valid_target_types: [ tosca.capabilities.nfv.VirtualLinkable ] - + description: Represents an association relationship between the VNF or PNF or Sap of a Nested NS and NsVirtualLink node types + valid_target_types: [ tosca.capabilities.nfv.VirtualLinkable ] + node_types: 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 - description: Identifies which protocol the connection point uses for connectivity purposes + description: Identifies which protocol the connection point uses for connectivity purposes required: true entry_schema: type: string @@ -128,17 +128,17 @@ node_types: - valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire ] role: #Name in ETSI NFV IFA011 v0.7.3: cpRole type: string - description: Identifies the role of the port in the context of the traffic flow patterns in the VNF or parent NS + description: Identifies the role of the port in the context of the traffic flow patterns in the VNF or parent NS required: false constraints: - valid_values: [ root, leaf ] description: type: string - description: Provides human-readable information on the purpose of the connection point + description: Provides human-readable information on the purpose of the connection point required: false protocol: type: list - description: Provides information on the addresses to be assigned to the connection point(s) instantiated from this Connection Point Descriptor + description: Provides information on the addresses to be assigned to the connection point(s) instantiated from this Connection Point Descriptor required: true entry_schema: type: tosca.datatypes.nfv.CpProtocolData @@ -149,7 +149,7 @@ node_types: tosca.nodes.nfv.PNF: derived_from: tosca.nodes.Root - properties: + properties: descriptor_id: # instead of pnfd_id type: string # GUID required: true @@ -168,7 +168,7 @@ node_types: name: type: string required: true - geographical_location_info: + geographical_location_info: type: tosca.datatypes.nfv.LocationInfo required: false requirements: @@ -184,9 +184,9 @@ node_types: requirements: - external_virtual_link: capability: tosca.capabilities.nfv.VirtualLinkable - relationship: tosca.relationships.nfv.VirtualLinksTo - -policy_types: + relationship: tosca.relationships.nfv.VirtualLinksTo + +policy_types: tosca.policies.nfv.SecurityGroupRule: derived_from: tosca.policies.Root description: The SecurityGroupRule type is a policy type specified the matching criteria for the ingress and/or egress traffic to/from visited connection points as defined in ETSI GS NFV-IFA 011 [1]. @@ -232,4 +232,4 @@ policy_types: - greater_or_equal: 0 - less_or_equal: 65535 default: 65535 - targets: [ tosca.nodes.nfv.PnfExtCp ] + targets: [ tosca.nodes.nfv.PnfExtCp ]