Skip to content
GitLab
Commit bf7a57a4 authored by Michele Carignani's avatar Michele Carignani
Browse files

Merge branch '2.5.1-dev'

parents 128062fc d6f174f1
Pipeline #2650 passed with stage
in 0 seconds
Expand all Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ bf7a57a4
build/ build/
*.pyc *.pyc
src/SOL002/APIVersion/APIVersion.yaml 0 → 100644
View file @ bf7a57a4
swagger: "2.0"
info:
version: "1.2.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
title: SOL002 - API version interface
description: >
SOL002 - API version Interface
IMPORTANT: Please note that this file might be not aligned to the current
version of the ETSI Group Specification it refers to and has not been
approved by the ETSI NFV ISG. In case of discrepancies the published ETSI
Group Specification takes precedence.
Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
license:
name: ETSI Forge copyright notice
url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
contact:
name: NFV-SOL WG
externalDocs:
description: ETSI GS NFV-SOL 002 V2.5.1
url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.05.01_60/gs_nfv-sol002v020501p.pdf
schemes:
- http
- https
consumes:
- application/json
produces:
- application/json
paths:
###############################################################################
# API Versions #
###############################################################################
'/vnfconfig/api-versions':
$ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
'/vnffm/api-versions':
$ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
'/vnfind/api-versions':
$ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
'/vnflcm/api-versions':
$ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
'/vnfpm/api-versions':
$ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
\ No newline at end of file
src/SOL002/VNFConfiguration/VNFConfiguration.yaml
View file @ bf7a57a4
swagger: "2.0" swagger: "2.0"
info: info:
version: "1.1.0" version: "1.2.0-impl:etsi.org:ETSI_NFV_OpenAPI:1"
title: SOL002 - VNF Configuration interface title: SOL002 - VNF Configuration interface
description: > description: >
VNF Configuration interface of ETSI NFV SOL002 SOL002 - VNF Configuration Interface
IMPORTANT: Please note that this file might be not aligned to the current IMPORTANT: Please note that this file might be not aligned to the current
version of the ETSI Group Specification it refers to. In case of version of the ETSI Group Specification it refers to and has not been
discrepancies the published ETSI Group Specification takes precedence. approved by the ETSI NFV ISG. In case of discrepancies the published ETSI
Group Specification takes precedence.
Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=---
license: license:
name: "ETSI Forge copyright notice" name: ETSI Forge copyright notice
url: https://forge.etsi.org/etsi-forge-copyright-notice.txt url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
contact:
name: NFV-SOL WG
externalDocs: externalDocs:
description: ETSI GS NFV-SOL 002 V2.4.1 description: ETSI GS NFV-SOL 002 V2.5.1
url: http://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.04.01_60/gs_NFV-SOL002v020401p.pdf url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/02.05.01_60/gs_nfv-sol002v020501p.pdf
basePath: /vnfconfig/v1 basePath: /vnfconfig/v1
schemes: schemes:
- http - http
- https - https
consumes: consumes:
- application/json - application/json
produces: produces:
- application/json - application/json
paths: paths:
############################################################################### ###############################################################################
# Configuration # # API Versions #
############################################################################### ###############################################################################
/configuration: '/api-versions':
#SOL002 location: 9.4.2 $ref: '../../endpoints/SOL002SOL003_endpoints.yaml#/endpoints/api-versions'
get:
summary: Read VNF/VNFC configuration from VNF. ###############################################################################
# VNF Configuration #
###############################################################################
'/configuration':
parameters:
- name: Version
description: >
Version of the API requested to use when responding to this request.
in: header
required: true
type: string
- name: Authorization
description: > description: >
The client can use this method to read configuration information about a VNF instance and/or its VNFC instances. The authorization token for the request.
responses: Reference: IETF RFC 7235
200: in: header
description: > required: false
OK type: string
get:
Configuration information about a VNF instance was read successfully. summary: Read VNF/VNFC configuration from VNF
The response body shall contain a representation of the configuration resource. description: >
schema: The client can use this method to read configuration information about a VNF instance and/or its VNFC instances.
$ref: '#/definitions/VnfConfiguration' responses:
400: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/400' } 200:
401: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/401' } description: >
403: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/403' } 200 OK
404: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/404' } Configuration information about a VNF instance was read successfully.
405: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/405' } The response body shall contain a representation of the configuration resource.
406: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/406' } schema:
409: { $ref: 'responses/VNFConfiguration_resp.yaml#/responses/409' } $ref: 'definitions/SOL002VNFConfiguration_def.yaml#/definitions/VnfConfiguration'
416: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/416' } headers:
422: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/422' } Content-Type:
500: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/500' } description: The MIME type of the body of the response.
503: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/503' } type: string
patch: maximum: 1
summary: Modify VNF/VNFC configuration. minimum: 1
description: This method sets or modifies a configuration resource. Version:
parameters: description: The used API version.
- name: configModifications type: string
description: The parameter for the configuration modification. maximum: 1
required: true minimum: 1
in: body WWW-Authenticate:
schema: description: >
$ref: '#/definitions/VnfConfigModifications' Challenge if the corresponding HTTP request has not provided
responses: authorization, or error details if the corresponding HTTP
200: request has provided an invalid authorization token.
description: > type: string
OK maximum: 1
minimum: 0
400:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"
401:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/401"
403:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/403"
404:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/404"
405:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/405"
406:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/406"
416:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/416"
422:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/422"
429:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/429"
500:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500"
503:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
504:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/504"
patch:
summary: Modify VNF/VNFC configuration.
description: This method sets or modifies a configuration resource.
parameters:
- name: configModifications
description: >
The parameter for the configuration modification, as defined in
clause 9.5.2.2.
required: true
in: body
schema:
$ref: 'definitions/SOL002VnfConfiguration_def.yaml#/definitions/VnfConfigModifications'
responses:
200:
description: >
200 OK
The request was accepted and completed. The response body shall contain the parameters The request was accepted and completed. The response body shall contain the parameters
of the configuration modification that was applied to the configuration resource. of the configuration modification that was applied to the configuration resource.
schema: schema:
$ref: '#/definitions/VnfConfigModifications' $ref: 'definitions/SOL002VnfConfiguration_def.yaml#/definitions/VnfConfigModifications'
412: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/412' } headers:
400: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/400' } Content-Type:
401: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/401' } description: The MIME type of the body of the response.
403: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/403' } type: string
404: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/404' } maximum: 1
405: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/405' } minimum: 1
406: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/406' } Version:
409: { $ref: 'responses/VNFConfiguration_resp.yaml#/responses/409' } description: The used API version.
416: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/416' } type: string
422: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/422' } maximum: 1
500: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/500' } minimum: 1
503: { $ref: '../../responses/SOL002SOL003_resp.yaml#/responses/503' } 400:
definitions: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"
VnfConfiguration: 401:
$ref: 'definitions/VnfConfiguration_def.yaml#/definitions/VnfConfiguration' $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/401"
VnfConfigModifications: 403:
$ref: 'definitions/VnfConfiguration_def.yaml#/definitions/VnfConfigModifications' $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/403"
404:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/404"
405:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/405"
406:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/406"
412:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/412"
416:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/416"
422:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/422"
429:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/429"
500:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500"
503:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
504:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/504"
\ No newline at end of file
src/SOL002/VNFConfiguration/definitions/VnfConfiguration_def.yaml → src/SOL002/VNFConfiguration/definitions/SOL002VNFConfiguration_def.yaml
View file @ bf7a57a4
definitions: # Copyright (c) ETSI 2017.
# https://forge.etsi.org/etsi-forge-copyright-notice.txt
VnfConfiguration:
description: >
This type represents configuration parameters of a VNF instance and its VNFC instances.
type: object
required:
- vnfConfigurationData
properties:
vnfConfigurationData:
description: >
Configuration parameters of the VNF instance.
$ref: '#/definitions/VnfConfigurationData'
vnfcConfigurationData:
description: >
Configuration parameters of the VNFC instances.
type: array
items:
$ref: '#/definitions/VnfcConfigurationData'
definitions:
VnfConfigModifications: VnfConfigModifications:
description: > description: >
This type represents request parameters for the "Set Configuration" operation. This type represents request parameters for the "Set Configuration" operation.
...@@ -33,33 +16,57 @@ definitions: ...@@ -33,33 +16,57 @@ definitions:
Modifications to configuration data for the VNF instance. See NOTE 1. Modifications to configuration data for the VNF instance. See NOTE 1.
If present, the modifications of the "vnfConfigurationData" attribute shall If present, the modifications of the "vnfConfigurationData" attribute shall
be applied according to the rules of JSON Merge PATCH (see IETF RFC 7396). be applied according to the rules of JSON Merge PATCH (see IETF RFC 7396).
$ref: '#/definitions/VnfConfigurationData' $ref: '#/definitions/VnfConfigurationData'
vnfcConfigurationData: vnfcConfigurationData:
description: > description: >
Modifications to configuration data for certain VNFC instances. See NOTE 1 and NOTE 2. Modifications to configuration data for certain VNFC instances. See NOTE 1 and NOTE 2.
If present, the modifications of the "vnfcConfigurationData" attribute shall follow these If present, the modifications of the "vnfcConfigurationData" attribute shall follow these
provisions: provisions:
Modifying an attribute that is an array of objects of type "VnfcConfigurationData". Modifying an attribute that is an array of objects of type "VnfcConfigurationData".
Assumptions: Assumptions:
1) "oldList" is the "VnfcConfigurationData" array to be modified and "newList" 1) "oldList" is the "VnfcConfigurationData" array to be modified and "newList"
is the "VnfcConfigurationData" array that contains the changes. is the "VnfcConfigurationData" array that contains the changes.
2) "oldEntry" is an entry in "oldList" and "newEntry" is an entry in "newList". 2) "oldEntry" is an entry in "oldList" and "newEntry" is an entry in "newList".
3) A "newEntry" has a "corresponding entry" if there exists an "oldEntry" that 3) A "newEntry" has a "corresponding entry" if there exists an "oldEntry" that
has the same content of the "vnfcInstanceId" attribute as the "newEntry"; has the same content of the "vnfcInstanceId" attribute as the "newEntry";
a "newEntry" has no corresponding entry if no such "oldEntry" exists. a "newEntry" has no corresponding entry if no such "oldEntry" exists.
4) In any array of "VnfcConfigurationData" structures, the content of "vnfcInstanceId" 4) In any array of "VnfcConfigurationData" structures, the content of "vnfcInstanceId"
is unique (i.e. there shall be no two entries with the same content of "vnfcInstanceId"). is unique (i.e. there shall be no two entries with the same content of "vnfcInstanceId").
Provisions: Provisions:
1) For each "newEntry" in "newList" that has no corresponding entry in "oldList", 1) For each "newEntry" in "newList" that has no corresponding entry in "oldList",
the "oldList" array shall be modified by adding that "newEntry". the "oldList" array shall be modified by adding that "newEntry".
2) For each "newEntry" in "newList" that has a corresponding "oldEntry" in "oldList", 2) For each "newEntry" in "newList" that has a corresponding "oldEntry" in "oldList",
the value of "oldEntry" shall be updated with the value of "newEntry" according to the value of "oldEntry" shall be updated with the value of "newEntry" according to
the rules of JSON Merge PATCH (see IETF RFC 7396 ). the rules of JSON Merge PATCH (see IETF RFC 7396 ).
type: array type: array
items: items:
$ref: '#/definitions/VnfcConfigurationData' $ref: '#/definitions/VnfcConfigurationData'
vnfcConfigurationDataDeleteIds:
description: >
List of identifiers entries to be deleted from the 'vnfcConfigurationData" attribute array to be used
as "deleteIdList" as defined below this table.
type: array
items:
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
VnfConfiguration:
description: >
This type represents configuration parameters of a VNF instance and its VNFC instances.
type: object
required:
- vnfConfigurationData
properties:
vnfConfigurationData:
description: >
Configuration parameters of the VNF instance.
$ref: '#/definitions/VnfConfigurationData'
vnfcConfigurationData:
description: >
Configuration parameters of the VNFC instances.
type: array
items:
$ref: '#/definitions/VnfcConfigurationData'
VnfConfigurationData: VnfConfigurationData:
description: > description: >
...@@ -69,18 +76,17 @@ definitions: ...@@ -69,18 +76,17 @@ definitions:
extCpConfig: extCpConfig:
description: > description: >
Configuration parameters for the external CPs of the VNF instance. Configuration parameters for the external CPs of the VNF instance.
$ref: '#/definitions/CpConfiguration' $ref: '#/definitions/CpConfiguration'
dhcpServer: dhcpServer:
description: > description: >
IP address of the DHCP server that the VNF instance can use to obtain IP address of the DHCP server that the VNF instance can use to obtain
IP addresses to be assigned to its external CPs. IP addresses to be assigned to its external CPs.
$ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress' $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress'
vnfSpecificData: vnfSpecificData:
description: > description: >
Additional configurable properties of the VNF instance declared in the Additional configurable properties of the VNF instance declared in the
VNFD as "VnfConfigurableProperties". VNFD as "VnfConfigurableProperties".
$ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs' $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs'
VnfcConfigurationData: VnfcConfigurationData:
description: > description: >
...@@ -92,24 +98,21 @@ definitions: ...@@ -92,24 +98,21 @@ definitions:
vnfcInstanceId: vnfcInstanceId:
description: > description: >
Identifier of a VNFC instance to which this set of configuration data applies. Identifier of a VNFC instance to which this set of configuration data applies.
$ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf' $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf'
intCpConfig: extCpConfig:
description: > description: >
Configuration parameters for the internal CPs of the VNFC instance. Configuration parameters for the external CPs of the VNFC instance.
type: array $ref: '#/definitions/CpConfiguration'
items:
$ref: '#/definitions/CpConfiguration'
dhcpServer: dhcpServer:
description: > description: >
IP address of the DHCP server that the VNF instance can use to obtain IP address of the DHCP server that the VNF instance can use to obtain
IP addresses to be assigned to its external CPs. IP addresses to be assigned to its external CPs.
$ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress' $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress'
vnfcSpecificData: vnfcSpecificData:
description: > description: >
Additional configurable properties of the VNFC instance declared in the Additional configurable properties of the VNFC instance declared in the
VNFD as "VnfcConfigurableProperties". VNFD as "VnfcConfigurableProperties".
$ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs' $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs'
CpConfiguration: CpConfiguration:
description: > description: >
...@@ -123,17 +126,17 @@ definitions: ...@@ -123,17 +126,17 @@ definitions:
cpId: cpId:
description: > description: >
Identifier of a CP instance within the namespace of a specific VNF instance or a VNFC instance. Identifier of a CP instance within the namespace of a specific VNF instance or a VNFC instance.
$ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf' $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf'
cpdId: cpdId:
description: > description: >
Identifier of the CPD in the VNFD. Identifier of the CPD in the VNFD.
$ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd' $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd'
addresses: addresses:
description: > description: >
Network address and port assigned to the CP. Network address and port assigned to the CP.
type: array type: array
items: items:
$ref: '#/definitions/CpAddress' $ref: '#/definitions/CpAddress'
CpAddress: CpAddress:
description: > description: >
...@@ -150,11 +153,11 @@ definitions: ...@@ -150,11 +153,11 @@ definitions:
macAddress: macAddress:
description: > description: >
Mac address. See NOTE 2. Mac address. See NOTE 2.
$ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/MacAddress' $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/MacAddress'
ipAddress: ipAddress:
description: > description: >
IP address. See NOTE 2. IP address. See NOTE 2.
$ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress' $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress'
useDynamicAddress: useDynamicAddress:
description: > description: >
Set to true if an address shall be assigned dynamically. Otherwise set to false. Set to true if an address shall be assigned dynamically. Otherwise set to false.
...@@ -163,8 +166,4 @@ definitions: ...@@ -163,8 +166,4 @@ definitions:
port: port:
description: > description: >
The port assigned to the CP instance (e.g. IP port number, Ethernet port number, etc.). The port assigned to the CP instance (e.g. IP port number, Ethernet port number, etc.).
type: integer type: integer
\ No newline at end of file
src/SOL002/VNFConfiguration/responses/VNFConfiguration_resp.yaml deleted 100644 → 0
View file @ 128062fc
responses:
409:
description: >
Conflict
Another request is in progress that prohibits the fulfilment of
the current request, or the current resource state is inconsistent
with the request.
headers:
Content-Type:
description: The MIME type of the body of the response.
type: string
maximum: 1
minimum: 1
schema:
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails"
src/SOL002/VNFFaultManagement/definitions/VNFFaultManagement_def.yaml → src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml
View file @ bf7a57a4
...@@ -9,6 +9,7 @@ definitions: ...@@ -9,6 +9,7 @@ definitions:
required: required:
- id - id
- managedObjectId - managedObjectId
- vnfcInstanceIds
- rootCauseFaultyResource - rootCauseFaultyResource
- alarmRaisedTime - alarmRaisedTime
- ackState