From 87a59e95cef1a57728ec66ce82c4e11819bc3648 Mon Sep 17 00:00:00 2001 From: Pietro Piscione Date: Wed, 17 Jul 2024 15:56:34 +0200 Subject: [PATCH 1/2] SOL009_1, SOL009_4 to SOL009_6 --- src/SOL009/APIVersion/APIVersion.yaml | 4 +- ...ConfigurationAndInformationManagement.yaml | 6 +- ...igurationAndInformationManagement_def.yaml | 84 ++++++++++++++++++- ...nAndInformationManagementNotification.yaml | 6 +- .../NFVManoFaultManagement.yaml | 4 +- .../NFVManoFaultManagementNotification.yaml | 4 +- .../NFVManoLogManagement.yaml | 4 +- .../NFVManoLogManagementNotification.yaml | 4 +- .../NFVManoPerformanceManagement.yaml | 4 +- ...ManoPerformanceManagementNotification.yaml | 5 +- 10 files changed, 103 insertions(+), 22 deletions(-) diff --git a/src/SOL009/APIVersion/APIVersion.yaml b/src/SOL009/APIVersion/APIVersion.yaml index 7e78cd6..abc3950 100644 --- a/src/SOL009/APIVersion/APIVersion.yaml +++ b/src/SOL009/APIVersion/APIVersion.yaml @@ -19,8 +19,8 @@ info: version: 1.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 009 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/04.05.01_60/gs_NFV-SOL009v040501p.pdf + description: ETSI GS NFV-SOL 009 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/05.01.01_60/gs_nfv-sol009v050101p.pdf paths: /nfvmanocim/api_versions: diff --git a/src/SOL009/NFVManoConfigurationAndInformationManagement/NFVManoConfigurationAndInformationManagement.yaml b/src/SOL009/NFVManoConfigurationAndInformationManagement/NFVManoConfigurationAndInformationManagement.yaml index 8656045..fa4450d 100644 --- a/src/SOL009/NFVManoConfigurationAndInformationManagement/NFVManoConfigurationAndInformationManagement.yaml +++ b/src/SOL009/NFVManoConfigurationAndInformationManagement/NFVManoConfigurationAndInformationManagement.yaml @@ -16,11 +16,11 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.11.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 009 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/04.05.01_60/gs_NFV-SOL009v040501p.pdf + description: ETSI GS NFV-SOL 009 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/05.01.01_60/gs_nfv-sol009v050101p.pdf servers: - url: http://127.0.0.1/nfvmanocim/v2 diff --git a/src/SOL009/NFVManoConfigurationAndInformationManagement/definitions/NFVManoConfigurationAndInformationManagement_def.yaml b/src/SOL009/NFVManoConfigurationAndInformationManagement/definitions/NFVManoConfigurationAndInformationManagement_def.yaml index 7d63dd6..8bbefd3 100644 --- a/src/SOL009/NFVManoConfigurationAndInformationManagement/definitions/NFVManoConfigurationAndInformationManagement_def.yaml +++ b/src/SOL009/NFVManoConfigurationAndInformationManagement/definitions/NFVManoConfigurationAndInformationManagement_def.yaml @@ -1062,7 +1062,7 @@ definitions: This type represents information attributes specific to an NFVO entity, and that can be relevant to more than one NFV-MANO service offered by an NFVO entity. * NOTE 1: The information to be provided in this attribute shall relate to the specification and version - of the specification. For instance, "ETSI GS NFV-SOL 001 (V2.5.1)". + of the specification. For instance, "ETSI GS NFV-SOL 001 (V5.5.1)". NOTE 2: If this attribute is not present, the value of this parameter is undefined. type: object required: @@ -1218,7 +1218,87 @@ definitions: enum: - DELEGATION-MODE - DIRECT-MODE - + pmJobConnectionInfos: + description: > + PM job connection information + type: array + items: + type: object + required: + - monitoringType + properties: + monitoringType: + description: > + Indicates the type of tool to monitor the PM of the VNF instance managed by the VNFM. + Permitted values: + • VIM_CISM + • EXTERNAL + type: string + enum: + - VIM_CISM + - EXTERNAL + vimId: + description: > + Information about VIM or CISM connection(s) for monitoring resources for the VNF instance. + May be present only if the “monitoringType“ attribute in the “VnfmSpecificInfo“ is “VIM_CISM“. + $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/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. May be present only if the “monitoringType“ + attribute in the “VnfmSpecificInfo“ is “EXTERNAL“. + $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/KeyValuePairs" + accessInfo: + description: > + Information about authentication credentials for accessing the external monitoring tool. Examples can + include those to support different authentication schemes, e.g., OAuth, Token, Username/password, etc. + May be present only if the “monitoringType“ attribute in the “VnfmSpecificInfo“ is “EXTERNAL“. + $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/KeyValuePairs" + extra: + description: > + Monitoring type specific additional information. + $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/KeyValuePairs" + fmConnectionInfos: + description: > + FM connection information + type: array + items: + type: object + required: + - monitoringType + properties: + monitoringType: + description: > + Indicates the type of tool to monitor faults of the VNF instance managed by the VNFM. + Permitted values: + • VIM_CISM + • EXTERNAL + type: string + enum: + - VIM_CISM + - EXTERNAL + vimId: + description: > + Information about VIM or CISM connection(s) for monitoring resources for the VNF instance. + May be present only if the “monitoringType“ attribute in the “VnfmSpecificInfo“ is “VIM_CISM“. + $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/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. + May be present only if the “monitoringType“ attribute in the “VnfmSpecificInfo“ is “EXTERNAL“. + $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/KeyValuePairs" + accessInfo: + description: > + Information about authentication credentials for accessing the external monitoring tool. + Examples can include those to support different authentication schemes, e.g., OAuth, Token, Username/password, etc. + May be present only if the “monitoringType“ attribute in the “VnfmSpecificInfo“ is “EXTERNAL“. + $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/KeyValuePairs" + extra: + description: > + Monitoring type specific additional information. + $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/KeyValuePairs" + VimSpecificInfo: description: > This type represents information attributes specific to a VIM entity, diff --git a/src/SOL009/NFVManoConfigurationAndInformationManagementNotification/NFVManoConfigurationAndInformationManagementNotification.yaml b/src/SOL009/NFVManoConfigurationAndInformationManagementNotification/NFVManoConfigurationAndInformationManagementNotification.yaml index d27543f..5e69d0c 100644 --- a/src/SOL009/NFVManoConfigurationAndInformationManagementNotification/NFVManoConfigurationAndInformationManagementNotification.yaml +++ b/src/SOL009/NFVManoConfigurationAndInformationManagementNotification/NFVManoConfigurationAndInformationManagementNotification.yaml @@ -19,9 +19,9 @@ info: version: 2.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 009 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/04.04.01_60/gs_NFV-SOL009v040501p.pdf - + description: ETSI GS NFV-SOL 009 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/05.01.01_60/gs_nfv-sol009v050101p.pdf + servers: - url: http://127.0.0.1/callback/v2 - url: https://127.0.0.1/callback/v2 diff --git a/src/SOL009/NFVManoFaultManagement/NFVManoFaultManagement.yaml b/src/SOL009/NFVManoFaultManagement/NFVManoFaultManagement.yaml index a906b41..05c1812 100644 --- a/src/SOL009/NFVManoFaultManagement/NFVManoFaultManagement.yaml +++ b/src/SOL009/NFVManoFaultManagement/NFVManoFaultManagement.yaml @@ -19,8 +19,8 @@ info: version: 1.0.1-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 009 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/04.05.01_60/gs_NFV-SOL009v040501p.pdf + description: ETSI GS NFV-SOL 009 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/05.01.01_60/gs_nfv-sol009v050101p.pdf servers: - url: http://127.0.0.1/nfvmanofm/v1 diff --git a/src/SOL009/NFVManoFaultManagementNotification/NFVManoFaultManagementNotification.yaml b/src/SOL009/NFVManoFaultManagementNotification/NFVManoFaultManagementNotification.yaml index d1eb40f..0815161 100644 --- a/src/SOL009/NFVManoFaultManagementNotification/NFVManoFaultManagementNotification.yaml +++ b/src/SOL009/NFVManoFaultManagementNotification/NFVManoFaultManagementNotification.yaml @@ -19,8 +19,8 @@ info: version: 1.0.1-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 009 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/04.05.01_60/gs_NFV-SOL009v040501p.pdf + description: ETSI GS NFV-SOL 009 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/05.01.01_60/gs_nfv-sol009v050101p.pdf servers: - url: http://127.0.0.1/callback/v1 diff --git a/src/SOL009/NFVManoLogManagement/NFVManoLogManagement.yaml b/src/SOL009/NFVManoLogManagement/NFVManoLogManagement.yaml index 778c150..24cfe41 100644 --- a/src/SOL009/NFVManoLogManagement/NFVManoLogManagement.yaml +++ b/src/SOL009/NFVManoLogManagement/NFVManoLogManagement.yaml @@ -19,8 +19,8 @@ info: version: 1.0.1-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 009 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/04.05.01_60/gs_NFV-SOL009v040501p.pdf + description: ETSI GS NFV-SOL 009 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/05.01.01_60/gs_nfv-sol009v050101p.pdf servers: - url: http://127.0.0.1/nfvmanologm/v1 diff --git a/src/SOL009/NFVManoLogManagementNotification/NFVManoLogManagementNotification.yaml b/src/SOL009/NFVManoLogManagementNotification/NFVManoLogManagementNotification.yaml index 776a7be..4a107a4 100644 --- a/src/SOL009/NFVManoLogManagementNotification/NFVManoLogManagementNotification.yaml +++ b/src/SOL009/NFVManoLogManagementNotification/NFVManoLogManagementNotification.yaml @@ -19,8 +19,8 @@ info: version: 1.0.1-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 009 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/04.05.01_60/gs_NFV-SOL009v040501p.pdf + description: ETSI GS NFV-SOL 009 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/05.01.01_60/gs_nfv-sol009v050101p.pdf servers: - url: http://127.0.0.1/callback/v1 diff --git a/src/SOL009/NFVManoPerformanceManagement/NFVManoPerformanceManagement.yaml b/src/SOL009/NFVManoPerformanceManagement/NFVManoPerformanceManagement.yaml index bbdc945..14fa052 100644 --- a/src/SOL009/NFVManoPerformanceManagement/NFVManoPerformanceManagement.yaml +++ b/src/SOL009/NFVManoPerformanceManagement/NFVManoPerformanceManagement.yaml @@ -20,8 +20,8 @@ info: version: 2.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 009 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/04.05.01_60/gs_NFV-SOL009v040501p.pdf + description: ETSI GS NFV-SOL 009 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/05.01.01_60/gs_nfv-sol009v050101p.pdf servers: - url: http://127.0.0.1/nfvmanopm/v2 diff --git a/src/SOL009/NFVManoPerformanceManagementNotification/NFVManoPerformanceManagementNotification.yaml b/src/SOL009/NFVManoPerformanceManagementNotification/NFVManoPerformanceManagementNotification.yaml index de0ce47..4ba7d5f 100644 --- a/src/SOL009/NFVManoPerformanceManagementNotification/NFVManoPerformanceManagementNotification.yaml +++ b/src/SOL009/NFVManoPerformanceManagementNotification/NFVManoPerformanceManagementNotification.yaml @@ -19,8 +19,9 @@ info: version: 2.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 009 V4.5.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/04.05.01_60/gs_NFV-SOL009v040501p.pdf + description: ETSI GS NFV-SOL 009 V5.1.1 + url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/05.01.01_60/gs_nfv-sol009v050101p.pdf + servers: - url: http://127.0.0.1/callback/v2 - url: https://127.0.0.1/callback/v2 -- GitLab From b77944e869e49144689eb682299aefc608d0bfdd Mon Sep 17 00:00:00 2001 From: "p.piscione" Date: Fri, 30 Aug 2024 08:53:14 +0000 Subject: [PATCH 2/2] Fixed issue #5 --- .../NFVManoConfigurationAndInformationManagement_def.yaml | 4 ++-- ...ManoConfigurationAndInformationManagementNotification.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SOL009/NFVManoConfigurationAndInformationManagement/definitions/NFVManoConfigurationAndInformationManagement_def.yaml b/src/SOL009/NFVManoConfigurationAndInformationManagement/definitions/NFVManoConfigurationAndInformationManagement_def.yaml index 8bbefd3..e009764 100644 --- a/src/SOL009/NFVManoConfigurationAndInformationManagement/definitions/NFVManoConfigurationAndInformationManagement_def.yaml +++ b/src/SOL009/NFVManoConfigurationAndInformationManagement/definitions/NFVManoConfigurationAndInformationManagement_def.yaml @@ -1062,7 +1062,7 @@ definitions: This type represents information attributes specific to an NFVO entity, and that can be relevant to more than one NFV-MANO service offered by an NFVO entity. * NOTE 1: The information to be provided in this attribute shall relate to the specification and version - of the specification. For instance, "ETSI GS NFV-SOL 001 (V5.5.1)". + of the specification. For instance, "ETSI GS NFV-SOL 001 (V2.5.1)". NOTE 2: If this attribute is not present, the value of this parameter is undefined. type: object required: @@ -1147,7 +1147,7 @@ definitions: This type represents information attributes specific to a VNFM entity, and that can be relevant to more than one NFV-MANO service offered by a VNFM entity. * NOTE: The information to be provided in this attribute shall relate to the specification and version - of the specification. For instance, "ETSI GS NFV-SOL 001 (V2.5.1)". + of the specification. For instance, "ETSI GS NFV-SOL 001 (V5.5.1)". type: object required: - resoruceMgmtModeSupport diff --git a/src/SOL009/NFVManoConfigurationAndInformationManagementNotification/NFVManoConfigurationAndInformationManagementNotification.yaml b/src/SOL009/NFVManoConfigurationAndInformationManagementNotification/NFVManoConfigurationAndInformationManagementNotification.yaml index 5e69d0c..adfcb39 100644 --- a/src/SOL009/NFVManoConfigurationAndInformationManagementNotification/NFVManoConfigurationAndInformationManagementNotification.yaml +++ b/src/SOL009/NFVManoConfigurationAndInformationManagementNotification/NFVManoConfigurationAndInformationManagementNotification.yaml @@ -16,7 +16,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.1.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 009 V5.1.1 -- GitLab