From f77831f6c0fcbe27a46ef7f8bff5af3ff978bbc3 Mon Sep 17 00:00:00 2001 From: vreck Date: Thu, 27 Aug 2020 10:43:54 +0200 Subject: [PATCH] Update etsi_nfv_sol001_common_types.yaml, etsi_nfv_sol001_nsd_types.yaml, etsi_nfv_sol001_pnfd_types.yaml, etsi_nfv_sol001_vnfd_types.yaml files --- etsi_nfv_sol001_common_types.yaml | 24 ++++-------- etsi_nfv_sol001_nsd_types.yaml | 20 +++++++--- etsi_nfv_sol001_pnfd_types.yaml | 62 ++++++++++++++++++++++++------- etsi_nfv_sol001_vnfd_types.yaml | 26 ++++++------- 4 files changed, 85 insertions(+), 47 deletions(-) diff --git a/etsi_nfv_sol001_common_types.yaml b/etsi_nfv_sol001_common_types.yaml index 30ee213..061257e 100644 --- a/etsi_nfv_sol001_common_types.yaml +++ b/etsi_nfv_sol001_common_types.yaml @@ -1,9 +1,9 @@ tosca_definitions_version: tosca_simple_yaml_1_2 -description: ETSI NFV SOL 001 common types definitions version 2.7.1 +description: ETSI NFV SOL 001 common types definitions version 2.8.1 metadata: template_name: etsi_nfv_sol001_common_types template_author: ETSI_NFV - template_version: 2.7.1 + template_version: 2.8.1 data_types: tosca.datatypes.nfv.L2AddressData: @@ -29,7 +29,7 @@ data_types: required: true ip_address_type: type: string - description: Defines address type. The address type should be aligned with the address type supported by the layer_protocols properties of the parent VnfExtCp + description: Defines address type. The address type should be aligned with the address type supported by the layer_protocols properties of the connection point required: false constraints: - valid_values: [ ipv4, ipv6 ] @@ -181,9 +181,6 @@ 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 - - tosca.capabilities.nfv.Forwarding: - derived_from: tosca.capabilities.Root relationship_types: tosca.relationships.nfv.VirtualLinksTo: @@ -191,10 +188,6 @@ relationship_types: description: Represents an association relationship between the VduCp and VnfVirtualLink node types or the association between either a VnfExtCp, a PnfExtCp or a Sap and an NsVirtualLink node types. valid_target_types: [ tosca.capabilities.nfv.VirtualLinkable ] - tosca.relationships.nfv.ForwardTo: - derived_from: tosca.relationships.Root - valid_target_types: [ tosca.capabilities.nfv.Forwarding ] - tosca.relationships.nfv.VipVirtualLinksTo: derived_from: tosca.relationships.DependsOn description: Represents an association relationship between the VipCp and a VnfVirtualLink node types or between the former and a NsVirtualLink node types. @@ -246,28 +239,28 @@ policy_types: direction: type: string description: The direction in which the security group rule is applied. The direction of 'ingress' or 'egress' is specified against the associated CP. I.e., 'ingress' means the packets entering a CP, while 'egress' means the packets sent out of a CP. - required: false + required: true constraints: - valid_values: [ ingress, egress ] default: ingress ether_type: type: string description: Indicates the protocol carried over the Ethernet layer. - required: false + required: true constraints: - valid_values: [ ipv4, ipv6 ] default: ipv4 protocol: type: string description: Indicates the protocol carried over the IP layer. Permitted values include any protocol defined in the IANA protocol registry, e.g. TCP, UDP, ICMP, etc. - required: false + required: true constraints: - valid_values: [ hopopt, icmp, igmp, ggp, ipv4, st, tcp, cbt, egp, igp, bbn_rcc_mon, nvp_ii, pup, argus, emcon, xnet, chaos, udp, mux, dcn_meas, hmp, prm, xns_idp, trunk_1, trunk_2, leaf_1, leaf_2, rdp, irtp, iso_tp4, netblt, mfe_nsp, merit_inp, dccp, 3pc, idpr, xtp, ddp, idpr_cmtp, tp++, il, ipv6, sdrp, ipv6_route, ipv6_frag, idrp, rsvp, gre, dsr, bna, esp, ah, i_nlsp, swipe, narp, mobile, tlsp, skip, ipv6_icmp, ipv6_no_nxt, ipv6_opts, cftp, sat_expak, kryptolan, rvd, ippc, sat_mon, visa, ipcv, cpnx, cphb, wsn, pvp, br_sat_mon, sun_nd, wb_mon, wb_expak, iso_ip, vmtp, secure_vmtp, vines, ttp, iptm, nsfnet_igp, dgp, tcf, eigrp, ospfigp, sprite_rpc, larp, mtp, ax.25, ipip, micp, scc_sp, etherip, encap, gmtp, ifmp, pnni, pim, aris, scps, qnx, a/n, ip_comp, snp, compaq_peer, ipx_in_ip, vrrp, pgm, l2tp, ddx, iatp, stp, srp, uti, smp, sm, ptp, isis, fire, crtp, crudp, sscopmce, iplt, sps, pipe, sctp, fc, rsvp_e2e_ignore, mobility, udp_lite, mpls_in_ip, manet, hip, shim6, wesp, rohc ] default: tcp port_range_min: type: integer description: Indicates minimum port number in the range that is matched by the security group rule. If a value is provided at design-time, this value may be overridden at run-time based on other deployment requirements or constraints. - required: false + required: true constraints: - greater_or_equal: 0 - less_or_equal: 65535 @@ -275,9 +268,8 @@ policy_types: port_range_max: type: integer description: Indicates maximum port number in the range that is matched by the security group rule. If a value is provided at design-time, this value may be overridden at run-time based on other deployment requirements or constraints. - required: false + required: true constraints: - greater_or_equal: 0 - less_or_equal: 65535 default: 65535 - diff --git a/etsi_nfv_sol001_nsd_types.yaml b/etsi_nfv_sol001_nsd_types.yaml index 98680b2..17c5936 100644 --- a/etsi_nfv_sol001_nsd_types.yaml +++ b/etsi_nfv_sol001_nsd_types.yaml @@ -1,13 +1,15 @@ tosca_definitions_version: tosca_simple_yaml_1_2 -description: ETSI NFV SOL 001 nsd types definitions version 2.7.1 +description: ETSI NFV SOL 001 nsd types definitions version 2.8.1 metadata: template_name: etsi_nfv_sol001_nsd_types template_author: ETSI_NFV - template_version: 2.7.1 + template_version: 2.8.1 imports: - - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.7.1/etsi_nfv_sol001_common_types.yaml - # editor's note: During the development of the SOL001ed271 GS, to enable this file to be verified by a TOSCA parser, the imports statement has to be replaced with a reference to a local copy of the common definitions YAML file + - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.8.1/etsi_nfv_sol001_common_types.yaml + - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.8.1/etsi_nfv_sol001_vnfd_types.yaml + - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.8.1/etsi_nfv_sol001_pnfd_types.yaml + # editor's note: During the development of the SOL001ed281 GS, to enable this file to be verified by a TOSCA parser, the imports statement has to be replaced with a reference to a local copy of the common definitions YAML file data_types: @@ -119,6 +121,15 @@ data_types: description: Describes the periodicity at which to collect the performance information. required: false +capability_types: + tosca.capabilities.nfv.Forwarding: + derived_from: tosca.capabilities.Root + +relationship_types: + tosca.relationships.nfv.ForwardTo: + derived_from: tosca.relationships.Root + valid_target_types: [ tosca.capabilities.nfv.Forwarding ] + interface_types: tosca.interfaces.nfv.Nslcm: derived_from: tosca.interfaces.Root @@ -449,4 +460,3 @@ policy_types: constraints: - min_length: 1 targets: [ tosca.nodes.nfv.VNF ] - diff --git a/etsi_nfv_sol001_pnfd_types.yaml b/etsi_nfv_sol001_pnfd_types.yaml index 4e31eb3..6105408 100644 --- a/etsi_nfv_sol001_pnfd_types.yaml +++ b/etsi_nfv_sol001_pnfd_types.yaml @@ -1,13 +1,13 @@ tosca_definitions_version: tosca_simple_yaml_1_2 -description: ETSI NFV SOL 001 pnfd types definitions version 2.7.1 +description: ETSI NFV SOL 001 pnfd types definitions version 2.8.1 metadata: template_name: etsi_nfv_sol001_pnfd_types template_author: ETSI_NFV - template_version: 2.7.1 + template_version: 2.8.1 imports: - - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.7.1/etsi_nfv_sol001_common_types.yaml - # editor's note: During the development of the SOL001ed271 GS, to enable this file to be verified by a TOSCA parser, the imports statement has to be replaced with a reference to a local copy of the common definitions YAML file + - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.8.1/etsi_nfv_sol001_common_types.yaml + # editor's note: During the development of the SOL001ed281 GS, to enable this file to be verified by a TOSCA parser, the imports statement has to be replaced with a reference to a local copy of the common definitions YAML file data_types: @@ -16,15 +16,19 @@ data_types: description: Represents geographical information on the location where a PNF is deployed. properties: country_code: - type: string # two-letter ISO 3166 country code - description: Country code - required: true + type: string # two-letter ISO 3166 country code + description: Country code + required: true civic_address_element: - type: list - entry_schema: - type: tosca.datatypes.nfv.CivicAddressElement - description: Elements composing the civic address where the PNF is deployed. - required: false + type: list + entry_schema: + type: tosca.datatypes.nfv.CivicAddressElement + description: Elements composing the civic address where the PNF is deployed. + required: false + geographic_coordinates: + type: tosca.datatypes.nfv.GeographicCoordinates + description: Geographic coordinates (e.g. Altitude, Longitude, Latitude) where the PNF is deployed. + required: false tosca.datatypes.nfv.CivicAddressElement: derived_from: tosca.datatypes.Root @@ -39,6 +43,39 @@ data_types: description: caValue as per RFC4776. required: true + tosca.datatypes.nfv.GeographicCoordinates: + derived_from: tosca.datatypes.Root + description: Represents an element of a geographic coordinate location as specified in IETF RFC?6225 [21]. + properties: + latitude_uncertainty: + type: string # RFC 6225 + description: LatUnc as per RFC 6225 + required: false + latitude: + type: string # RFC 6225 + description: Latitude value as per RFC 6225 + required: true + longitude_uncertainty: + type: string # RFC 6225 + description: LongUnc as per RFC 6225 + required: false + longitude: + type: string # RFC 6225 + description: Longitude value as per RFC 6225 + required: true + altitude_type: + type: string # RFC 6225 + description: AType value as per RFC 6225 + required: true + altitude_uncertainty: + type: string # RFC 6225 + description: AltUnc as per RFC 6225 + required: false + altitude: + type: string # RFC 6225 + description: Altitude value as per RFC 6225 + required: true + node_types: tosca.nodes.nfv.PNF: derived_from: tosca.nodes.Root @@ -92,4 +129,3 @@ policy_types: derived_from: tosca.policies.nfv.Abstract.SecurityGroupRule description: The PnfSecurityGroupRule type is a policy type specified the matching criteria for the ingress and/or egress traffic to/from visited PNF external connection points. targets: [ tosca.nodes.nfv.PnfExtCp ] - diff --git a/etsi_nfv_sol001_vnfd_types.yaml b/etsi_nfv_sol001_vnfd_types.yaml index 9402bd2..af71eb2 100644 --- a/etsi_nfv_sol001_vnfd_types.yaml +++ b/etsi_nfv_sol001_vnfd_types.yaml @@ -1,13 +1,13 @@ tosca_definitions_version: tosca_simple_yaml_1_2 -description: ETSI NFV SOL 001 vnfd types definitions version 2.7.1 +description: ETSI NFV SOL 001 vnfd types definitions version 2.8.1 metadata: template_name: etsi_nfv_sol001_vnfd_types template_author: ETSI_NFV - template_version: 2.7.1 + template_version: 2.8.1 imports: - - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.7.1/etsi_nfv_sol001_common_types.yaml - # editor's note: During the development of the SOL001ed271 GS, to enable this file to be verified by a TOSCA parser, the imports statement has to be replaced with a reference to a local copy of the common definitions YAML file + - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.8.1/etsi_nfv_sol001_common_types.yaml + # editor's note: During the development of the SOL001ed281 GS, to enable this file to be verified by a TOSCA parser, the imports statement has to be replaced with a reference to a local copy of the common definitions YAML file data_types: tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements: @@ -86,7 +86,7 @@ data_types: numa_enabled: type: boolean description: It specifies the memory allocation to be cognisant of the relevant process/core allocation. - required: false + required: true default: false tosca.datatypes.nfv.VirtualCpu: @@ -232,7 +232,7 @@ data_types: vlan_transparent: type: boolean description: Specifies whether to support VLAN transparency for this L2 protocol or not. - required: false + required: true default: false mtu: type: integer @@ -374,7 +374,7 @@ data_types: scaling_by_more_than_one_step_supported: type: boolean description: Signals whether passing a value larger than one in the numScalingSteps parameter of the ScaleVnf operation is supported by this VNF. - required: false + required: true default: false tosca.datatypes.nfv.VnfScaleToLevelOperationConfiguration: @@ -499,8 +499,8 @@ data_types: is_writable_anytime: type: boolean description: It specifies whether these additional configurable properties are writeable (TRUE) at any time (i.e. prior to / at instantiation time as well as after instantiation).or (FALSE) only prior to / at instantiation time. If this property is not present, the additional configurable properties are writable anytime. - required: false - default : false + required: true + default : true tosca.datatypes.nfv.VnfInfoModifiableAttributes: derived_from: tosca.datatypes.Root @@ -618,7 +618,7 @@ data_types: rdma_enabled: type: boolean description: Indicates if the storage support RDMA - required: false + required: true default: false tosca.datatypes.nfv.VirtualObjectStorageData: @@ -1068,7 +1068,7 @@ interface_types: node_types: 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 + description: The generic abstract type from which all VNF specific node types shall be derived to form, together with other node types, the TOSCA service template(s) representing the VNFD properties: descriptor_id: # instead of vnfd_id type: string # UUID @@ -1200,7 +1200,8 @@ node_types: boot_order: type: boolean description: indicates whether the order of the virtual_storage requirements is used as the boot index (the first requirement represents the lowest index and defines highest boot priority) - required: false + required: true + default: false nfvi_constraints: type: map description: Describes constraints on the NFVI for the VNFC instance(s) created from this VDU. This property is reserved for future use in the present document. @@ -1557,4 +1558,3 @@ policy_types: derived_from: tosca.policies.nfv.Abstract.SecurityGroupRule 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]. targets: [ tosca.nodes.nfv.VduCp, tosca.nodes.nfv.VnfExtCp ] - -- GitLab