From 97ea05cda5e1b0f67c0366a2c8bd01ba63d3fe1a Mon Sep 17 00:00:00 2001 From: Muhammad Umair Khan Date: Fri, 5 Jul 2024 10:51:50 +0500 Subject: [PATCH 01/22] Update as per 5.1.1 --- .../General_Definitions/SOL003_def.yaml | 297 +++++++++++++++++- .../VNFFaultManagement.yaml | 2 +- .../SOL003VNFFaultManagement_def.yaml | 34 +- src/SOL003/VNFIndicator/VNFIndicator.yaml | 2 +- .../definitions/SOL003VNFIndicator_def.yaml | 7 + .../VNFLifecycleManagement.yaml | 2 +- .../SOL003VNFLifecycleManagement_def.yaml | 117 ++++++- .../VNFLifecycleOperationGranting.yaml | 2 +- ...L003VNFLifecycleOperationGranting_def.yaml | 93 +++++- .../VNFPerformanceManagement.yaml | 2 +- .../SOL003VNFPerformanceManagement_def.yaml | 8 + 11 files changed, 538 insertions(+), 28 deletions(-) diff --git a/src/SOL003/General_Definitions/SOL003_def.yaml b/src/SOL003/General_Definitions/SOL003_def.yaml index fb570390..ef37d075 100644 --- a/src/SOL003/General_Definitions/SOL003_def.yaml +++ b/src/SOL003/General_Definitions/SOL003_def.yaml @@ -643,14 +643,14 @@ definitions: description: > This type represents network address data for a virtual CP. - * NOTE 1: If the container cluster is set up to be able to configure an external load balancer this address will be used, - otherwise it will be ignored by the CISM. + * NOTE 1: The loadBalancerIp and the loadBalancerSourceRanges attributes are only used if the CIS cluster is set up to be + able to configure an external load balancer. Otherwise it shall be ignored. * NOTE 2: In case the cluster can configure an external load balancer but no loadBalancerIp is provided the container cluster will assign an IP address. * NOTE 3: The attribute is only relevant if the virtual CP is instantiated in a cluster that supports configuration of IP address pools for virtual CPs. Otherwise it shall be ignored. MetalLB is an example of a solution for Kubernetes® that supports configuration of address pools for load balancer services. - * NOTE 4: The loadBalancerIp and the addressPoolName attributes shall not be present at the same time. + * NOTE 4: The loadBalancerIp, addressPoolName and the externalIp attributes shall not be present at the same time. type: object required: - type @@ -662,18 +662,41 @@ definitions: type: string enum: - IPV4 - - IPV6 + - IPV6 loadBalancerIp: description: > Fixed address to assign to an external load balancer. See notes 1,2 and 4. $ref: "#/definitions/IpAddress" + externalIp: + description: > + An external IP address assigned to the virtual CP. + This IP address is not managed by CISM. See note 4. + $ref: "#/definitions/IpAddress" addressPoolName: description: > - Name of an address pool from which the container - cluster will assign an IP address to the virtual CP. See - notes 3 and 4. + Name of an address pool from which the CIS + cluster will assign an IP address to the virtual CP. See + notes 3 and 4. type: string + loadBalancerSourceRanges: + description: > + List of client IP address ranges allowed to access an external load balancer. See note 1. + type: array + items: + type: object + required: + - minAddress + - maxAddress + properties: + minAddress: + description: > + Lowest IP address belonging to the range. + $ref: "#/definitions/IpAddress" + maxAddress: + description: > + Highest IP address belonging to the range. + $ref: "#/definitions/IpAddress" ExtVirtualLinkData: description: > @@ -782,7 +805,267 @@ definitions: PaaS Service instance specific additional information. The applicable structure, and whether or not this attribute is available, is dependent on the type of the PaaS Service. $ref: "#/definitions/KeyValuePairs" + + ResourceCapacityDefinition: + description: > + This type represents selected values for capacity related VDU attributes. + + * NOTE: Resource definitions not related to a VDU are not considered in this version of the present document. + type: object + required: + - type + properties: + tag: + description: > + Tag assigned by the issuer of a VNF LCM operation request that contains this data type with values to be applied to a VDU. + It is used for tracking purposes. + The tag is preserved in the run time record as long as at least one value of the capacity + related attributes associated with that tag is still valid, i.e., it has not been modified by a later VNF LCM operation request. + + At most one tag can be included when the data type is used in a VNF LCM operation request. + + When the data type is used in the VnfInstance data type it may contain multiple tags, + namely those provided in VNF LCM requests, if at least one of the values provided in that request associated to that tag is still applicable in the VNFCs created from this VDU, i.e., it has not been modified by a later request. + type: array + items: + $ref: "#/definitions/String" + type: + description: > + Type of the resource definition referenced. + type: string + enum: + - COMPUTE + - STORAGE + - OSCONTAINER + vduId: + description: > + Reference to the related Vdu applicable to this resource in the VNFD. + It shall be present when the referenced resource definition is related to a VDU. See note. + $ref: "#/definitions/IdentifierInVnfd" + osContainerDescData: + description: > + Indicates values for resource capacity related attributes in an OsContainerDesc. + It shall be present when the attribute 'type' indicates OSCONTAINER and absent otherwise. + type: array + items: + $ref: "#/definitions/OsContainerDescData" + virtualComputeDescData: + description: > + Indicates values for resource capacity related attributes in an OsContainerDesc. + It shall be present when the attribute 'type' indicates OSCONTAINER and absent otherwise. + $ref: "#/definitions/VirtualComputeDescData" + virtualStorageDescData: + description: > + Indicates the value for the storage size related attribute in an VirtualStorageDesc. + It shall be present when the attribute 'type' indicates STORAGE and absent otherwise. + type: array + items: + $ref: "#/definitions/VirtualStorageDescData" + + OsContainerDescData: + description: > + This type represents selected values for capacity related VDU attributes of an OsContainer resource. + + * NOTE: At least one of the attributes shall be present. + type: object + required: + - resourceTemplateId + oneOf: + - required: + - requestedCpuResources + - required: + - requestedMemoryResources + - required: + - requestedEphemeralStorageResources + - required: + - extendedResourceRequests + - required: + - cpuResourceLimit + - required: + - memoryResourceLimit + - required: + - ephemeralStorageResourceLimit + - required: + - hugePageResources + properties: + resourceTemplateId: + description: > + Identifier of an osContainerDesc in the VNFD. + $ref: "#/definitions/IdentifierInVnfd" + requestedCpuResources: + description: > + Number of CPU resources requested for the container in milli-CPU. See note. + type: integer + requestedMemoryResources: + description: > + Amount of memory resources requested for the container expressed in the same units as + specified in the requested_memory_resources_valid_values property in VNFD (clause 6.8.12 in ETSI GS NFV-SOL 001 [14]) for this container descriptor. See note. + type: array + items: + $ref: "#/definitions/Number" + requestedEphemeralStorageResources: + description: > + Size of ephemeral storage resources requested for the container expressed in the same + units as specified in the requested_ephemeral_storage_resources_valid_values property VNFD (clause 6.8.12 in ETSI GS NFV-SOL 001 [14]) for this container descriptor. See note. + $ref: "#/definitions/Number" + extendedResourceRequests: + description: > + Map of the amount of extended resources of the type indicated in the key. + The key is a string that identifies an extended resource indicated in the extended_resource_requests property in the VNFD (clause 6.8.12 in ETSI GS NFV-SOL 001 [14]) for this container descriptor. + The value is an integer that indicates the required amount for a particular extended resource. + See note. + type: array + items: + type: integer + cpuResourceLimit: + description: > + Number of CPU resources the container can maximally use in milli-CPU. See note. + type: integer + memoryResourceLimit: + description: > + Amount of memory resources the container can maximally use expressed in the same units + as specified in the memory_resource_limit_valid_values property VNFD + (clause 6.8.12 in ETSI GS NFV-SOL 001 [14]) for this container descriptor. See note. + $ref: "#/definitions/Number" + ephemeralStorageResourceLimit: + description: > + Size of ephemeral storage resources the container can maximally use expressed in the + same units as specified in the ephemeral_storage_resource_limit_valid_values property VNFD + (clause 6.8.12 in ETSI GS NFV-SOL 001 [14]) for this container descriptor. See note. + $ref: "#/definitions/Number" + hugePageResources: + description: > + Map of the total size values required for all the hugepages of the size indicated in the key. + The key is a string and corresponds to one of the values of the hugepage sizes indicated in the huge_pages_resources property in the VNFD (clause 6.8.12 in ETSI GS NFV-SOL 001 [14]) for this container descriptor. + The value is a number that indicates the required total size expressed in the same units as in the huge_pages_resource property in the VNFD (clause 6.8.12 in ETSI GS NFV-SOL 001 [14]) that indicates the valid values for required total size for the particular hugepage size. + See note. + type: array + items: + $ref: "#/definitions/Number" + + VirtualComputeDescData: + description: > + This type represents selected values for capacity related VDU attributes of the virtual compute resource of a VM. + + * NOTE: At least one of the attributes shall be present. + type: object + required: + - resourceTemplateId + oneOf: + - required: + - numVirtualCpu + - required: + - virtualMemSize + - required: + - sizeOfVirtualDisk + - required: + - hugePagesRequirements + properties: + resourceTemplateId: + description: > + Identifier of an osContainerDesc in the VNFD. + $ref: "#/definitions/IdentifierInVnfd" + numVirtualCpu: + description: > + Number of virtual CPUs. See note. + type: integer + virtualMemSize: + description: > + Amount of virtual Memory expressed in the same units as specified in the + virtual_mem_size_valid_values property in the VNFD (clause 6.2.7.2 in ETSI GS NFV-SOL 001 [14]) for this virtual compute descriptor. See note. + $ref: "#/definitions/Number" + sizeOfVirtualDisk: + description: > + Size of virtualised storage resource expressed in the same units as specified in the + size_of_storage_valid_values property in the VNFD + (clause 6.2.39.2 in ETSI GS NFV-SOL 001 [14]) for this virtual compute descriptor. See note. + $ref: "#/definitions/Number" + hugePagesRequirements: + description: > + Map of the total size values required for all the hugepages of the size indicated in the key. + The key is a string and corresponds to one of the values of the hugepage sizes indicated + in the huge_pages_requirements property in the VNFD (clause 6.2.7.2 in ETSI GS NFV-SOL 001 [14]) for this virtual compute descriptor. + The value is a numberthat indicates the required total size expressed in the same units + as in the huge_pages_requirements property in the VNFD (clause 6.2.7.2 in ETSI GS NFV-SOL 001 [14]) that indicates the valid vaues for required total size for the particular hugepage size. + See note. + type: array + items: + $ref: "#/definitions/Number" + + VirtualStorageDescData: + description: > + This type represents selected values for capacity related VDU attributes of the virtual storage resource. + type: object + required: + - resourceTemplateId + - sizeOfStorage + properties: + resourceTemplateId: + description: > + Identifier of an osContainerDesc in the VNFD. + $ref: "#/definitions/IdentifierInVnfd" + sizeOfStorage: + description: > + If the 'typeOfStorage' attribute in the VirtualStorageDesc + (see clause 7.1.9.4.2.2 in ETSI GS NFV-IFA 011) referenced by the resourceTemplateId + indicates BLOCK or FILE it is the size of the virtualized storage resource, expressed + in the same units as specified in the size_of_storage_valid_values property in the VNFD + (clause 6.2.39.2 or 6.2.41.2, respectively, in ETSI GS NFV-SOL 001). + If the 'typeOfStorage' attribute in the VirtualStorageDesc (see clause 7.1.9.4.2.2 in + ETSI GS NFV-SOL 001) referenced by the resourceTemplateId indicates OBJECT it is + the maximum size of the virtualized storage resource expressed in the same units as specified in the max_size_of_storage_valid_values property in the VNFD (clause 6.2.40.2 in ETSI GS NFV-SOL 001). + $ref: "#/definitions/Number" + + MonitoringConnection: + description: > + The MonitoringConnection shall follow the indications provided. + + * NOTE: The VNFM can be made aware of monitoring connection information, + including their identifiers to be used by configuration means outside the scope of the + present document (e.g. using relevant NFV-MANO management APIs as defined in + ETSI GS NFV-SOL 009 [i.18]). + type: object + required: + - id + - monitoringType + properties: + id: + description: > + Identifier of the monitoring connection. See note. + $ref: "#/definitions/Identifier" + monitoringType: + description: > + Type of monitoring way. + type: string + enum: + - VIM_CISM + - EXTERNAL + - PAAS + vimId: + description: > + Information about VIM or CISM connection(s) for monitoring resources for the VNF instance. + Can be set when MonitoringType is equal to “VIM_CISM”. + $ref: "#/definitions/Identifier" + paasServiceId: + description: > + Information about PaasAsset to be used. Can be set when MonitoringType is equal to “PAAS”. + $ref: "#/definitions/Identifier" + interfaceInfo: + description: > + Information about the interface(s) to the external monitoring tool, if available, including interface endpoint e.g. URL API version, and protocol type. + Can be set when MonitoringType is equal to “EXTERNAL”. + $ref: "#/definitions/KeyValuePairs" + accessInfo: + description: > + Authentication credentials for accessing the external monitoring tool. Examples can include those to support different authentication schemes, e.g. OAuth, Token, Username/password, etc. + Can be set when MonitoringType is equal to “EXTERNAL”. + $ref: "#/definitions/KeyValuePairs" + extra: + description: > + Type specific additional information, if applicable. + $ref: "#/definitions/String" + ScaleInfo: description: > This type represents the scale level of a VNF instance related to a scaling aspect. diff --git a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml index 4c3ca7e4..2976f2ba 100644 --- a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml +++ b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: "1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" + version: "1.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: description: ETSI GS NFV-SOL 003 V4.5.1 diff --git a/src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml b/src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml index 072cdd14..76678cc6 100644 --- a/src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml +++ b/src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml @@ -42,7 +42,11 @@ definitions: $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" managedObjectId: description: > - Identifier of the affected VNF instance. + Identifier of the affected VNF instance. The managed objects for this information + element will be VNF instances. A VNF instance can have fault monitored sub-object + types and identification information is carried as defined in the respective Alarm + definition as defined in clause 7.3 of ETSI GS NFV-IFA 045 [13], e.g., using the + "faultDetails" attribute. $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" rootCauseFaultyResource: description: > @@ -81,7 +85,10 @@ definitions: - ACKNOWLEDGED perceivedSeverity: description: > - Perceived severity of the managed object failure. + Perceived severity of the managed object failure. Valid values applicable to + specific Alarms are specified as "Perceived severity" values of the Alarm + applicable to Or-Vnfm reference point, as defined in clause 7.3 of + ETSI GS NFV-IFA 045 [13]. $ref: "#/definitions/PerceivedSeverityType" eventTime: description: > @@ -89,11 +96,16 @@ definitions: $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime" eventType: description: > - Type of event. + Type of event. Valid values applicable to specific Alarms are specified as + "Event type" values of the Alarm applicable to Or-Vnfm reference point, as + defined in clause 7.3 of ETSI GS NFV-IFA 045 [13]. $ref: "#/definitions/EventType" faultType: description: > Additional information to clarify the type of the fault. + Valid values applicable to specific Alarms are specified as "Alarm definition + identifier" values of the Alarm applicable to Or-Vnfm reference point, as + defined in clause 7.3 of ETSI GS NFV-IFA 045 [13]. If the alarm is related to changes in the state of virtualised resources due to NFVI operation and maintenance, this attribute shall be set to "NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE". @@ -101,6 +113,9 @@ definitions: probableCause: description: > Information about the probable cause of the fault. + Valid values applicable to specific Alarms are specified as "Probable cause" + values of the Alarm applicable to Or-Vnfm reference point, as defined in + clause 7.3 of ETSI GS NFV-IFA 045 [13]. If the attribute "faultType" has the value “NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE”, the permitted values are: - "NFVI_COMPONENT_MAINTENANCE": Maintenance of NFVI components, e.g. @@ -123,7 +138,10 @@ definitions: $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" faultDetails: description: > - Provides additional information about the fault. See notes 1 and 2. + Provides additional information about the fault. See notes 1 and 2. Valid values + applicable to specific Alarms are specified as "Fault details" values of the Alarm + applicable to Or-Vnfm reference point, as defined in clause 7.3 of + ETSI GS NFV-IFA 045 [13]. type: array items: type: string @@ -250,6 +268,14 @@ definitions: description: > The URI of the endpoint to send the notification to. $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Uri" + fmConnection: + description: > + An access information and interface information to monitor the FM of VNF instance by + the VNFM. This can include for instance certain interface endpoint URI together with + necessary credentials to access it. + type: array + items: + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/MonitoringConnection" _links: description: > Links for this resource. diff --git a/src/SOL003/VNFIndicator/VNFIndicator.yaml b/src/SOL003/VNFIndicator/VNFIndicator.yaml index 28463953..6b9f6297 100644 --- a/src/SOL003/VNFIndicator/VNFIndicator.yaml +++ b/src/SOL003/VNFIndicator/VNFIndicator.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: "1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" + version: "1.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: description: ETSI GS NFV-SOL 003 V4.5.1 diff --git a/src/SOL003/VNFIndicator/definitions/SOL003VNFIndicator_def.yaml b/src/SOL003/VNFIndicator/definitions/SOL003VNFIndicator_def.yaml index 49d052f9..60ce4a46 100644 --- a/src/SOL003/VNFIndicator/definitions/SOL003VNFIndicator_def.yaml +++ b/src/SOL003/VNFIndicator/definitions/SOL003VNFIndicator_def.yaml @@ -31,6 +31,13 @@ definitions: description: > Identifier of the "Individual VNF instance" which provides the indicator value. $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" + vnfcInstanceIds: + description: > + The vnfcInstanceIds attribute is optionally present. If present, it contains the list of + identifiers of VNFC instances which provide the indicator value(s). + type: array + items: + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" _links: description: > Links for this resource. diff --git a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml index 3727cfbe..dc0e004b 100644 --- a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml +++ b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: "2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" + version: "2.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: description: ETSI GS NFV-SOL 003 V4.5.1 diff --git a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml index 5d4c9d74..292ed9b0 100644 --- a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml +++ b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml @@ -136,6 +136,15 @@ definitions: type: array items: $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" + resourceCapacityDefinition: + description: > + Indicates values for resource capacity related attributes pertaining to a + descriptor. Values can only be provided for resource capacity related attributes + that have been defined in the VNFD as being configurable. Furthermore, provided + values shall be within the allowed values indicated in the VNFD. + type: array + items: + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ResourceCapacityDefinition" ExtManagedVirtualLinkData: @@ -335,6 +344,15 @@ definitions: type: array items: $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" + resourceCapacityDefinition: + description: > + Indicates values for resource capacity related attributes pertaining to a descriptor. + Values can only be provided for resource capacity related attributes that have been + defined in the VNFD as being configurable. Furthermore, provided values shall be within + the allowed values indicated in the VNFD. + type: array + items: + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ResourceCapacityDefinition" certificateConfigurationData: description: > Configuration for certificate management such as certificate profile and security policy in this VNF. Can @@ -403,7 +421,29 @@ definitions: process, specific to the VNF being healed, as declared in the VNFD as part of "HealVnfOpConfig" defined in ETSI GS NFV-IFA 011 [10]. $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs" + healingResource: + description: > + Indicates the kinds of the virtual resource to be healed. + Permitted values: + * VL + * LINKPORT + * STORAGE + * VIRTUALCP + * COMPUTE + * OSCONTAINER + + Default value is COMPUTE when the VDUs of the VNF are realized by a set of virtual machines + and OSCONTAINER when the VDUs of the VNF are realized by a set of OS containers. + type: array + enum: + - VL + - LINKPORT + - STORAGE + - VIRTUALCP + - COMPUTE + - OSCONTAINER + OperateVnfRequest: description: > This type represents request parameters for the "Operate VNF" operation. @@ -512,6 +552,9 @@ definitions: VnfVirtualLinkDesc and externally-managed multi-site VL instance (refer to clause 4.4.1.12). NOTE 3: Component mappings are defined in the VNFD in the source or destination package for the relevant change path. See clause 7.1.15.2 in ETSI GS NFV-IFA 011 [13]. + NOTE 4: In the current version of the present document, only Rolling upgrade and Blue-green + upgrade types are supported. The definition of additional upgrade types is left for future + specification. type: object required: - vnfdId @@ -587,6 +630,15 @@ definitions: type: array items: $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" + resourceCapacityDefinition: + description: > + Indicates values for resource capacity related attributes pertaining to a descriptor. + Values can only be provided for resource capacity related attributes that have been + defined in the VNFD as being configurable. Furthermore, provided values shall be within + the allowed values indicated in the VNFD. + type: array + items: + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ResourceCapacityDefinition" certificateConfigurationData: description: > Configuration for certificate management such as certificate profile and security policy in this VNF. @@ -594,6 +646,17 @@ definitions: shall not be present.This attribute shall be supported when delegation mode of certificate management is applicable. $ref: "#/definitions/CertificateConfigurationData" + upgradeType: + description: > + Indicates upgrade type when change the current VNF Package on which a VNF instance is based. + Permitted values: + * ROLLING_UPGRADE + * BLUE_GREEN + See note 4. + type: string + enum: + - ROLLING_UPGRADE + - BLUE_GREEN VnfInfoModificationRequest: description: > @@ -795,8 +858,10 @@ definitions: description: > This type represents request parameters for the "Select VNF deployable modules" operation. - NOTE: Thus, the select VNF deployable modules operation cannot be used as a scale VNF operation - to scale VNFCs that were already instantiated. + * NOTE 1: Thus, the select VNF deployable modules operation cannot be used as a scale VNF operation + to scale VNFCs that were already instantiated. + * NOTE 2: Thus, the select VNF deployable modules operation cannot be used as a scale + VNF operation to vertically scale VNFCs that were already instantiated. type: object properties: selectedDeployableModule: @@ -824,6 +889,19 @@ definitions: type: array items: $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ScaleInfo" + resourceCapacityDefinition: + description: > + Indicates values for resource capacity related attributes pertaining to a descriptor. + Values can only be provided for resource capacity related attributes that have been defined + in the VNFD as being configurable. Furthermore, provided values shall be within the + allowed values indicated in the VNFD. + + This attribute should only contain information about resource capacity related attributes + of VDUs that will be used to instantiate VNFCs as a result of this operation. + If it contains information about attributes of other VDUs it shall be ignored. See note 2. + type: array + items: + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ResourceCapacityDefinition" additionalParams: description: > Additional parameters passed by the NFVO as input to the selection @@ -883,7 +961,7 @@ definitions: images. In order to avoid misalignment of the VnfInstance with the current VNF's on-boarded VNF Package, the values of attributes in the VnfInstance that have corresponding attributes in the VNFD shall be kept in sync with the values in the VNFD. - NOTE 2: ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications. + NOTE 2: ETSI GS NFV-SOL 001 [14] specifies the structure and format of the VNFD based on TOSCA specifications. NOTE 3: VNF configurable properties are sometimes also referred to as configuration parameters applicable to a VNF. Some of these are set prior to instantiation and cannot be modified if the VNF is instantiated, some are set prior to instantiation (are part of initial configuration) and can be modified later, @@ -1057,7 +1135,6 @@ definitions: required: - flavourId - vnfState - - extCpInfo properties: flavourId: description: > @@ -1096,13 +1173,25 @@ definitions: type: array items: $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" + resourceCapacityDefinition: + description: > + Shows current values of VDU attributes related to resource capacity, + if different to the default values from the VNFD, as indicated in the + (one or more) request(s) of all completed VNF LCM operation(s) that + contain this attribute. If an attribute value has been modified multiple times, + only the last value is shown. The values indicated in this attribute are + applicable to all VNFC instances based on the VDU to which the + resourceCapacityDefinition is related. + type: array + items: + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ResourceCapacityDefinition" + extCpInfo: description: > Information about the external CPs exposed by the VNF instance. When trunking is enabled, the list of entries includes both, external CPs corresponding to parent ports of a trunk, and external CPs associated to sub-ports of a trunk.See note 7. type: array - minItems: 1 items: $ref: "#/definitions/VnfExtCpInfo" vipCpInfo: @@ -3139,7 +3228,6 @@ definitions: type: object required: - type - - aspectId properties: type: description: > @@ -3149,13 +3237,15 @@ definitions: capacity * SCALE_IN: removing VNFC instances from the VNF in order to release unused capacity. + * SCALE_VERTICAL: increasing or decreasing the resource capacity of all instances of one or multiple VNFCs. type: string enum: - SCALE_OUT - SCALE_IN + - SCALE_VERTICAL aspectId: description: > - Identifier of the scaling aspect. + Identifier of the scaling aspect. It shall be present when ‘type’ indicates SCALE_OUT or SCALE_IN and absent otherwise. $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" numberOfSteps: description: > @@ -3164,6 +3254,17 @@ definitions: shall be 1. type: integer default: 1 + resourceCapacityDefinition: + description: > + Indicates values for resource capacity related attributes pertaining to a descriptor. + The indicated values are absolute (target) values, as opposed to relative (delta) values. + Values can only be provided for resource capacity related attributes that have been defined + in the VNFD as being configurable. Furthermore, provided values shall be within the allowed + values indicated in the VNFD. It shall be present when 'type' indicates SCALE_VERTICAL and + absent otherwise. + type: array + items: + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ResourceCapacityDefinition" additionalParams: description: > Additional parameters passed by the NFVO as input to the scaling @@ -3584,6 +3685,8 @@ definitions: $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVim" MonitoringParameter: + description: > + This type represents a monitoring parameter that is tracked by the VNFM, type: object required: - id diff --git a/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml b/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml index f6c2c139..62743edd 100644 --- a/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml +++ b/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: "1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" + version: "1.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: description: ETSI GS NFV-SOL 003 V4.5.1 diff --git a/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml b/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml index e74b9520..ec4ec9d9 100644 --- a/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml +++ b/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml @@ -139,7 +139,16 @@ definitions: type: array items: $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" - + resourceCapacityDefinition: + description: > + Indicates values for resource capacity related attributes + pertaining to a descriptor, as received in the VNF LCM operation + request. The values indicated in this attribute are applicable to + all VNFC instances based on the VDU to which the + resourceCapacityDefinition is related. + type: array + items: + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ResourceCapacityDefinition" addResources: description: > List of resource definitions in the VNFD for resources to be added by the LCM operation @@ -489,11 +498,20 @@ definitions: to be deleted, the "vnfdId" attribute shall contain the identifier of the source VNFD. If this ResourceDefinition is related to a temporary resource, the "vnfdId" attribute shall contain the identifier of either the source VNFD or the destination VNFD. + NOTE 3: In case of the type of the ResourceDefinition is "OSCONTAINER", either + resourceTemplateId or osContainerDesc shall be present. + NOTE 4: In case the osContainerDesc is not present in the VNFD, while MCIOP(s) is present, + osContainerDesc shall be included in the GrantVnfLifecycleOperationRequest based on + the processing result of the MCIOP from CISM. type: object + oneOf: + - required: + - resourceTemplateId + - required: + - osContainerDesc required: - id - type - - resourceTemplateId properties: id: description: > @@ -542,12 +560,17 @@ definitions: - If type="OSCONTAINER": OsContainerDesc - If type="VIRTUALCP": VirtualCpd - If type="PAASSERVICE": PaasServiceRequest - - Cardinality may be greater than "1" when type="OSCONTAINER" and multiple references to - OsContainerDesc are present in the VDU indicated by the "vduId". Cardinality shall be "1" otherwise. + Cardinality may be greater than "1" when type="OSCONTAINER" and multiple references + to OsContainerDesc are present in the VDU indicated by the "vduId". See note 3. type: array - minItems: 1 items: $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd" + osContainerDesc: + description: > + Resource requirements for the OS Containers. See note 3 and 4. + type: array + items: + $ref: "#/definitions/OsContainerDesc" secondaryResourceTemplateId: description: > Reference to a secondary resource template (VnfExtCpd) in the VNFD. @@ -1082,6 +1105,66 @@ definitions: concerning a virtual storage. $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" + OsContainerDesc: + description: > + This type describes the properties of a set of co-located container compute resources + required for realizing a VDU. + type: object + required: + - osContainerDescId + - name + - description + properties: + osContainerDescId: + description: > + Unique identifier of this OsContainerDesc + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier" + name: + description: > + Human readable name of this OS container. + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" + description: + description: > + Human readable description of this OS container. + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String" + requestedCpuResources: + description: > + Number of CPU resources requested for the container (e.g. in milli-CPU-s). + type: integer + requestedMemoryResources: + description: > + Amount of memory resources requested for the container (e.g. in MB). + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Number" + requestedEphemeralStorageResources: + description: > + Size of ephemeral storage resources requested for the container (e.g. in GB). + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Number" + extendedResourceRequests: + description: > + An array of key-value pairs of extended resources required by the container. + type: array + items: + type: integer + cpuResourceLimit: + description: > + Number of CPU resources the container can maximally use in milli-CPU. + type: integer + memoryResourceLimit: + description: > + Amount of memory resources the container can maximally use (e.g. in MB). + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Number" + ephemeralStorageResourceLimit: + description: > + Size of ephemeral storage resources the container can maximally use (e.g. in GB). + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Number" + hugePageResources: + description: > + Specifies HugePages resources requested for the container, which the container can + maximally use (e.g. "hugepages-2Mi: 100Mi"). + type: array + items: + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Number" + PaasAssets: type: object required: diff --git a/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml b/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml index e527b8e5..de7be3cc 100644 --- a/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml +++ b/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 003 V4.5.1 diff --git a/src/SOL003/VNFPerformanceManagement/definitions/SOL003VNFPerformanceManagement_def.yaml b/src/SOL003/VNFPerformanceManagement/definitions/SOL003VNFPerformanceManagement_def.yaml index 88d07970..1ab35dc6 100644 --- a/src/SOL003/VNFPerformanceManagement/definitions/SOL003VNFPerformanceManagement_def.yaml +++ b/src/SOL003/VNFPerformanceManagement/definitions/SOL003VNFPerformanceManagement_def.yaml @@ -355,6 +355,14 @@ definitions: maximum: 1024 # TODO: How to express unsigned int? # Done using min and max params to set a range for positive int. + pmJobConnection: + description: > + An access information and interface information of PM job to monitor the PM of VNF instance + by the VNFM. This can include for instance certain interface endpoint URI together with + necessary credentials to access it. + type: array + items: + $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/MonitoringConnection" _links: description: > Links for this resource. -- GitLab From bbe929ebf41f17b3fb3a17ae989706962c3bb92a Mon Sep 17 00:00:00 2001 From: ishaqm Date: Mon, 8 Jul 2024 12:53:31 +0500 Subject: [PATCH 02/22] Update SOL002 LCM API as per v5.1.1 --- .../General_Definitions/SOL002_def.yaml | 289 +++++++++++++++++- .../VNFLifecycleManagement.yaml | 6 +- .../SOL002VNFLifecycleManagement_def.yaml | 123 +++++++- .../VNFLifecycleManagementNotification.yaml | 6 +- 4 files changed, 396 insertions(+), 28 deletions(-) diff --git a/src/SOL002/General_Definitions/SOL002_def.yaml b/src/SOL002/General_Definitions/SOL002_def.yaml index ea4e80c0..97448434 100644 --- a/src/SOL002/General_Definitions/SOL002_def.yaml +++ b/src/SOL002/General_Definitions/SOL002_def.yaml @@ -131,7 +131,217 @@ definitions: structure, and whether or not this attribute is available, is dependent on the type of the PaaS Service. $ref: "#/definitions/KeyValuePairs" + ResourceCapacityDefinition: + description: > + This type represents selected values for capacity related VDU attributes. + + * NOTE: Resource definitions not related to a VDU are not considered in this version of the present document. + + type: object + required: + - type + properties: + tag: + description: + Tag assigned by the issuer of a VNF LCM operation request that contains this data type with values to be applied to a VDU. + It is used for tracking purposes. The tag is preserved in the run time record as long as at least one value of the capacity + related attributes associated with that tag is still valid, i.e., it has not been modified by a later VNF LCM operation request. + At most one tag can be included when the data type is used in a VNF LCM operation request. + When the data type is used in the VnfInstance data type it may contain multiple tags, namely those provided in + VNF LCM requests, if at least one of the values provided in that request associated to that tag is still + applicable in the VNFCs created from this VDU, i.e., it has not been modified by a later request. + type: array + items: + $ref: "#/definitions/String" + type: + description: + Type of the resource definition referenced. + VALUES + • COMPUTE + • STORAGE + • OSCONTAINER + type: string + enum: + - COMPUTE + - STORAGE + - OSCONTAINER + vduId: + description: + Reference to the related Vdu applicable to this resource in the VNFD. It shall be present + when the referenced resource definition is related to a VDU. See note. + $ref: "#/definitions/IdentifierInVnfd" + osContainerDescData: + description: + Indicates values for resource capacity related attributes in an OsContainerDesc. It shall be present when the + attribute ‘type’ indicates OSCONTAINER and absent otherwise. + type: array + items: + $ref: "#/definitions/OsContainerDescData" + virtualComputeDescData: + description: + Indicates values for resource capacity related attributes in an OsContainerDesc. + It shall be present when the attribute 'type' indicates OSCONTAINER and absent otherwise. + $ref: "#/definitions/VirtualComputeDescData" + virtualStorageDescData: + description: > + Indicates the value for the storage size related attribute in an VirtualStorageDesc. + It shall be present when the attribute 'type' indicates STORAGE and absent otherwise. + type: array + items: + $ref: "#/definitions/VirtualStorageDescData" + OsContainerDescData: + description: > + This type represents selected values for capacity related VDU attributes of an OsContainer resource. + + * NOTE: At least one of the attributes shall be present. + type: object + required: + - resourceTemplateId + oneOf: + - required: + - resourceTemplateId + - required: + - requestedCpuResources + - required: + - requestedMemoryResources + - required: + - requestedEphemeralStorageResources + - required: + - extendedResourceRequests + - required: + - cpuResourceLimit + - required: + - memoryResourceLimit + - required: + - ephemeralStorageResourceLimit + - required: + - hugePageResources + properties: + resourceTemplateId: + description: > + Identifier of an osContainerDesc in the VNFD. + $ref: "#/definitions/IdentifierInVnfd" + requestedCpuResources: + description: > + Number of CPU resources requested for the container in milli-CPU. See note. + type: integer + requestedMemoryResources: + description: > + Amount of memory resources requested for the container expressed in the same units as specified in the + requested_memory_resources_valid_values property in VNFD for this container descriptor. See note. + type: array + items: + $ref: "#/definitions/Number" + requestedEphemeralStorageResources: + description: > + Size of ephemeral storage resources requested for the container expressed in the same units as specified in the + requested_ephemeral_storage_resources_valid_values property VNFD. + $ref: "#/definitions/Number" + extendedResourceRequests: + description: > + Map of the amount of extended resources of the type indicated in the key. + The key is a string that identifies an extended resource indicated in the extended_resource_requests + property in the VNFD for this container descriptor. + The value is an integer that indicates the required amount for a particular extended resource.See note. + type: array + items: + type: integer + cpuResourceLimit: + description: > + Number of CPU resources the container can maximally use in milli-CPU. See note. + type: integer + memoryResourceLimit: + description: > + Amount of memory resources the container can maximally use expressed in the same units as specified in the + memory_resource_limit_valid_values property VNFD for this container descriptor. See note. + $ref: "#/definitions/Number" + ephemeralStorageResourceLimit: + description: > + Size of ephemeral storage resources the container can maximally use expressed in the same units as specified in + the ephemeral_storage_resource_limit_valid_values property VNFD for this container descriptor. See note. + $ref: "#/definitions/Number" + hugePageResources: + description: > + Map of the total size values required for all the hugepages of the size indicated in the key. + The key is a string and corresponds to one of the values of the hugepage sizes indicated in the huge_pages_resources + property in the VNFD for this container descriptor. + The value is a number that indicates the required total size expressed in the same units as in the huge_pages_resources_property + in the VNFD that indicates the valid values for required total size for the particular hugepage size. + See note. + type: array + items: + $ref: "#/definitions/Number" + VirtualComputeDescData: + description: > + This type represents selected values for capacity related VDU attributes of the virtual compute resource of a VM. + + * NOTE: At least one of the attributes shall be present. + type: object + required: + - resourceTemplateId + oneOf: + - required: + - resourceTemplateId + - required: + - numVirtualCpu + - required: + - virtualMemSize + - required: + - sizeOfVirtualDisk + - required: + - hugePagesRequirements + properties: + resourceTemplateId: + description: > + Identifier of a VirtualComputeDesc in the VNFD. + $ref: "#/definitions/IdentifierInVnfd" + numVirtualCpu: + description: > + Number of virtual CPUs. See note. + type: integer + virtualMemSize: + description: > + Amount of virtual Memory expressed in the same units as specified in the virtual_mem_size_valid_values property + in the VNFD for this virtual compute descriptor. See note. + $ref: "#/definitions/Number" + sizeOfVirtualDisk: + description: > + Size of virtualised storage resource expressed in the same units as specified in the size_of_storage_valid_values + property in the VNFD for this virtual compute descriptor. See note. + $ref: "#/definitions/Number" + hugePagesRequirements: + description: > + Map of the total size values required for all the hugepages of the size indicated in the key. + The key is a string and corresponds to one of the values of the hugepage sizes indicated in the huge_pages_requirements + property in the VNFD for this virtual compute descriptor. + The value is a number that indicates the required total size expressed in the same units as in the huge_pages_requirements + property in the VNFD that indicates the valid values for required total size for the particular hugepage size. + See note. + type: array + items: + $ref: "#/definitions/Number" + VirtualStorageDescData: + description: > + This type represents selected values for capacity related VDU attributes of the virtual storage resource. + type: object + required: + - resourceTemplateId + - sizeOfStorage + properties: + resourceTemplateId: + description: > + Identifier of a VirtualStorageDesc in the VNFD. + $ref: "#/definitions/IdentifierInVnfd" + sizeOfStorage: + description: > + If the ‘typeOfStorage’ attribute in the VirtualStorageDesc referenced by the resourceTemplateId indicates BLOCK or FILE it is + the size of the virtualized storage resource, expressed in the same units as specified in the size_of_storage_valid_values + property in the VNFD. + If the ‘typeOfStorage’ attribute in the VirtualStorageDesc referenced by the resourceTemplateId indicates OBJECT it is the + maximum size of the virtualized storage resource expressed in the same units as specified in the max_size_of_storage_valid_values + property in the VNFD. + $ref: "#/definitions/Number" CmfInfo: description: > This type provides input information related to CMF for certificate management. @@ -236,7 +446,7 @@ definitions: anyOf: - oneOf: - required: - - vnfdId + - vnfdIds - required: - vnfProductsFromProviders - oneOf: @@ -319,6 +529,53 @@ definitions: items: type: string + MonitoringConnection: + description: > + The MonitoringConnection shall follow the indications. + * NOTE: The VNFM can be made aware of monitoring connection information, including their identifiers to + be used by configuration means outside the scope of the present document (e.g. using relevant NFV-MANO management + APIs as defined in ETSI GS NFV-SOL 009). + type: object + properties: + id: + description: > + Identifier of the monitoring connection. See note. + $ref: "#/definitions/Identifier" + monitoringType: + description: > + Type of monitoring way. + VALUES: + • VIM_CISM + • EXTERNAL + • PAAS + type: string + enum: + - VIM_CISM + - EXTERNAL + - PAAS + vimId: + description: > + Information about VIM or CISM connection(s) for monitoring resources for the VNF instance. + Can be set when MonitoringType is equal to “VIM_CISM”. + $ref: "#/definitions/Identifier" + paasServiceId: + description: > + Information about PaasAsset to be used. Can be set when MonitoringType is equal to “PAAS”. + $ref: "#/definitions/Identifier" + interfaceInfo: + description: > + Information about the interface(s) to the external monitoring tool, if available, including interface + endpoint e.g. URL API version, and protocol type. Can be set when MonitoringType is equal to “EXTERNAL”. + $ref: "#/definitions/KeyValuePairs" + accessInfo: + description: > + Authentication credentials for accessing the external monitoring tool. Examples can include those to support + different authentication schemes, e.g. OAuth, Token, Username/password, etc. Can be set when MonitoringType is equal to “EXTERNAL”. + $ref: "#/definitions/KeyValuePairs" + extra: + description: > + Type specific additional information, if applicable. + $ref: "#/definitions/String" ResourceHandle: required: - resourceId @@ -680,8 +937,8 @@ definitions: description: > This type represents network address data for a virtual CP. - * NOTE 1: If the container cluster is set up to be able to configure an external load balancer this address will be used, - otherwise it will be ignored by the CISM. + * NOTE 1: The loadBalancerIp and the loadBalancerSourceRanges attributes are only used if the + CIS cluster is set up to be able to configure an external load balancer. Otherwise, it shall be ignored. * NOTE 2: In case the cluster can configure an external load balancer but no loadBalancerIp is provided the container cluster will assign an IP address. @@ -690,7 +947,7 @@ definitions: address pools for virtual CPs. Otherwise it shall be ignored. MetalLB is an example of a solution for Kubernetes® that supports configuration of address pools for load balancer services. - * NOTE 4: The loadBalancerIp and the addressPoolName attributes shall not be present at the same time. + * NOTE 4: The loadBalancerIp, addressPoolName and the externalIp attributes shall not be present at the same time. type: object required: @@ -709,12 +966,30 @@ definitions: Fixed address to assign to an external load balancer. See notes 1, 2 and 4. $ref: "#/definitions/IpAddress" + externalIp: + description: > + An external IP address assigned to the virtual CP. This IP address is not managed by CISM. See note 4. + $ref: "#/definitions/IpAddress" addressPoolName : description: > - Name of an address pool from which the container - cluster will assign an IP address to the virtual CP. See - notes 3 and 4. + Name of an address pool from which the CIS cluster will assign an IP address to the virtual CP. See notes 3 and 4. type: string + loadBalancerSourceRanges: + description: > + List of client IP address ranges allowed to access an external load balancer. See note 1. + type: object + required: + - minAddress + - maxAddress + properties: + minAddress: + description: > + Lowest IP address belonging to the range. + $ref: "#/definitions/IpAddress" + maxAddress: + description: > + Highest IP address belonging to the range. + $ref: "#/definitions/IpAddress" ExtVirtualLinkData: description: > diff --git a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml index 179e56d1..8c89ede7 100644 --- a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml +++ b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml @@ -16,11 +16,11 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/04.05.01_60/gs_NFV-SOL002v040501p.pdf + description: ETSI GS NFV-SOL 002 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.01.01_60/gs_NFV-SOL002v050101p.pdf servers: - url: http://127.0.0.1/vnflcm/v2 diff --git a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml index b8597b9d..bbe93494 100644 --- a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml +++ b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml @@ -179,6 +179,16 @@ definitions: type: array items: $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" + resourceCapacityDefinition: + description: > + Shows current values of VDU attributes related to resource capacity, if different to the default + values from the VNFD, as indicated in the (one or more) request(s) of all completed VNF LCM operation(s) that + contain this attribute. If an attribute value has been modified multiple times, only the last value is shown. + The values indicated in this attribute are applicable to all VNFC instances based on the VDU to which the + resourceCapacityDefinition is related. + type: array + items: + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ResourceCapacityDefinition" extCpInfo: description: > Information about the external CPs exposed by the VNF instance. When trunking is enabled, the list of @@ -410,8 +420,10 @@ definitions: SelectVnfDeployableModulesRequest: description: > This type represents request parameters for the "Select VNF deployable modules" operation. - * NOTE: Thus, the select VNF deployable modules operation cannot be used as a scale VNF operation to scale VNFCs - that were already instantiated + * NOTE 1: Thus, the select VNF deployable modules operation cannot be used as a scale VNF operation to + horizontally scale VNFCs that were already instantiated. + * NOTE 2: Thus, the select VNF deployable modules operation cannot be used as a scale VNF operation to + vertically scale VNFCs that were already instantiated. type: object properties: selectedDeployableModule: @@ -437,6 +449,17 @@ definitions: type: array items: $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ScaleInfo" + resourceCapacityDefinition: + description: > + Indicates values for resource capacity related attributes pertaining to a descriptor. Values can only be + provided for resource capacity related attributes that have been defined in the VNFD as being configurable. + Furthermore, provided values shall be within the allowed values indicated in the VNFD. + This attribute should only contain information about resource capacity related attributes of VDUs that will be + used to instantiate VNFCs as a result of this operation. If it contains information about attributes of other + VDUs it shall be ignored. See note 2. + type: array + items: + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ResourceCapacityDefinition" additionalParams: description: > Additional parameters passed by the NFVO as input to the selection of deployable modules process, specific to @@ -540,9 +563,14 @@ definitions: type: array items: $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" - - - + resourceCapacityDefinition: + description: > + Indicates values for resource capacity related attributes pertaining to a descriptor. Values can only be + provided for resource capacity related attributes that have been defined in the VNFD as being configurable. + Furthermore, provided values shall be within the allowed values indicated in the VNFD. + type: array + items: + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ResourceCapacityDefinition" ChangeVnfFlavourRequest: description: > This type represents request parameters for the "Change VNF flavour" operation. @@ -627,6 +655,14 @@ definitions: type: array items: $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" + resourceCapacityDefinition: + description: > + Indicates values for resource capacity related attributes pertaining to a descriptor. Values can only be + provided for resource capacity related attributes that have been defined in the VNFD as being configurable. + Furthermore, provided values shall be within the allowed values indicated in the VNFD. + type: array + items: + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ResourceCapacityDefinition" certificateConfigurationData: description: > Configuration for certificate management such as certificate profile and security policy in this VNF. Can be @@ -676,6 +712,8 @@ definitions: $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs" HealVnfRequest: + description: > + This type represents request parameters for the "Heal VNF" operation. type: object properties: vnfcInstanceId: @@ -701,17 +739,39 @@ definitions: Provides link to a script that should be executed as part of the healing action or a set of rules for healing procedure. type: string - + healingResource: + description: > + Indicates the kinds of the virtual resource to be healed. + Permitted values: + • VL + • LINKPORT + • STORAGE + • VIRTUALCP + • COMPUTE + • OSCONTAINER + + Default value is COMPUTE when the VDUs of the VNF are realized by a set of virtual machines and + OSCONTAINER when the VDUs of the VNF are realized by a set of OS containers. + type: array + items: + type: string + enum: + - VL + - LINKPORT + - STORAGE + - VIRTUALCP + - COMPUTE + - OSCONTAINER OperateVnfRequest: description: > This type represents request parameters for the "Operate VNF" operation. * NOTE: The "stopType" and "gracefulStopTimeout" attributes shall be absent, when the "changeStateTo" - attribute is equal to "STARTED". The "gracefulStopTimeout" attribute shall be present, when the - "changeStateTo" is equal to "STOPPED" and the "stopType" attribute is equal to "GRACEFUL". - The "gracefulStopTimeout" attribute shall be absent, when the "changeStateTo" attribute is equal to - "STOPPED" and the "stopType" attribute is equal to "FORCEFUL". The request shall be treated as if - the "stopType" attribute has been set to "FORCEFUL", when the "changeStateTo" attribute is equal - to "STOPPED" and the "stopType" attribute is absent. + attribute is equal to "STARTED". The "gracefulStopTimeout" attribute shall be present, when the + "changeStateTo" is equal to "STOPPED" and the "stopType" attribute is equal to "GRACEFUL". + The "gracefulStopTimeout" attribute shall be absent, when the "changeStateTo" attribute is equal to + "STOPPED" and the "stopType" attribute is equal to "FORCEFUL". The request shall be treated as if + the "stopType" attribute has been set to "FORCEFUL", when the "changeStateTo" attribute is equal + to "STOPPED" and the "stopType" attribute is absent. type: object required: - changeStateTo @@ -794,6 +854,8 @@ definitions: towards the VIM. * NOTE 2: Component mappings are defined in the VNFD in the source or destination package for the relevant change path. See clause 7.1.15.2 in ETSI GS NFV-IFA 011 [7]. + * NOTE 3: In the current version of the present document, only Rolling upgrade and Blue-green upgrade types + are supported. The definition of additional upgrade types is left for future specification. type: object required: - vnfdId @@ -851,6 +913,14 @@ definitions: type: array items: $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" + resourceCapacityDefinition: + description: > + Indicates values for resource capacity related attributes pertaining to a descriptor. Values can only be + provided for resource capacity related attributes that have been defined in the VNFD as being configurable. + Furthermore, provided values shall be within the allowed values indicated in the VNFD. + type: array + items: + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ResourceCapacityDefinition" certificateConfigurationData: description: > Configuration for certificate management such as certificate profile and security policy in this VNF. @@ -858,7 +928,17 @@ definitions: shall not be present. This attribute shall be supported when delegation mode of certificate management is applicable. $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/CertificateConfigurationData" - + upgradeType: + description: > + Indicates upgrade type when change the current VNF Package on which a VNF instance is based. + Permitted values: + • ROLLING_UPGRADE + • BLUE_GREEN + See note 3. + type: string + enum: + - ROLLING_UPGRADE + - BLUE_GREEN VnfInfoModificationRequest: description: > This type represents attribute modifications for an "Individual VNF instance" resource, @@ -2176,7 +2256,6 @@ definitions: type: object required: - type - - aspectId properties: type: description: > @@ -2186,13 +2265,17 @@ definitions: capacity * SCALE_IN: removing VNFC instances from the VNF in order to release unused capacity. + * SCALE_VERTICAL: increasing or decreasing the resource capacity of all + instances of one or multiple VNFCs. type: string enum: - SCALE_OUT - SCALE_IN + - SCALE_VERTICAL aspectId: description: > - Identifier of the scaling aspect. + Identifier of the scaling aspect. It shall be present when ‘type’ indicates SCALE_OUT or + SCALE_IN and absent otherwise. $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" numberOfSteps: description: > @@ -2201,6 +2284,16 @@ definitions: shall be 1. type: integer default: 1 + resourceCapacityDefinition: + description: > + Indicates values for resource capacity related attributes pertaining to a descriptor. The indicated values are + absolute (target) values, as opposed to relative (delta) values. Values can only be provided for + resource capacity related attributes that have been defined in the VNFD as being configurable. + Furthermore, provided values shall be within the allowed values indicated in the VNFD. It shall be + present when ‘type’ indicates SCALE_VERTICAL and absent otherwise. + type: array + items: + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ResourceCapacityDefinition" additionalParams: description: > Additional parameters passed by the NFVO as input to the scaling diff --git a/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml b/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml index 9f68ca79..efea25a0 100644 --- a/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml +++ b/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml @@ -16,11 +16,11 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/04.05.01_60/gs_NFV-SOL002v040501p.pdf + description: ETSI GS NFV-SOL 002 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.01.01_60/gs_NFV-SOL002v050101p.pdf servers: - url: http://127.0.0.1/callback/v2 -- GitLab From 79ba9a11e5f0ee249aaf16dd1cf1b315de399904 Mon Sep 17 00:00:00 2001 From: ishaqm Date: Mon, 8 Jul 2024 13:08:39 +0500 Subject: [PATCH 03/22] Update SOL002 PM API as per v5.1.1 --- .../VNFPerformanceManagement/VNFPerformanceManagement.yaml | 6 +++--- .../definitions/SOL002VNFPerformanceManagement_def.yaml | 7 +++++++ .../VNFPerformanceManagementNotification.yaml | 6 +++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml index 6708321c..bfebded2 100644 --- a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml +++ b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml @@ -16,11 +16,11 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/04.05.01_60/gs_NFV-SOL002v040501p.pdf + description: ETSI GS NFV-SOL 002 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.01.01_60/gs_NFV-SOL002v050101p.pdf servers: - url: http://127.0.0.1/vnfpm/v2 diff --git a/src/SOL002/VNFPerformanceManagement/definitions/SOL002VNFPerformanceManagement_def.yaml b/src/SOL002/VNFPerformanceManagement/definitions/SOL002VNFPerformanceManagement_def.yaml index c5c8b3a7..20b1a177 100644 --- a/src/SOL002/VNFPerformanceManagement/definitions/SOL002VNFPerformanceManagement_def.yaml +++ b/src/SOL002/VNFPerformanceManagement/definitions/SOL002VNFPerformanceManagement_def.yaml @@ -355,6 +355,13 @@ definitions: maximum: 1024 # TODO: How to express unsigned int? # Done using min and max params to set a range for positive int. + pmJobConnection: + description: > + An access information and interface information of PM job to monitor the PM of VNF instance by the VNFM. + This can include for instance certain interface endpoint URI together with necessary credentials to access it. + type: array + items: + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/MonitoringConnection" _links: description: > Links for this resource. diff --git a/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml b/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml index f5fa5345..2d63cdd4 100644 --- a/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml +++ b/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml @@ -16,11 +16,11 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/04.05.01_60/gs_NFV-SOL002v040501p.pdf + description: ETSI GS NFV-SOL 002 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.01.01_60/gs_NFV-SOL002v050101p.pdf servers: - url: http://127.0.0.1/callback/v2 -- GitLab From 2270889b189fe57728746ce1c5e6e0eb0e8ecb16 Mon Sep 17 00:00:00 2001 From: ishaqm Date: Mon, 8 Jul 2024 14:53:14 +0500 Subject: [PATCH 04/22] Update SOL002 FM API as per v5.1.1 --- .../VNFFaultManagement.yaml | 6 ++--- .../SOL002VNFFaultManagement_def.yaml | 22 ++++++++++++++++++- .../VNFFaultManagementNotification.yaml | 6 ++--- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml index 4e4d9f0c..125428fa 100644 --- a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml +++ b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml @@ -16,11 +16,11 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 1.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/04.05.01_60/gs_NFV-SOL002v040501p.pdf + description: ETSI GS NFV-SOL 002 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.01.01_60/gs_NFV-SOL002v050101p.pdf servers: - url: http://127.0.0.1/vnffm/v1 diff --git a/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml b/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml index 81306b1b..1989bef2 100644 --- a/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml +++ b/src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml @@ -47,6 +47,9 @@ definitions: managedObjectId: description: > Identifier of the affected VNF instance. + The managed objects for this information element will be VNF instances. A VNF instance can have + fault monitored sub-object types and identification information is carried as defined in the + respective Alarm definition, e.g., using the "faultDetails" attribute. $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" vnfcInstanceIds: description: > @@ -95,6 +98,8 @@ definitions: perceivedSeverity: description: > Perceived severity of the managed object failure. + Valid values applicable to specific Alarms are specified as "Perceived severity" values of + the Alarm applicable to Ve-Vnfm reference point. $ref: "#/definitions/PerceivedSeverityType" eventTime: description: > @@ -102,18 +107,24 @@ definitions: $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime" eventType: description: > - Type of event. + Type of event. + Valid values applicable to specific Alarms are specified as "Event type" values of the + Alarm applicable to Ve-Vnfm reference point. $ref: "#/definitions/EventType" type: string faultType: description: > Additional information to clarify the type of the fault. + Valid values applicable to specific Alarms are specified as "Alarm definition identifier" + values of the Alarm applicable to Ve-Vnfm reference point. If the alarm is related to changes in the state of virtualised resources due to NFVI operation and maintenance, this attribute shall be set to "NFVI_OAM_VIRTUALISED_RESOURCE_STATE _CHANGE". type: string probableCause: description: > Information about the probable cause of the fault. + Valid values applicable to specific Alarms are specified as "Probable cause" + values of the Alarm applicable to Ve-Vnfm reference point. If the attribute "faultType" has the value “NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE”, the permitted values are: - "NFVI_COMPONENT_MAINTENANCE": Maintenance of NFVI components, e.g. physical maintenance/repair, @@ -137,6 +148,8 @@ definitions: faultDetails: description: > Provides additional information about the fault. See notes 1 and 2. + Valid values applicable to specific Alarms are specified as "Fault details" values + of the Alarm applicable to Ve-Vnfm reference point. type: array items: type: string @@ -275,6 +288,13 @@ definitions: description: > The URI of the endpoint to send the notification to. $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Uri" + pmJobConnection: + description: > + An access information and interface information to monitor the FM of VNF instance by the VNFM. + This can include for instance certain interface endpoint URI together with necessary credentials to access it. + type: array + items: + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/MonitoringConnection" _links: description: > Links for this resource. diff --git a/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml b/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml index 8d0b91f5..c70155cb 100644 --- a/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml +++ b/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml @@ -16,11 +16,11 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 1.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/04.05.01_60/gs_NFV-SOL002v040501p.pdf + description: ETSI GS NFV-SOL 002 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.01.01_60/gs_NFV-SOL002v050101p.pdf servers: - url: http://127.0.0.1/callback/v1 -- GitLab From 4646014207e374bea4f5b79f2e95f4459262639e Mon Sep 17 00:00:00 2001 From: ishaqm Date: Mon, 8 Jul 2024 14:55:50 +0500 Subject: [PATCH 05/22] Update SOL002 Indicator API as per v5.1.1 --- src/SOL002/VNFIndicator/VNFIndicator.yaml | 6 +++--- .../VNFIndicator/definitions/SOL002VNFIndicator_def.yaml | 7 +++++++ .../VNFIndicatorNotification/VNFIndicatorNotification.yaml | 6 +++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/SOL002/VNFIndicator/VNFIndicator.yaml b/src/SOL002/VNFIndicator/VNFIndicator.yaml index 6dea5bb9..2dbba70b 100644 --- a/src/SOL002/VNFIndicator/VNFIndicator.yaml +++ b/src/SOL002/VNFIndicator/VNFIndicator.yaml @@ -16,11 +16,11 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 1.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/04.05.01_60/gs_NFV-SOL002v040501p.pdf + description: ETSI GS NFV-SOL 002 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.01.01_60/gs_NFV-SOL002v050101p.pdf servers: - url: http://127.0.0.1/vnfind/v1 diff --git a/src/SOL002/VNFIndicator/definitions/SOL002VNFIndicator_def.yaml b/src/SOL002/VNFIndicator/definitions/SOL002VNFIndicator_def.yaml index ae52d2ad..b6b616e8 100644 --- a/src/SOL002/VNFIndicator/definitions/SOL002VNFIndicator_def.yaml +++ b/src/SOL002/VNFIndicator/definitions/SOL002VNFIndicator_def.yaml @@ -31,6 +31,13 @@ definitions: description: > Identifier of the "Individual VNF instance" which provides the indicator value. $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier" + vnfcInstanceIds: + description: > + The vnfcInstanceIds attribute is optionally present. If present, it contains the list of + identifiers of VNFC instances which provide the indicator value(s). + type: array + items: + $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd" _links: description: > Links for this resource. diff --git a/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml b/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml index e773f9e8..4ce485b1 100644 --- a/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml +++ b/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml @@ -16,11 +16,11 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 1.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/04.05.01_60/gs_NFV-SOL002v040501p.pdf + description: ETSI GS NFV-SOL 002 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.01.01_60/gs_NFV-SOL002v050101p.pdf servers: - url: http://127.0.0.1/callback/v1 -- GitLab From 3e5070151db3c1cc1fa13d8602751981a4874878 Mon Sep 17 00:00:00 2001 From: ishaqm Date: Mon, 8 Jul 2024 15:18:19 +0500 Subject: [PATCH 06/22] fix minor issues for SOL002 --- src/SOL002/APIVersion/APIVersion.yaml | 4 ++-- src/SOL002/General_Definitions/SOL002_def.yaml | 2 +- src/SOL002/VNFConfiguration/VNFConfiguration.yaml | 4 ++-- .../definitions/SOL002VNFConfiguration_def.yaml | 2 +- .../VNFIndicator/definitions/SOL002VNFIndicator_def.yaml | 2 +- .../definitions/SOL002VNFIndicatorNotification_def.yaml | 2 +- .../VNFLifecycleCoordination/VNFLifecycleCoordination.yaml | 4 ++-- .../definitions/SOL002VNFLifecycleCoordination_def.yaml | 2 +- .../definitions/SOL002VNFLifecycleManagement_def.yaml | 2 +- .../SOL002VNFLifecycleManagementNotification_def.yaml | 2 +- .../definitions/SOL002VNFPerformanceManagement_def.yaml | 3 +++ 11 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/SOL002/APIVersion/APIVersion.yaml b/src/SOL002/APIVersion/APIVersion.yaml index 31c98905..cd7d50bc 100644 --- a/src/SOL002/APIVersion/APIVersion.yaml +++ b/src/SOL002/APIVersion/APIVersion.yaml @@ -19,8 +19,8 @@ info: version: 1.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/04.05.01_60/gs_NFV-SOL002v040501p.pdf + description: ETSI GS NFV-SOL 002 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.01.01_60/gs_NFV-SOL002v050101p.pdf paths: /vnfconfig/api_versions: diff --git a/src/SOL002/General_Definitions/SOL002_def.yaml b/src/SOL002/General_Definitions/SOL002_def.yaml index 97448434..c4d0433f 100644 --- a/src/SOL002/General_Definitions/SOL002_def.yaml +++ b/src/SOL002/General_Definitions/SOL002_def.yaml @@ -1,4 +1,4 @@ -# Copyright (c) ETSI 2017. +# Copyright (c) ETSI 2024. # https://forge.etsi.org/etsi-forge-copyright-notice.txt definitions: diff --git a/src/SOL002/VNFConfiguration/VNFConfiguration.yaml b/src/SOL002/VNFConfiguration/VNFConfiguration.yaml index d948f053..e83c89ff 100644 --- a/src/SOL002/VNFConfiguration/VNFConfiguration.yaml +++ b/src/SOL002/VNFConfiguration/VNFConfiguration.yaml @@ -19,8 +19,8 @@ info: version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/04.05.01_60/gs_NFV-SOL002v040501p.pdf + description: ETSI GS NFV-SOL 002 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.01.01_60/gs_NFV-SOL002v050101p.pdf servers: - url: http://127.0.0.1/vnfconfig/v1 diff --git a/src/SOL002/VNFConfiguration/definitions/SOL002VNFConfiguration_def.yaml b/src/SOL002/VNFConfiguration/definitions/SOL002VNFConfiguration_def.yaml index 00d72998..1b63db8b 100644 --- a/src/SOL002/VNFConfiguration/definitions/SOL002VNFConfiguration_def.yaml +++ b/src/SOL002/VNFConfiguration/definitions/SOL002VNFConfiguration_def.yaml @@ -1,4 +1,4 @@ -# Copyright (c) ETSI 2017. +# Copyright (c) ETSI 2024. # https://forge.etsi.org/etsi-forge-copyright-notice.txt definitions: diff --git a/src/SOL002/VNFIndicator/definitions/SOL002VNFIndicator_def.yaml b/src/SOL002/VNFIndicator/definitions/SOL002VNFIndicator_def.yaml index b6b616e8..6c172e3f 100644 --- a/src/SOL002/VNFIndicator/definitions/SOL002VNFIndicator_def.yaml +++ b/src/SOL002/VNFIndicator/definitions/SOL002VNFIndicator_def.yaml @@ -1,4 +1,4 @@ -# Copyright (c) ETSI 2017. +# Copyright (c) ETSI 2024. # https://forge.etsi.org/etsi-forge-copyright-notice.txt definitions: diff --git a/src/SOL002/VNFIndicatorNotification/definitions/SOL002VNFIndicatorNotification_def.yaml b/src/SOL002/VNFIndicatorNotification/definitions/SOL002VNFIndicatorNotification_def.yaml index 373266c6..f7f0330f 100644 --- a/src/SOL002/VNFIndicatorNotification/definitions/SOL002VNFIndicatorNotification_def.yaml +++ b/src/SOL002/VNFIndicatorNotification/definitions/SOL002VNFIndicatorNotification_def.yaml @@ -1,4 +1,4 @@ -# Copyright (c) ETSI 2017. +# Copyright (c) ETSI 2024. # https://forge.etsi.org/etsi-forge-copyright-notice.txt definitions: diff --git a/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml b/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml index a6d2a748..f6d0fb8a 100644 --- a/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml +++ b/src/SOL002/VNFLifecycleCoordination/VNFLifecycleCoordination.yaml @@ -19,8 +19,8 @@ info: version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 002 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/04.05.01_60/gs_NFV-SOL002v040501p.pdf + description: ETSI GS NFV-SOL 002 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/05.01.01_60/gs_NFV-SOL002v050101p.pdf servers: - url: http://127.0.0.1/lcmcoord/v1 diff --git a/src/SOL002/VNFLifecycleCoordination/definitions/SOL002VNFLifecycleCoordination_def.yaml b/src/SOL002/VNFLifecycleCoordination/definitions/SOL002VNFLifecycleCoordination_def.yaml index 1a2dc0b8..cae8cc3a 100644 --- a/src/SOL002/VNFLifecycleCoordination/definitions/SOL002VNFLifecycleCoordination_def.yaml +++ b/src/SOL002/VNFLifecycleCoordination/definitions/SOL002VNFLifecycleCoordination_def.yaml @@ -1,4 +1,4 @@ -# Copyright (c) ETSI 2017. +# Copyright (c) ETSI 2024. # https://forge.etsi.org/etsi-forge-copyright-notice.txt definitions: diff --git a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml index bbe93494..f160e2b5 100644 --- a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml +++ b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml @@ -1,4 +1,4 @@ -# Copyright (c) ETSI 2017. +# Copyright (c) ETSI 2024. # https://forge.etsi.org/etsi-forge-copyright-notice.txt definitions: diff --git a/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml b/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml index a0db81b3..00647f10 100644 --- a/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml +++ b/src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml @@ -1,4 +1,4 @@ -# Copyright (c) ETSI 2017. +# Copyright (c) ETSI 2024. # https://forge.etsi.org/etsi-forge-copyright-notice.txt definitions: diff --git a/src/SOL002/VNFPerformanceManagement/definitions/SOL002VNFPerformanceManagement_def.yaml b/src/SOL002/VNFPerformanceManagement/definitions/SOL002VNFPerformanceManagement_def.yaml index 20b1a177..821d5a08 100644 --- a/src/SOL002/VNFPerformanceManagement/definitions/SOL002VNFPerformanceManagement_def.yaml +++ b/src/SOL002/VNFPerformanceManagement/definitions/SOL002VNFPerformanceManagement_def.yaml @@ -1,3 +1,6 @@ +# Copyright (c) ETSI 2024. +# https://forge.etsi.org/etsi-forge-copyright-notice.txt + definitions: CreateThresholdRequest: description: > -- GitLab From 347f8c85f4699ead93230403ab4bdd443ec0d23e Mon Sep 17 00:00:00 2001 From: ishaqm Date: Wed, 10 Jul 2024 11:38:47 +0500 Subject: [PATCH 07/22] Update version for SOL003 --- src/SOL003/APIVersion/APIVersion.yaml | 4 ++-- src/SOL003/General_Definitions/SOL003_def.yaml | 2 +- src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml | 4 ++-- .../definitions/SOL003VNFFaultManagement_def.yaml | 3 +++ .../VNFFaultManagementNotification.yaml | 4 ++-- src/SOL003/VNFIndicator/VNFIndicator.yaml | 4 ++-- .../VNFIndicator/definitions/SOL003VNFIndicator_def.yaml | 2 +- .../VNFIndicatorNotification/VNFIndicatorNotification.yaml | 4 ++-- src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml | 4 ++-- .../definitions/SOL003VNFLifecycleManagement_def.yaml | 2 +- .../VNFLifecycleManagementNotification.yaml | 4 ++-- .../VNFLifecycleOperationGranting.yaml | 4 ++-- .../definitions/SOL003VNFLifecycleOperationGranting_def.yaml | 2 +- src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml | 4 ++-- .../definitions/SOL003VNFPackageManagement_def.yaml | 2 +- .../VNFPackageManagementNotification.yaml | 4 ++-- .../SOL003VNFPackageManagementNotification_def.yaml | 2 +- .../VNFPerformanceManagement/VNFPerformanceManagement.yaml | 4 ++-- .../definitions/SOL003VNFPerformanceManagement_def.yaml | 3 +++ .../VNFPerformanceManagementNotification.yaml | 4 ++-- .../VNFSnapshotPackageManagement.yaml | 4 ++-- .../definitions/SOL003VNFSnapshotPackageManagement_def.yaml | 2 +- .../VirtualisedResourcesQuotaAvailableNotification.yaml | 4 ++-- ...003VirtualisedResourcesQuotaAvailableNotification_def.yaml | 2 +- 24 files changed, 42 insertions(+), 36 deletions(-) diff --git a/src/SOL003/APIVersion/APIVersion.yaml b/src/SOL003/APIVersion/APIVersion.yaml index 340a98ca..3343da37 100644 --- a/src/SOL003/APIVersion/APIVersion.yaml +++ b/src/SOL003/APIVersion/APIVersion.yaml @@ -20,8 +20,8 @@ info: version: "1.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: - description: ETSI GS NFV-SOL 003 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.05.01_60/gs_NFV-SOL003v040501p.pdf + description: ETSI GS NFV-SOL 003 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf paths: /vrqan/api_versions: diff --git a/src/SOL003/General_Definitions/SOL003_def.yaml b/src/SOL003/General_Definitions/SOL003_def.yaml index ef37d075..07189f8d 100644 --- a/src/SOL003/General_Definitions/SOL003_def.yaml +++ b/src/SOL003/General_Definitions/SOL003_def.yaml @@ -1,4 +1,4 @@ -# Copyright (c) ETSI 2017. +# Copyright (c) ETSI 2024. # https://forge.etsi.org/etsi-forge-copyright-notice.txt definitions: diff --git a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml index 2976f2ba..c092b1e3 100644 --- a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml +++ b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml @@ -19,8 +19,8 @@ info: version: "1.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: - description: ETSI GS NFV-SOL 003 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.05.01_60/gs_NFV-SOL003v040501p.pdf + description: ETSI GS NFV-SOL 003 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf servers: - url: http://127.0.0.1/vnffm/v1 diff --git a/src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml b/src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml index 76678cc6..f724865d 100644 --- a/src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml +++ b/src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml @@ -1,3 +1,6 @@ +# Copyright (c) ETSI 2024. +# https://forge.etsi.org/etsi-forge-copyright-notice.txt + definitions: Alarm: description: > diff --git a/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml b/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml index 02392de4..6b1b0740 100644 --- a/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml +++ b/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml @@ -19,8 +19,8 @@ info: version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 003 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.05.01_60/gs_NFV-SOL003v040501p.pdf + description: ETSI GS NFV-SOL 003 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf servers: - url: http://127.0.0.1/callback/v1 diff --git a/src/SOL003/VNFIndicator/VNFIndicator.yaml b/src/SOL003/VNFIndicator/VNFIndicator.yaml index 6b9f6297..f731ec57 100644 --- a/src/SOL003/VNFIndicator/VNFIndicator.yaml +++ b/src/SOL003/VNFIndicator/VNFIndicator.yaml @@ -19,8 +19,8 @@ info: version: "1.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: - description: ETSI GS NFV-SOL 003 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.05.01_60/gs_NFV-SOL003v040501p.pdf + description: ETSI GS NFV-SOL 003 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf servers: - url: http://127.0.0.1/vnfind/v1 diff --git a/src/SOL003/VNFIndicator/definitions/SOL003VNFIndicator_def.yaml b/src/SOL003/VNFIndicator/definitions/SOL003VNFIndicator_def.yaml index 60ce4a46..e8d2d05c 100644 --- a/src/SOL003/VNFIndicator/definitions/SOL003VNFIndicator_def.yaml +++ b/src/SOL003/VNFIndicator/definitions/SOL003VNFIndicator_def.yaml @@ -1,4 +1,4 @@ -# Copyright (c) ETSI 2017. +# Copyright (c) ETSI 2024. # https://forge.etsi.org/etsi-forge-copyright-notice.txt definitions: diff --git a/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml b/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml index 5c0e97c8..a3f235ec 100644 --- a/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml +++ b/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml @@ -19,8 +19,8 @@ info: version: "1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: - description: ETSI GS NFV-SOL 003 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.05.01_60/gs_NFV-SOL003v040501p.pdf + description: ETSI GS NFV-SOL 003 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf servers: - url: http://127.0.0.1/callback/v1 diff --git a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml index dc0e004b..a3c137ae 100644 --- a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml +++ b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml @@ -19,8 +19,8 @@ info: version: "2.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: - description: ETSI GS NFV-SOL 003 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.05.01_60/gs_NFV-SOL003v040501p.pdf + description: ETSI GS NFV-SOL 003 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf servers: - url: http://127.0.0.1/vnflcm/v2 diff --git a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml index 292ed9b0..4c9cc232 100644 --- a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml +++ b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml @@ -1,4 +1,4 @@ -# Copyright (c) ETSI 2017. +# Copyright (c) ETSI 2024. # https://forge.etsi.org/etsi-forge-copyright-notice.txt definitions: diff --git a/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml b/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml index bacc7a1a..63ddaab7 100644 --- a/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml +++ b/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml @@ -19,8 +19,8 @@ info: version: "2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: - description: ETSI GS NFV-SOL 003 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.05.01_60/gs_NFV-SOL003v040501p.pdf + description: ETSI GS NFV-SOL 003 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf servers: - url: http://127.0.0.1/callback/v2 diff --git a/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml b/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml index 62743edd..0eedbe7c 100644 --- a/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml +++ b/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml @@ -19,8 +19,8 @@ info: version: "1.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: - description: ETSI GS NFV-SOL 003 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.05.01_60/gs_NFV-SOL003v040501p.pdf + description: ETSI GS NFV-SOL 003 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf servers: - url: http://127.0.0.1/grant/v1 diff --git a/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml b/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml index ec4ec9d9..dd7416f6 100644 --- a/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml +++ b/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml @@ -1,4 +1,4 @@ -# Copyright (c) ETSI 2017. +# Copyright (c) ETSI 2024. # https://forge.etsi.org/etsi-forge-copyright-notice.txt definitions: diff --git a/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml b/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml index 2474a4dd..8f8bf692 100644 --- a/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml +++ b/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml @@ -19,8 +19,8 @@ info: version: "2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: - description: ETSI GS NFV-SOL 003 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.05.01_60/gs_NFV-SOL003v040501p.pdf + description: ETSI GS NFV-SOL 003 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf servers: - url: http://127.0.0.1/vnfpkgm/v2 diff --git a/src/SOL003/VNFPackageManagement/definitions/SOL003VNFPackageManagement_def.yaml b/src/SOL003/VNFPackageManagement/definitions/SOL003VNFPackageManagement_def.yaml index d93c4f20..5f5faf72 100644 --- a/src/SOL003/VNFPackageManagement/definitions/SOL003VNFPackageManagement_def.yaml +++ b/src/SOL003/VNFPackageManagement/definitions/SOL003VNFPackageManagement_def.yaml @@ -1,4 +1,4 @@ -# Copyright (c) ETSI 2017. +# Copyright (c) ETSI 2024. # https://forge.etsi.org/etsi-forge-copyright-notice.txt definitions: diff --git a/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml b/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml index 40e881b7..18e34990 100644 --- a/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml +++ b/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml @@ -19,8 +19,8 @@ info: version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 003 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.05.01_60/gs_NFV-SOL003v040501p.pdf + description: ETSI GS NFV-SOL 003 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf servers: - url: http://127.0.0.1/callback/v2 diff --git a/src/SOL003/VNFPackageManagementNotification/definitions/SOL003VNFPackageManagementNotification_def.yaml b/src/SOL003/VNFPackageManagementNotification/definitions/SOL003VNFPackageManagementNotification_def.yaml index a207343f..5dbebfec 100644 --- a/src/SOL003/VNFPackageManagementNotification/definitions/SOL003VNFPackageManagementNotification_def.yaml +++ b/src/SOL003/VNFPackageManagementNotification/definitions/SOL003VNFPackageManagementNotification_def.yaml @@ -1,4 +1,4 @@ -# Copyright (c) ETSI 2017. +# Copyright (c) ETSI 2024. # https://forge.etsi.org/etsi-forge-copyright-notice.txt definitions: diff --git a/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml b/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml index de7be3cc..f943c288 100644 --- a/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml +++ b/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml @@ -19,8 +19,8 @@ info: version: 2.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 003 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.05.01_60/gs_NFV-SOL003v040501p.pdf + description: ETSI GS NFV-SOL 003 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf servers: - url: http://127.0.0.1/vnfpm/v2 diff --git a/src/SOL003/VNFPerformanceManagement/definitions/SOL003VNFPerformanceManagement_def.yaml b/src/SOL003/VNFPerformanceManagement/definitions/SOL003VNFPerformanceManagement_def.yaml index 1ab35dc6..9a56481e 100644 --- a/src/SOL003/VNFPerformanceManagement/definitions/SOL003VNFPerformanceManagement_def.yaml +++ b/src/SOL003/VNFPerformanceManagement/definitions/SOL003VNFPerformanceManagement_def.yaml @@ -1,3 +1,6 @@ +# Copyright (c) ETSI 2024. +# https://forge.etsi.org/etsi-forge-copyright-notice.txt + definitions: CreateThresholdRequest: description: > diff --git a/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml b/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml index e7977845..0341f838 100644 --- a/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml +++ b/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml @@ -19,8 +19,8 @@ info: version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 003 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.05.01_60/gs_NFV-SOL003v040501p.pdf + description: ETSI GS NFV-SOL 003 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf servers: - url: http://127.0.0.1/callback/v2 diff --git a/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml b/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml index 9957c7b3..8f715db9 100644 --- a/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml +++ b/src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml @@ -19,8 +19,8 @@ info: version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 003 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.05.01_60/gs_NFV-SOL003v040501p.pdf + description: ETSI GS NFV-SOL 003 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf servers: - url: http://127.0.0.1/vnfsnapshotpkgm/v1 diff --git a/src/SOL003/VNFSnapshotPackageManagement/definitions/SOL003VNFSnapshotPackageManagement_def.yaml b/src/SOL003/VNFSnapshotPackageManagement/definitions/SOL003VNFSnapshotPackageManagement_def.yaml index 123d8fc4..83921f9c 100644 --- a/src/SOL003/VNFSnapshotPackageManagement/definitions/SOL003VNFSnapshotPackageManagement_def.yaml +++ b/src/SOL003/VNFSnapshotPackageManagement/definitions/SOL003VNFSnapshotPackageManagement_def.yaml @@ -1,4 +1,4 @@ -# Copyright (c) ETSI 2017. +# Copyright (c) ETSI 2024. # https://forge.etsi.org/etsi-forge-copyright-notice.txt definitions: diff --git a/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml b/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml index 2897d1fb..f4243caf 100644 --- a/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml +++ b/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml @@ -19,8 +19,8 @@ info: version: "1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: - description: ETSI GS NFV-SOL 003 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/04.05.01_60/gs_NFV-SOL003v040501p.pdf + description: ETSI GS NFV-SOL 003 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/05.01.01_60/gs_NFV-SOL003v050101p.pdf servers: - url: http://127.0.0.1/vrqan/v1 diff --git a/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/definitions/SOL003VirtualisedResourcesQuotaAvailableNotification_def.yaml b/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/definitions/SOL003VirtualisedResourcesQuotaAvailableNotification_def.yaml index 77fdeee2..c5551bc8 100644 --- a/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/definitions/SOL003VirtualisedResourcesQuotaAvailableNotification_def.yaml +++ b/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/definitions/SOL003VirtualisedResourcesQuotaAvailableNotification_def.yaml @@ -1,4 +1,4 @@ -# Copyright (c) ETSI 2017. +# Copyright (c) ETSI 2024. # https://forge.etsi.org/etsi-forge-copyright-notice.txt definitions: -- GitLab From 40893444e3c48ae45fc8d6ce45d18e5464299a5a Mon Sep 17 00:00:00 2001 From: Muhammad Umair Khan Date: Fri, 19 Jul 2024 11:52:45 +0500 Subject: [PATCH 08/22] Fix issue #16 -[v5.1.1] definition of SubscriptionAuthentication --- .../General_Definitions/SOL002_def.yaml | 110 ++++++++++++++---- .../General_Definitions/SOL003_def.yaml | 110 ++++++++++++++---- 2 files changed, 170 insertions(+), 50 deletions(-) diff --git a/src/SOL002/General_Definitions/SOL002_def.yaml b/src/SOL002/General_Definitions/SOL002_def.yaml index c4d0433f..c348262a 100644 --- a/src/SOL002/General_Definitions/SOL002_def.yaml +++ b/src/SOL002/General_Definitions/SOL002_def.yaml @@ -1662,9 +1662,18 @@ definitions: SubscriptionAuthentication: description: > - * NOTE: The clientId and clientPassword passed in a subscription shall not be the same as the clientId and - clientPassword that are used to obtain authorization for API requests. Client credentials may differ between - subscriptions. The value of clientPassword should be generated by a random process + * NOTE 1 : The clientId and clientPassword passed in a subscription shall not be the same as the clientId and + clientPassword that are used to obtain authorization for API requests. Client credentials may differ between + subscriptions. The value of clientPassword should be generated by a random process. + * NOTE 2: As a less secure alternative to OAUTH2_CLIENT_CERT which uses mutual authentication based on X.509 + certificates, this mode which uses client password to authenticate may be used in the access token request + toward the authorization server (as defined by IETF RFC 6749 [7]), only to support legacy implementations + (version 3.4.1 or earlier version of the present document). See clause 8.1 for more details. + * NOTE 3: The following values that were included up to version 3.4.1 of the present document have been removed: + "BASIC" (to signal the use of the basic HTTP authentication) has been removed because it is insecure. + "TLS_CERT" to signal an alternative non-token based authorization method using TLS certificates has been + removed because the method is no longer supported. + * NOTE 4: The client certificate is established by means outside the scope of the present document. type: object required: - authType @@ -1673,59 +1682,110 @@ definitions: description: > Defines the types of Authentication / Authorization which the API consumer is willing to accept when receiving a notification. - Permitted values: - * OAUTH2_CLIENT_CREDENTIALS: In every HTTP request to the - notification endpoint, use an OAuth 2.0 Bearer token, obtained - using the client credentials grant type. + Permitted values (see note 3): + * OAUTH2_CLIENT_CREDENTIALS: In every + HTTP request to the notification endpoint, use + an OAuth 2.0 token, obtained using the client + credentials grant type after authenticating + using client identifier and client password + towards the token endpoint. + * OAUTH2_CLIENT_CERT: In every HTTP + request to the notification endpoint, use an + OAuth 2.0 token, obtained using the client + credentials grant type after mutually + authenticating using client identifier and X.509 + certificates towards the token endpoint. type: array items: type: string enum: - OAUTH2_CLIENT_CREDENTIALS - paramsBasic: + - OAUTH2_CLIENT_CERT + paramsOauth2ClientCert: description: > - Parameters for authentication/authorization using BASIC. - Shall be present if authType is "BASIC" and the contained - information has not been provisioned out of band. + Parameters for authentication/authorization using + OAUTH2_CLIENT_CERT. + + Shall be present if authType is "OAUTH2_CLIENT_CERT" and the contained + information has not been provisioned out of band. + Shall be absent otherwise. type: object + required: + - clientId + - certificateRef + - tokenEndpoint properties: - userName: + clientId: description: > - Username to be used in HTTP Basic authentication. Shall be - present if it has not been provisioned out of band. + Client identifier to be used in the access token request + of the OAuth 2.0 client credentials grant type. The client + identifier is unique in the scope of the tokenEndpoint. type: string - password: + certificateRef: description: > - Password to be used in HTTP Basic authentication. Shall be - present if it has not been provisioned out of band. + Fingerprint of the client certificate. The hash function + shall use SHA256 or higher. See note 4. type: string + required: + - type + - value + properties: + type: + description: > + The type of the fingerprint. + Permitted values: + - x5t#S256: The SHA-256 thumbprint of the + X.509 certificate as defined in section 4.1.8 of + IETF RFC 7515 [23]. + $ref: "#/definitions/String" + enum: + - x5t#S256 + value: + description: > + The fingerprint value as defined by the type. + $ref: "#/definitions/String" + tokenEndpoint: + description: > + The token endpoint from which the access token can be + obtained. + $ref: "#/definitions/Uri" paramsOauth2ClientCredentials: description: > Parameters for authentication/authorization using OAUTH2_CLIENT_CREDENTIALS. - Shall be present if authType is "OAUTH2_CLIENT_CREDENTIALS" and the - contained information has not been provisioned out of band. + + Shall be present if authType is + "OAUTH2_CLIENT_CREDENTIALS" and the contained + information has not been provisioned out of band. + Shall be absent otherwise. + + See note 2. type: object properties: clientId: description: > - Client identifier to be used in the access token request of the - OAuth 2.0 client credentials grant type. - Shall be present if it has not been provisioned out of band. See note. + Client identifier to be used in the access token request + of the OAuth 2.0 client credentials grant type. The client + identifier is unique in the scope of the tokenEndpoint. + Shall be present if it has not been provisioned out of + band. + See note 1. type: string clientPassword: description: > - Client password to be used in the access token request of the - OAuth 2.0 client credentials grant type. - Shall be present if it has not been provisioned out of band. See note. + Client password to be used in the access token request + of the OAuth 2.0 client credentials grant type. Shall be + present if it has not been provisioned out of band. See + note 1. type: string tokenEndpoint: description: > The token endpoint from which the access token can be obtained. Shall be present if it has not been provisioned out of band. $ref: "#/definitions/Uri" + LcmCoordResultType: description: > The enumeration LcmCoordResultType defines the permitted values diff --git a/src/SOL003/General_Definitions/SOL003_def.yaml b/src/SOL003/General_Definitions/SOL003_def.yaml index 07189f8d..a04945a0 100644 --- a/src/SOL003/General_Definitions/SOL003_def.yaml +++ b/src/SOL003/General_Definitions/SOL003_def.yaml @@ -1416,9 +1416,18 @@ definitions: SubscriptionAuthentication: description: > - * NOTE: The clientId and clientPassword passed in a subscription shall not be the same as the clientId and - clientPassword that are used to obtain authorization for API requests. Client credentials may differ between - subscriptions. The value of clientPassword should be generated by a random process + * NOTE 1 : The clientId and clientPassword passed in a subscription shall not be the same as the clientId and + clientPassword that are used to obtain authorization for API requests. Client credentials may differ between + subscriptions. The value of clientPassword should be generated by a random process. + * NOTE 2: As a less secure alternative to OAUTH2_CLIENT_CERT which uses mutual authentication based on X.509 + certificates, this mode which uses client password to authenticate may be used in the access token request + toward the authorization server (as defined by IETF RFC 6749 [7]), only to support legacy implementations + (version 3.4.1 or earlier version of the present document). See clause 8.1 for more details. + * NOTE 3: The following values that were included up to version 3.4.1 of the present document have been removed: + "BASIC" (to signal the use of the basic HTTP authentication) has been removed because it is insecure. + "TLS_CERT" to signal an alternative non-token based authorization method using TLS certificates has been + removed because the method is no longer supported. + * NOTE 4: The client certificate is established by means outside the scope of the present document. type: object required: - authType @@ -1427,59 +1436,110 @@ definitions: description: > Defines the types of Authentication / Authorization which the API consumer is willing to accept when receiving a notification. - Permitted values: - * OAUTH2_CLIENT_CREDENTIALS: In every HTTP request to the - notification endpoint, use an OAuth 2.0 Bearer token, obtained - using the client credentials grant type. + Permitted values (see note 3): + * OAUTH2_CLIENT_CREDENTIALS: In every + HTTP request to the notification endpoint, use + an OAuth 2.0 token, obtained using the client + credentials grant type after authenticating + using client identifier and client password + towards the token endpoint. + * OAUTH2_CLIENT_CERT: In every HTTP + request to the notification endpoint, use an + OAuth 2.0 token, obtained using the client + credentials grant type after mutually + authenticating using client identifier and X.509 + certificates towards the token endpoint. type: array items: type: string enum: - OAUTH2_CLIENT_CREDENTIALS - paramsBasic: + - OAUTH2_CLIENT_CERT + paramsOauth2ClientCert: description: > - Parameters for authentication/authorization using BASIC. - Shall be present if authType is "BASIC" and the contained - information has not been provisioned out of band. + Parameters for authentication/authorization using + OAUTH2_CLIENT_CERT. + + Shall be present if authType is "OAUTH2_CLIENT_CERT" and the contained + information has not been provisioned out of band. + Shall be absent otherwise. type: object + required: + - clientId + - certificateRef + - tokenEndpoint properties: - userName: + clientId: description: > - Username to be used in HTTP Basic authentication. Shall be - present if it has not been provisioned out of band. + Client identifier to be used in the access token request + of the OAuth 2.0 client credentials grant type. The client + identifier is unique in the scope of the tokenEndpoint. type: string - password: + certificateRef: description: > - Password to be used in HTTP Basic authentication. Shall be - present if it has not been provisioned out of band. + Fingerprint of the client certificate. The hash function + shall use SHA256 or higher. See note 4. type: string + required: + - type + - value + properties: + type: + description: > + The type of the fingerprint. + Permitted values: + - x5t#S256: The SHA-256 thumbprint of the + X.509 certificate as defined in section 4.1.8 of + IETF RFC 7515 [23]. + $ref: "#/definitions/String" + enum: + - x5t#S256 + value: + description: > + The fingerprint value as defined by the type. + $ref: "#/definitions/String" + tokenEndpoint: + description: > + The token endpoint from which the access token can be + obtained. + $ref: "#/definitions/Uri" paramsOauth2ClientCredentials: description: > Parameters for authentication/authorization using OAUTH2_CLIENT_CREDENTIALS. - Shall be present if authType is "OAUTH2_CLIENT_CREDENTIALS" and the - contained information has not been provisioned out of band. + + Shall be present if authType is + "OAUTH2_CLIENT_CREDENTIALS" and the contained + information has not been provisioned out of band. + Shall be absent otherwise. + + See note 2. type: object properties: clientId: description: > - Client identifier to be used in the access token request of the - OAuth 2.0 client credentials grant type. - Shall be present if it has not been provisioned out of band. See note. + Client identifier to be used in the access token request + of the OAuth 2.0 client credentials grant type. The client + identifier is unique in the scope of the tokenEndpoint. + Shall be present if it has not been provisioned out of + band. + See note 1. type: string clientPassword: description: > - Client password to be used in the access token request of the - OAuth 2.0 client credentials grant type. - Shall be present if it has not been provisioned out of band. See note. + Client password to be used in the access token request + of the OAuth 2.0 client credentials grant type. Shall be + present if it has not been provisioned out of band. See + note 1. type: string tokenEndpoint: description: > The token endpoint from which the access token can be obtained. Shall be present if it has not been provisioned out of band. $ref: "#/definitions/Uri" + LcmCoordResultType: description: > The enumeration LcmCoordResultType defines the permitted values -- GitLab From d14cf12cac6bdda4dbcd6718bd3ea4b848c8f2f8 Mon Sep 17 00:00:00 2001 From: ishaqm Date: Fri, 19 Jul 2024 14:32:59 +0500 Subject: [PATCH 09/22] update patch request content type header in v5.1.1 --- .../VNFFaultManagement.yaml | 2 +- .../VNFLifecycleManagement.yaml | 2 +- .../VNFPerformanceManagement.yaml | 4 ++-- .../VNFFaultManagement.yaml | 2 +- .../VNFLifecycleManagement.yaml | 4 ++-- .../VNFPerformanceManagement.yaml | 20 +++++++++++++++++++ 6 files changed, 27 insertions(+), 7 deletions(-) diff --git a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml index 125428fa..53c31f15 100644 --- a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml +++ b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml @@ -404,7 +404,7 @@ components: IndividualAlarmRequest: description: The parameter for the alarm modification content: - application/json: + application/merge-patch+json: schema: $ref: definitions/SOL002VNFFaultManagement_def.yaml#/definitions/AlarmModifications required: true diff --git a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml index 8c89ede7..e036a9f3 100644 --- a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml +++ b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml @@ -1414,7 +1414,7 @@ components: VnfInstanceModificationRequest: description: Input parameters for VNF info modification content: - application/json: + application/merge-patch+json: schema: $ref: definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/VnfInfoModificationRequest required: true diff --git a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml index bfebded2..3ac65852 100644 --- a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml +++ b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml @@ -538,7 +538,7 @@ components: PmJobModificationRequest: description: Parameters for the PM job modification content: - application/json: + application/merge-patch+json: schema: $ref: definitions/SOL002VNFPerformanceManagement_def.yaml#/definitions/PmJobModifications required: true @@ -555,7 +555,7 @@ components: ThresholdModificationRequest: description: Parameters for the threshold modification. content: - application/json: + application/merge-patch+json: schema: $ref: definitions/SOL002VNFPerformanceManagement_def.yaml#/definitions/ThresholdModifications required: true diff --git a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml index c092b1e3..6aba46da 100644 --- a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml +++ b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml @@ -350,7 +350,7 @@ components: IndividualAlarmRequest: description: The VNF creation parameters content: - application/json: + application/merge-patch+json: schema: $ref: "definitions/SOL003VNFFaultManagement_def.yaml#/definitions/AlarmModifications" required: true diff --git a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml index a3c137ae..1fec46b8 100644 --- a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml +++ b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml @@ -1495,7 +1495,7 @@ components: description: | Parameters for the VNF modification, as defined in clause 5.5.2.12. content: - application/json: + application/merge-patch+json: schema: $ref: "definitions/SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfInfoModificationRequest" required: true @@ -1623,7 +1623,7 @@ components: description: | Parameters for the VNF snapshot information modification, as defined in clause 5.5.2.24. content: - application/json: + application/merge-patch+json: schema: $ref: "definitions/SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfSnapshotInfoModificationRequest" required: true diff --git a/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml b/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml index f943c288..731e6a12 100644 --- a/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml +++ b/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml @@ -152,6 +152,8 @@ paths: parameters: - $ref: '../../components/SOL003_params.yaml#/components/parameters/If-Unmodified-Since' - $ref: '../../components/SOL003_params.yaml#/components/parameters/If-Match' + requestBody: + $ref: '#/components/requestBodies/PmJobModificationRequest' responses: 200: $ref: '#/components/responses/IndividualPmJob.Patch.200' @@ -358,6 +360,8 @@ paths: parameters: - $ref: '../../components/SOL003_params.yaml#/components/parameters/If-Unmodified-Since' - $ref: '../../components/SOL003_params.yaml#/components/parameters/If-Match' + requestBody: + $ref: '#/components/requestBodies/ThresholdModificationRequest' responses: 200: $ref: '#/components/responses/IndividualThreshold.Patch.200' @@ -504,6 +508,14 @@ components: schema: $ref: "definitions/SOL003VNFPerformanceManagement_def.yaml#/definitions/CreatePmJobRequest" required: true + + PmJobModificationRequest: + description: Parameters for the PM job modification + content: + application/merge-patch+json: + schema: + $ref: definitions/SOL003VNFPerformanceManagement_def.yaml#/definitions/PmJobModifications + required: true CreateThresholdRequest: description: Request parameters to create a threshold resource. @@ -513,6 +525,14 @@ components: $ref: "definitions/SOL003VNFPerformanceManagement_def.yaml#/definitions/CreateThresholdRequest" required: true + ThresholdModificationRequest: + description: Parameters for the threshold modification. + content: + application/merge-patch+json: + schema: + $ref: definitions/SOL003VNFPerformanceManagement_def.yaml#/definitions/ThresholdModifications + required: true + responses: PmJobs.Post.201: description: | -- GitLab From 6b2c90fa1de9550d6d4a83963d9011c14b6fcc83 Mon Sep 17 00:00:00 2001 From: ishaqm Date: Fri, 19 Jul 2024 15:12:28 +0500 Subject: [PATCH 10/22] update definition for mcioType in v5.1.1 --- .../definitions/SOL002VNFLifecycleManagement_def.yaml | 3 ++- .../definitions/SOL003VNFLifecycleManagement_def.yaml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml index f160e2b5..1a125235 100644 --- a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml +++ b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml @@ -3504,7 +3504,8 @@ definitions: type: string enum: - Deployment - - Statefulset + - StatefulSet + - DaemonSet desiredInstances: description: > Number of desired MCIO instances. diff --git a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml index 4c9cc232..2ccab180 100644 --- a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml +++ b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml @@ -4407,6 +4407,7 @@ definitions: enum: - Deployment - Statefulset + - DaemonSet desiredInstances: description: > Number of desired MCIO instances. -- GitLab From fda8f1469a8a1dfba07b525abba6c02e8f896237 Mon Sep 17 00:00:00 2001 From: Muhammad Umair Khan Date: Fri, 19 Jul 2024 15:22:16 +0500 Subject: [PATCH 11/22] fix issue #15 - [SOL003] [v5.1.1] corrected compliance issue in InstantiateVnfRequest component note 3 --- .../definitions/SOL003VNFLifecycleManagement_def.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml index 4c9cc232..e22f31c9 100644 --- a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml +++ b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml @@ -31,11 +31,6 @@ definitions: lifecycle of the VNF, as a result of a change of the selected deployable modules any of those VNFCs is going to be instantiated, the stored information determines the number of instances, unless the request that triggered the change also contains information about the number of instances. - anyOf: - - required: - - instantiationLevelId - - required: - - targetScaleLevelInfo type: object required: - flavourId -- GitLab From 8e7bbf9f551f907add095a2f62b3a2f515998f64 Mon Sep 17 00:00:00 2001 From: ishaqm Date: Fri, 19 Jul 2024 15:34:57 +0500 Subject: [PATCH 12/22] fix issue #13 - docker build in v5.1.1 --- docker/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index b2bc2158..38f0e96b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -13,6 +13,8 @@ RUN apk add openjdk8 RUN apk add ca-certificates wget && update-ca-certificates RUN apk add openssl RUN gem install rdoc -v 6.3.3 || gem install rdoc -v 6.3.3 +RUN gem install public_suffix -v 4.0.7 +RUN gem install css_parser -v 1.12.00 RUN gem install asciidoctor-pdf-cjk RUN wget https://forge.etsi.org/swagger2markup-cli-1.3.2.jar RUN npm config set proxy $http_proxy -- GitLab From 4e87fe93d9b3c6d50ec275f56d6b5ed53f728780 Mon Sep 17 00:00:00 2001 From: Muhammad Umair Khan Date: Fri, 19 Jul 2024 17:05:31 +0500 Subject: [PATCH 13/22] fix issue #15 - [SOL003] [v5.1.1] corrected compliance issue in InstantiateVnfRequest component note 3 --- .../definitions/SOL002VNFLifecycleManagement_def.yaml | 5 ----- .../definitions/SOL003VNFLifecycleManagement_def.yaml | 5 ----- 2 files changed, 10 deletions(-) diff --git a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml index f160e2b5..8a8afe06 100644 --- a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml +++ b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml @@ -489,11 +489,6 @@ definitions: lifecycle of the VNF, as a result of a change of the selected deployable modules any of those VNFCs is going to be instantiated, the stored information determines the number of instances, unless the request that triggered the change also contains information about the number of instances. - anyOf: - - required: - - instantiationLevelId - - required: - - targetScaleLevelInfo type: object required: - flavourId diff --git a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml index 4c9cc232..e22f31c9 100644 --- a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml +++ b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml @@ -31,11 +31,6 @@ definitions: lifecycle of the VNF, as a result of a change of the selected deployable modules any of those VNFCs is going to be instantiated, the stored information determines the number of instances, unless the request that triggered the change also contains information about the number of instances. - anyOf: - - required: - - instantiationLevelId - - required: - - targetScaleLevelInfo type: object required: - flavourId -- GitLab From 75b42d90a12f47f4cee0a7f1aa6e4cba688d418b Mon Sep 17 00:00:00 2001 From: Ayesha Ayub Date: Thu, 29 Aug 2024 10:09:47 +0500 Subject: [PATCH 14/22] fix missing required key in Type: MonitoringConnection as per clause 4.4.1.7 in SOL002 --- src/SOL002/General_Definitions/SOL002_def.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/SOL002/General_Definitions/SOL002_def.yaml b/src/SOL002/General_Definitions/SOL002_def.yaml index c348262a..1c4683a5 100644 --- a/src/SOL002/General_Definitions/SOL002_def.yaml +++ b/src/SOL002/General_Definitions/SOL002_def.yaml @@ -536,6 +536,9 @@ definitions: be used by configuration means outside the scope of the present document (e.g. using relevant NFV-MANO management APIs as defined in ETSI GS NFV-SOL 009). type: object + required: + - id + - monitoringType properties: id: description: > -- GitLab From 438791ef58b4100a2ea7d699e96abf2c164f95bf Mon Sep 17 00:00:00 2001 From: Ayesha Ayub Date: Thu, 29 Aug 2024 10:16:19 +0500 Subject: [PATCH 15/22] fix version of VNF LCM API to 2.14.0 in SOL003 --- .../VNFLifecycleManagementNotification.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml b/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml index 63ddaab7..aba43c0b 100644 --- a/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml +++ b/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml @@ -16,7 +16,7 @@ info: license: name: "ETSI Forge copyright notice" url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: "2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" + version: "2.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: description: ETSI GS NFV-SOL 003 V5.1.1 -- GitLab From b51955c23b4f24173fe04d7201dd62ef161dac0f Mon Sep 17 00:00:00 2001 From: Ayesha Ayub Date: Thu, 29 Aug 2024 10:31:33 +0500 Subject: [PATCH 16/22] fix typos in the descriptions of attributes of Type:VirtualComputeDesc and Type:VirtualStorageDesc in SOL003 --- src/SOL003/General_Definitions/SOL003_def.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SOL003/General_Definitions/SOL003_def.yaml b/src/SOL003/General_Definitions/SOL003_def.yaml index a04945a0..3b02ed1f 100644 --- a/src/SOL003/General_Definitions/SOL003_def.yaml +++ b/src/SOL003/General_Definitions/SOL003_def.yaml @@ -964,7 +964,7 @@ definitions: properties: resourceTemplateId: description: > - Identifier of an osContainerDesc in the VNFD. + Identifier of a VirtualComputeDesc in the VNFD. $ref: "#/definitions/IdentifierInVnfd" numVirtualCpu: description: > @@ -1003,7 +1003,7 @@ definitions: properties: resourceTemplateId: description: > - Identifier of an osContainerDesc in the VNFD. + Identifier of a VirtualStorageDesc in the VNFD. $ref: "#/definitions/IdentifierInVnfd" sizeOfStorage: description: > -- GitLab From 6a8c48ed4f41b011313be9180623dc6d3cd7bc79 Mon Sep 17 00:00:00 2001 From: Ayesha Ayub Date: Thu, 29 Aug 2024 10:41:29 +0500 Subject: [PATCH 17/22] fix typos in the description of some attributes in both SOL002/SOL003 --- .../definitions/SOL002VNFLifecycleManagement_def.yaml | 2 +- src/SOL003/General_Definitions/SOL003_def.yaml | 2 +- .../definitions/SOL003VNFLifecycleManagement_def.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml index 92c65fa6..64dacb0d 100644 --- a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml +++ b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml @@ -3323,7 +3323,7 @@ definitions: $ref: "#/definitions/CpProtocolInfo" associatedVnfcCpIds: description: > - Identifiers of the VnfcCps that share the virtual IP addresse allocated to the VIP CP instance. See note. + Identifiers of the VnfcCps that share the virtual IP address allocated to the VIP CP instance. See note. type: array items: $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf" diff --git a/src/SOL003/General_Definitions/SOL003_def.yaml b/src/SOL003/General_Definitions/SOL003_def.yaml index 3b02ed1f..12751052 100644 --- a/src/SOL003/General_Definitions/SOL003_def.yaml +++ b/src/SOL003/General_Definitions/SOL003_def.yaml @@ -1242,7 +1242,7 @@ definitions: VnfLinkPortData: description: > This type represents an externally provided link port to be used to connect a VNFC connection point - to an exernally managed VL. + to an externally managed VL. type: object required: - vnfLinkPortId diff --git a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml index 03d87990..68b91fa5 100644 --- a/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml +++ b/src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml @@ -4272,7 +4272,7 @@ definitions: $ref: "#/definitions/CpProtocolInfo" associatedVnfcCpIds: description: > - Identifiers of the VnfcCps that share the virtual IP addresse allocated to the VIP CP instance. See note. + Identifiers of the VnfcCps that share the virtual IP address allocated to the VIP CP instance. See note. type: array items: $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf" -- GitLab From b8d5046698416a86db7d8c41c2e5076ff6eb9c22 Mon Sep 17 00:00:00 2001 From: Ayesha Ayub Date: Thu, 29 Aug 2024 11:14:12 +0500 Subject: [PATCH 18/22] fix attributes containing map data types in both SOL002 and SOL003 --- src/SOL002/General_Definitions/SOL002_def.yaml | 12 ++++++------ src/SOL003/General_Definitions/SOL003_def.yaml | 12 ++++++------ .../SOL003VNFLifecycleOperationGranting_def.yaml | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/SOL002/General_Definitions/SOL002_def.yaml b/src/SOL002/General_Definitions/SOL002_def.yaml index 1c4683a5..8a6d6ed3 100644 --- a/src/SOL002/General_Definitions/SOL002_def.yaml +++ b/src/SOL002/General_Definitions/SOL002_def.yaml @@ -243,8 +243,8 @@ definitions: The key is a string that identifies an extended resource indicated in the extended_resource_requests property in the VNFD for this container descriptor. The value is an integer that indicates the required amount for a particular extended resource.See note. - type: array - items: + type: object + additionalProperties: type: integer cpuResourceLimit: description: > @@ -268,8 +268,8 @@ definitions: The value is a number that indicates the required total size expressed in the same units as in the huge_pages_resources_property in the VNFD that indicates the valid values for required total size for the particular hugepage size. See note. - type: array - items: + type: object + additionalProperties: $ref: "#/definitions/Number" VirtualComputeDescData: description: > @@ -317,8 +317,8 @@ definitions: The value is a number that indicates the required total size expressed in the same units as in the huge_pages_requirements property in the VNFD that indicates the valid values for required total size for the particular hugepage size. See note. - type: array - items: + type: object + additionalProperties: $ref: "#/definitions/Number" VirtualStorageDescData: diff --git a/src/SOL003/General_Definitions/SOL003_def.yaml b/src/SOL003/General_Definitions/SOL003_def.yaml index 12751052..f07a260a 100644 --- a/src/SOL003/General_Definitions/SOL003_def.yaml +++ b/src/SOL003/General_Definitions/SOL003_def.yaml @@ -915,8 +915,8 @@ definitions: The key is a string that identifies an extended resource indicated in the extended_resource_requests property in the VNFD (clause 6.8.12 in ETSI GS NFV-SOL 001 [14]) for this container descriptor. The value is an integer that indicates the required amount for a particular extended resource. See note. - type: array - items: + type: object + additionalProperties: type: integer cpuResourceLimit: description: > @@ -940,8 +940,8 @@ definitions: The key is a string and corresponds to one of the values of the hugepage sizes indicated in the huge_pages_resources property in the VNFD (clause 6.8.12 in ETSI GS NFV-SOL 001 [14]) for this container descriptor. The value is a number that indicates the required total size expressed in the same units as in the huge_pages_resource property in the VNFD (clause 6.8.12 in ETSI GS NFV-SOL 001 [14]) that indicates the valid values for required total size for the particular hugepage size. See note. - type: array - items: + type: object + additionalProperties: $ref: "#/definitions/Number" VirtualComputeDescData: @@ -989,8 +989,8 @@ definitions: The value is a numberthat indicates the required total size expressed in the same units as in the huge_pages_requirements property in the VNFD (clause 6.2.7.2 in ETSI GS NFV-SOL 001 [14]) that indicates the valid vaues for required total size for the particular hugepage size. See note. - type: array - items: + type: object + additionalProperties: $ref: "#/definitions/Number" VirtualStorageDescData: diff --git a/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml b/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml index dd7416f6..393f0ee1 100644 --- a/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml +++ b/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml @@ -1142,8 +1142,8 @@ definitions: extendedResourceRequests: description: > An array of key-value pairs of extended resources required by the container. - type: array - items: + type: object + additionalProperties: type: integer cpuResourceLimit: description: > -- GitLab From 9ea996e6898a16133e0781e7f59878ee0cc1190e Mon Sep 17 00:00:00 2001 From: Ayesha Ayub Date: Fri, 30 Aug 2024 15:19:12 +0500 Subject: [PATCH 19/22] fix attributes containing map data types in SOL003 --- .../definitions/SOL003VNFLifecycleOperationGranting_def.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml b/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml index 393f0ee1..e8192b61 100644 --- a/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml +++ b/src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml @@ -1161,8 +1161,8 @@ definitions: description: > Specifies HugePages resources requested for the container, which the container can maximally use (e.g. "hugepages-2Mi: 100Mi"). - type: array - items: + type: object + additionalProperties: $ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Number" PaasAssets: -- GitLab From d922a585b25f79f208c55fceeb1d0e8c522bfd34 Mon Sep 17 00:00:00 2001 From: Ayesha Ayub Date: Fri, 30 Aug 2024 15:42:06 +0500 Subject: [PATCH 20/22] fix typos in the description of virtualComputeDescData attribute --- src/SOL003/General_Definitions/SOL003_def.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SOL003/General_Definitions/SOL003_def.yaml b/src/SOL003/General_Definitions/SOL003_def.yaml index f07a260a..8d1a5d48 100644 --- a/src/SOL003/General_Definitions/SOL003_def.yaml +++ b/src/SOL003/General_Definitions/SOL003_def.yaml @@ -852,8 +852,8 @@ definitions: $ref: "#/definitions/OsContainerDescData" virtualComputeDescData: description: > - Indicates values for resource capacity related attributes in an OsContainerDesc. - It shall be present when the attribute 'type' indicates OSCONTAINER and absent otherwise. + Indicates values for resource capacity related attributes in an VirtualComputeDesc. + It shall be present when the attribute 'type' indicates COMPUTE and absent otherwise. $ref: "#/definitions/VirtualComputeDescData" virtualStorageDescData: description: > -- GitLab From cce3f096f5a9b08bdaf02b0019342816687c5dab Mon Sep 17 00:00:00 2001 From: Ayesha Ayub Date: Fri, 30 Aug 2024 15:53:01 +0500 Subject: [PATCH 21/22] fix versions of SOL003 APIs in the Notifications files --- .../VNFFaultManagementNotification.yaml | 2 +- .../VNFIndicatorNotification/VNFIndicatorNotification.yaml | 2 +- .../VNFPerformanceManagementNotification.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml b/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml index 6b1b0740..06638f2e 100644 --- a/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml +++ b/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 1.14.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 003 V5.1.1 diff --git a/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml b/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml index a3f235ec..70f452be 100644 --- a/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml +++ b/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: "1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" + version: "1.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" externalDocs: description: ETSI GS NFV-SOL 003 V5.1.1 diff --git a/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml b/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml index 0341f838..3bd0b78e 100644 --- a/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml +++ b/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.13.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 003 V5.1.1 -- GitLab From c17fad47764ffbff3532e370ac1c3d3ad7d9ee27 Mon Sep 17 00:00:00 2001 From: Ayesha Ayub Date: Fri, 30 Aug 2024 16:08:56 +0500 Subject: [PATCH 22/22] fix attribute 'fileSize' by removing its maximum value --- .../definitions/SOL002VNFPerformanceManagement_def.yaml | 3 --- .../definitions/SOL003VNFPerformanceManagement_def.yaml | 3 --- 2 files changed, 6 deletions(-) diff --git a/src/SOL002/VNFPerformanceManagement/definitions/SOL002VNFPerformanceManagement_def.yaml b/src/SOL002/VNFPerformanceManagement/definitions/SOL002VNFPerformanceManagement_def.yaml index 821d5a08..bd16e2d9 100644 --- a/src/SOL002/VNFPerformanceManagement/definitions/SOL002VNFPerformanceManagement_def.yaml +++ b/src/SOL002/VNFPerformanceManagement/definitions/SOL002VNFPerformanceManagement_def.yaml @@ -355,9 +355,6 @@ definitions: The size of the report file in bytes, if known. type: integer minimum: 0 - maximum: 1024 - # TODO: How to express unsigned int? - # Done using min and max params to set a range for positive int. pmJobConnection: description: > An access information and interface information of PM job to monitor the PM of VNF instance by the VNFM. diff --git a/src/SOL003/VNFPerformanceManagement/definitions/SOL003VNFPerformanceManagement_def.yaml b/src/SOL003/VNFPerformanceManagement/definitions/SOL003VNFPerformanceManagement_def.yaml index 9a56481e..823b57c2 100644 --- a/src/SOL003/VNFPerformanceManagement/definitions/SOL003VNFPerformanceManagement_def.yaml +++ b/src/SOL003/VNFPerformanceManagement/definitions/SOL003VNFPerformanceManagement_def.yaml @@ -355,9 +355,6 @@ definitions: The size of the report file in bytes, if known. type: integer minimum: 0 - maximum: 1024 - # TODO: How to express unsigned int? - # Done using min and max params to set a range for positive int. pmJobConnection: description: > An access information and interface information of PM job to monitor the PM of VNF instance -- GitLab