From b4a286cb4ca9eb5a781d125fbbadd231e2a257b9 Mon Sep 17 00:00:00 2001 From: Gabriele Scivoletto Date: Thu, 4 Jan 2024 17:10:45 +0100 Subject: [PATCH] updated SOL009 from v4.4.1 to v4.5.1 --- src/SOL009/APIVersion/APIVersion.yaml | 4 +- ...ConfigurationAndInformationManagement.yaml | 6 +- ...igurationAndInformationManagement_def.yaml | 100 +++++++++++++++++- ...nAndInformationManagementNotification.yaml | 4 +- .../NFVManoFaultManagement.yaml | 4 +- .../NFVManoFaultManagementNotification.yaml | 4 +- .../NFVManoLogManagement.yaml | 4 +- .../NFVManoLogManagementNotification.yaml | 4 +- .../NFVManoPerformanceManagement.yaml | 4 +- ...ManoPerformanceManagementNotification.yaml | 4 +- 10 files changed, 114 insertions(+), 24 deletions(-) diff --git a/src/SOL009/APIVersion/APIVersion.yaml b/src/SOL009/APIVersion/APIVersion.yaml index 68f4216..7e78cd6 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.4.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/04.04.01_60/gs_NFV-SOL009v040401p.pdf + 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 paths: /nfvmanocim/api_versions: diff --git a/src/SOL009/NFVManoConfigurationAndInformationManagement/NFVManoConfigurationAndInformationManagement.yaml b/src/SOL009/NFVManoConfigurationAndInformationManagement/NFVManoConfigurationAndInformationManagement.yaml index f0a9657..8656045 100644 --- a/src/SOL009/NFVManoConfigurationAndInformationManagement/NFVManoConfigurationAndInformationManagement.yaml +++ b/src/SOL009/NFVManoConfigurationAndInformationManagement/NFVManoConfigurationAndInformationManagement.yaml @@ -19,9 +19,9 @@ info: version: 2.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 009 V4.4.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/04.04.01_60/gs_NFV-SOL009v040401p.pdf - + 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 + servers: - url: http://127.0.0.1/nfvmanocim/v2 - url: https://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 60e7306..7d63dd6 100644 --- a/src/SOL009/NFVManoConfigurationAndInformationManagement/definitions/NFVManoConfigurationAndInformationManagement_def.yaml +++ b/src/SOL009/NFVManoConfigurationAndInformationManagement/definitions/NFVManoConfigurationAndInformationManagement_def.yaml @@ -13,6 +13,8 @@ definitions: * NOTE 7: It shall be present when "type" attribute is "CISM", and it shall be absent in any other case. * NOTE 8: It shall be present when "type" attribute is "CIR", and it shall be absent in any other case. * NOTE 9: It shall be present when "type" attribute is "CCM", and it shall be absent in any other case. + * NOTE 10: It shall be present when "type" attribute is "MDAF", and it shall be absent in any other case. + * NOTE 11: It shall be present when "type" attribute is "CMF", and it shall be absent in any other case. type: object required: - id @@ -135,6 +137,10 @@ definitions: description: > The information specific to a CCM entity. See notes 4 and 9. $ref: "#/definitions/schemas/CcmSpecificInfo" + mdafSpecificInfo: + description: > + The information specific to a MDAF entity. See notes 4 and 10. + $ref: "#/definitions/schemas/MdafSpecificInfo" _links: description: > @@ -1062,6 +1068,7 @@ definitions: required: - supportedVnfdFormats - supportedNsdFormats + - certificateManagementMode properties: maxOnboardedNsdNum: description: > @@ -1121,6 +1128,19 @@ definitions: required: - nsdFormat - standardVersion + certificateManagementMode: + description: > + The supported list of VNF certificate management mode. + Permitted Values: + - DELEGATION-MODE: the CMF supports delegation-mode. + - DIRECT-MODE: the CMF supports direct-mode. + type: array + items: + type: string + minItems: 1 + enum: + - DELEGATION-MODE + - DIRECT-MODE VnfmSpecificInfo: description: > @@ -1133,6 +1153,7 @@ definitions: - resoruceMgmtModeSupport - managedVnfInstanceInfos - supportedVnfdFormats + - certificateManagementMode properties: resoruceMgmtModeSupport: description: > @@ -1184,6 +1205,19 @@ definitions: - vnfdFormat - standardVersion minItems: 1 + certificateManagementMode: + description: > + The supported list of VNF certificate management mode. + Permitted Values: + - DELEGATION-MODE: the CMF supports delegation-mode. + - DIRECT-MODE: the CMF supports direct-mode. + type: array + items: + type: string + minItems: 1 + enum: + - DELEGATION-MODE + - DIRECT-MODE VimSpecificInfo: description: > @@ -1381,6 +1415,20 @@ definitions: description: Default value for the log compilation by timer to be used. $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/UnsignedInt" + certificateManagementMode: + description: > + The supported list of VNF certificate management mode. + Permitted Values: + - DELEGATION-MODE: the CMF supports delegation-mode. + - DIRECT-MODE: the CMF supports direct-mode. + + NOTE: This attribute shall not be configured into CMF. + type: array + items: + type: string + enum: + - DELEGATION-MODE + - DIRECT-MODE ConsumedManoInterfaceInfo: description: > @@ -1830,6 +1878,40 @@ definitions: - BARE-METAL-POOLED + MdafSpecificInfo: + description: > + The supported list of data analytics types. Examples include "Network service alarm incident analysis" and others + specified in ETSI GS NFV-IFA 047 [i.30]). + type: object + required: + - dataAnalyticsTypes + properties: + dataAnalyticsTypes: + type: array + minItems: 1 + items: + type: string + + + CmfSpecificInfo: + description: > + The supported list of VNF certificate management mode. + Permitted Values: + - DELEGATION-MODE: the CMF supports delegation-mode. + - DIRECT-MODE: the CMF supports direct mode. + type: object + required: + - certificateManagementMode + properties: + certificateManagementMode: + type: array + minItems: 1 + items: + type: string + enum: + - DELEGATION-MODE + - DIRECT-MODE + #referenced simple data types ManoServiceInterfaceTypeShortName: description: > @@ -1908,10 +1990,10 @@ definitions: "ccmciscpm" Represents the "CIS cluster performance management" service interface produced by a CCM (refer to IFA036). "ccmcisccm" Represents the "CIS cluster configuration management" service interface produced by a CCM (refer to IFA036). "ccmciscsm" Represents the "CIS cluster security management" service interface produced by a CCM (refer to IFA036). - - NOTE: "IFA005", "IFA006", "IFA007", "IFA008", "IFA013", "IFA032", "IFA040" are used as a shorthand for the + "mdafda" Represents the "Data analytics" service interface produced by a MDAF (refer to IFA047). + NOTE: "IFA005", "IFA006", "IFA007", "IFA008", "IFA013", "IFA032", "IFA040", "IFA036", "IFA037" are used as a shorthand for the specifications ETSI GS NFV-IFA 005, ETSI GS NFV-IFA 006, ETSI GS NFV-IFA 007, ETSI GS NFV IFA 008, ETSI GS NFV-IFA 013, - ETSI GS NFV-IFA 032 and ETSI GS NFV-IFA 040, and ETSI GS NFV-IFA 036 respectively. + ETSI GS NFV-IFA 032 and ETSI GS NFV-IFA 040, ETSI GS NFV-IFA 036 and ETSI GS NFV-IFA 047 respectively. type: string UsageStateEnumType: @@ -1991,6 +2073,8 @@ definitions: - CISM The NFV-MANO functional entity is a CISM. - CIR The NFV-MANO functional entity is a CIR. - CCM The NFV-MANO functional entity is a CCM. + - MDAF The NFV-MANO functional entity is a MDAF. + - CMF The NFV-MANO functional entity is a CMF. type: string enum: - NFVO @@ -2000,7 +2084,9 @@ definitions: - CISM - CIR - CCM - + - MDAF + - CMF + PeerEntityEnumType: description: > The enumeration PeerEntityEnumType defines the permitted values @@ -2010,9 +2096,11 @@ definitions: - VNFM The peer functional entity is a VNFM. - VIM The peer functional entity is a VIM. - WIM The peer functional entity is a WIM. - - CISM The peer functional entity is a CISM. + - CISM The peer functional entity is a CISM. - CIR The NFV-MANO functional entity is a CIR. - CCM The NFV-MANO functional entity is a CCM. + - MDAF The peer functional entity is a MDAF. + - CMF The peer functional entity is a CMF. - EM The peer functional entity is an EM. - OSS The peer functional entity is an OSS/BSS. type: string @@ -2024,6 +2112,8 @@ definitions: - CISM - CIR - CCM + - MDAF + - CMF - EM - OSS diff --git a/src/SOL009/NFVManoConfigurationAndInformationManagementNotification/NFVManoConfigurationAndInformationManagementNotification.yaml b/src/SOL009/NFVManoConfigurationAndInformationManagementNotification/NFVManoConfigurationAndInformationManagementNotification.yaml index b335496..d27543f 100644 --- a/src/SOL009/NFVManoConfigurationAndInformationManagementNotification/NFVManoConfigurationAndInformationManagementNotification.yaml +++ b/src/SOL009/NFVManoConfigurationAndInformationManagementNotification/NFVManoConfigurationAndInformationManagementNotification.yaml @@ -19,8 +19,8 @@ info: version: 2.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 009 V4.4.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/04.04.01_60/gs_NFV-SOL009v040401p.pdf + 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 servers: - url: http://127.0.0.1/callback/v2 diff --git a/src/SOL009/NFVManoFaultManagement/NFVManoFaultManagement.yaml b/src/SOL009/NFVManoFaultManagement/NFVManoFaultManagement.yaml index d26dcc0..a906b41 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.4.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/04.04.01_60/gs_NFV-SOL009v040401p.pdf + 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 servers: - url: http://127.0.0.1/nfvmanofm/v1 diff --git a/src/SOL009/NFVManoFaultManagementNotification/NFVManoFaultManagementNotification.yaml b/src/SOL009/NFVManoFaultManagementNotification/NFVManoFaultManagementNotification.yaml index 7953dde..d1eb40f 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.4.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/04.04.01_60/gs_NFV-SOL009v040401p.pdf + 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 servers: - url: http://127.0.0.1/callback/v1 diff --git a/src/SOL009/NFVManoLogManagement/NFVManoLogManagement.yaml b/src/SOL009/NFVManoLogManagement/NFVManoLogManagement.yaml index 0b1ef07..778c150 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.4.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/04.04.01_60/gs_NFV-SOL009v040401p.pdf + 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 servers: - url: http://127.0.0.1/nfvmanologm/v1 diff --git a/src/SOL009/NFVManoLogManagementNotification/NFVManoLogManagementNotification.yaml b/src/SOL009/NFVManoLogManagementNotification/NFVManoLogManagementNotification.yaml index 95fb831..776a7be 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.4.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/04.04.01_60/gs_NFV-SOL009v040401p.pdf + 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 servers: - url: http://127.0.0.1/callback/v1 diff --git a/src/SOL009/NFVManoPerformanceManagement/NFVManoPerformanceManagement.yaml b/src/SOL009/NFVManoPerformanceManagement/NFVManoPerformanceManagement.yaml index 45f6687..bbdc945 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.4.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/04.04.01_60/gs_NFV-SOL009v040401p.pdf + 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 servers: - url: http://127.0.0.1/nfvmanopm/v2 diff --git a/src/SOL009/NFVManoPerformanceManagementNotification/NFVManoPerformanceManagementNotification.yaml b/src/SOL009/NFVManoPerformanceManagementNotification/NFVManoPerformanceManagementNotification.yaml index 5d8faba..de0ce47 100644 --- a/src/SOL009/NFVManoPerformanceManagementNotification/NFVManoPerformanceManagementNotification.yaml +++ b/src/SOL009/NFVManoPerformanceManagementNotification/NFVManoPerformanceManagementNotification.yaml @@ -19,8 +19,8 @@ info: version: 2.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: - description: ETSI GS NFV-SOL 009 V4.4.1 - url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/04.04.01_60/gs_NFV-SOL009v040401p.pdf + 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 servers: - url: http://127.0.0.1/callback/v2 - url: https://127.0.0.1/callback/v2 -- GitLab