Commit 25906198 authored by f.moscatelli's avatar f.moscatelli

Modifications according to v030006

parent f74299e8
Pipeline #4512 failed with stage
in 0 seconds
......@@ -958,7 +958,8 @@ paths:
- $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Authorization
post:
description: |
The POST method requests creating a VNF snapshot resource based on a VNF instance resource.
The POST method requests tacking a VNF instance snapshot and populating a previously created VNF snapshot resource
(refer to clause 5.4.23.3.1) with the snapshot content.
requestBody:
$ref: '#/components/requestBodies/VnfInstanceCreateSnapshotRequest'
responses:
......@@ -1038,6 +1039,8 @@ paths:
post:
description: |
The POST method creates a new individual VNF snapshot resource.
requestBody:
$ref: '#/components/requestBodies/VnfSnapshotsRequest'
responses:
"201":
$ref: '#/components/responses/VnfSnapshots.Post'
......@@ -1107,9 +1110,9 @@ paths:
"504":
$ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/504
/vnf_snapshots/{vnfSnapshotId}:
/vnf_snapshots/{vnfSnapshotInfoId}:
parameters:
- $ref: '#/components/parameters/VnfSnapshotId'
- $ref: '#/components/parameters/VnfSnapshotInfoId'
- $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Version
- $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Authorization
get:
......@@ -1218,11 +1221,11 @@ components:
schema:
type: string
VnfSnapshotId:
name: vnfSnapshotId
VnfSnapshotInfoId:
name: vnfSnapshotInfoId
in: path
description: |
Identifier of the individual VNF snapshot. This identifier can be retrieved from the resource referenced by the
Identifier of the individual VNF snapshot resource. This identifier can be retrieved from the resource referenced by the
"Location" HTTP header in the response to a POST request creating a new VNF snapshot resource. It can also be
retrieved from the "id" attribute in the payload body of that response.
required: true
......@@ -1350,6 +1353,15 @@ components:
$ref: ./definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/RevertToVnfSnapshotRequest
required: true
VnfSnapshotsRequest:
description: |
The VNF snapshot resource creation parameters.
content:
application/json:
schema:
$ref: ./definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/CreateVnfSnapshotInfoRequest
required: true
responses:
VnfInstances.Get:
description: |
......@@ -1682,8 +1694,8 @@ components:
description: |
202 ACCEPTED
The request has been accepted for processing. The response body shall be empty. The HTTP response shall include
a "Location" HTTP header that contains the URI of the newly-created "VNF LCM operation occurrence" resource
corresponding to the operation.
a "Location" HTTP header that contains the URI of the newly-created "Individual VNF LCM operation occurrence"
resource corresponding to the operation.
headers:
Version:
description: The used API version.
......@@ -2285,14 +2297,14 @@ components:
content:
application/json:
schema:
$ref: ./definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/VnfSnapshotRes
$ref: ./definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/VnfSnapshotInfo
VnfSnapshots.Get:
description: |
200 OK
Shall be returned when information about zero or more VNF snapshots was queried successfully.
The response body shall contain in an array the representations of zero or more VNF snapshots,
as defined in clause 5.5.2.21.
The response body shall contain in an array the representations of zero or more individual VNF
snapshot resources, as defined in clause 5.5.2.21.
If the VNFM supports alternative 2 (paging) according to clause 5.4.2.1 of ETSI GS NFV-SOL 013
for this resource, inclusion of the Link HTTP header in this response shall follow the provisions
......@@ -2323,12 +2335,12 @@ components:
schema:
type: array
items:
$ref: ./definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/VnfSnapshotRes
$ref: ./definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/VnfSnapshotInfo
IndividualVnfSnapshot.Get:
description: |
Shall be returned when information about an individual VNF snapshot was read successfully.
The response body shall contain a representation of the VNF snapshot.
The response body shall contain a representation of the individual VNF snapshot resource.
headers:
Version:
description: The used API version.
......@@ -2360,7 +2372,7 @@ components:
content:
application/json:
schema:
$ref: ./definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/VnfSnapshotRes
$ref: ./definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/VnfSnapshotInfo
IndividualVnfSnapshot.Delete:
description: |
......
......@@ -329,9 +329,21 @@ definitions:
$ref: "#/definitions/IdentifierInVnfd"
cpConfig:
description: >
List of instance data that need to be configured on the CP instances
Map of instance data that need to be configured on the CP instances
created from the respective CPD.
type: array
The key of the map which identifies the individual VnfExtCpConfig entries is managed by the API consumer.
The entries shall be applied by the VNFM according to the rules of JSON Merge Patch (see IETF RFC 7396).
Within one VNF instance, all VNFC instances created from a particular VDU have the same external connectivity.
Thus, given a particular value of the “cpdId” attribute, there shall be one “cpConfig” entry for each VNFC
instance that has been or can be created from a VDU which includes a CPD identified by the “cpdId” attribute.
If the cpConfig represents a subport in a trunk, all “cpConfig” entries in this list shall have the same
segmentationId, which means they are connected to the same set of external VLs via the trunk.
The map entry value shall be set to "null" in order to delete a "VnfExtCpConfig" entry identified by a
particular key value from the map, i.e. for the disconnection of an existing external CP instance addressed
by cpInstanceId in the deleted map entry from a particular external virtual link, and deletion of that instance
in case it represents a subport. Deleting the last key from the map removes the affected instance of the
"VnfExtCpData" structure from its parent data structure.
type:
items:
$ref: "#/definitions/VnfExtCpConfig"
......@@ -344,45 +356,31 @@ definitions:
shall create a link port on the external VL, and use that link port to
connect the external CP to the external VL.
type: object
required:
- id
properties:
id:
description: >
Identifier of the VnfExtCpConfig entry. Managed by the API consumer.
$ref: "#/definitions/IdentifierInVnf"
parentCpConfigId:
description: >
Reference to the "VnfExtCpConfig" entry that corresponds to the parent port of the trunk. Only present in
"VnfExtCpConfig" structures that provide configuration information for a CP which represents a sub-port in
Value of the key that identifies the "VnfExtCpConfig" map entry which corresponds to the parent port of the
trunk. Reference to the "VnfExtCpConfig" entry that corresponds to the parent port of the trunk. Only present
in "VnfExtCpConfig" structures that provide configuration information for a CP which represents a sub-port in
a trunk, and if parent ports are supported.
$ref: "#/definitions/IdentifierInVnf"
cpInstanceId:
description: >
Identifier of the external CP instance to which this set of
configuration parameters is requested to be applied.
Shall be present if this instance has already been created.
$ref: "#/definitions/IdentifierInVnf"
linkPortId:
description: >
Identifier of a pre-configured link port to which the external CP
will be associated.
The following conditions apply to the attributes "linkPortId" and
"cpProtocolData":
1) The "linkPortId" and "cpProtocolData" attributes shall both be
absent for the deletion of an existing external CP instance
addressed by cpInstanceId.
2) At least one of these attributes shall be present for a
to-be-created external CP instance or an existing external
1) At least one of the "linkPortId" and "cpProtocolData" attributes shall
be present for a to-be-created external CP instance or an existing external
CP instance.
3) If the "linkPortId" attribute is absent, the VNFM shall create a
2) If the "linkPortId" attribute is absent, the VNFM shall create a
link port.
4) If the "cpProtocolData" attribute is absent, the "linkPortId"
3) If the "cpProtocolData" attribute is absent, the "linkPortId"
attribute shall be provided referencing a pre-created link port,
and the VNFM can use means outside the scope of the present
document to obtain the pre-configured address information for the
connection point from the resource representing the link port.
5) If both "cpProtocolData" and "linkportId" are provided, the API
4) If both "cpProtocolData" and "linkportId" are provided, the API
consumer shall ensure that the cpProtocolData can be used with the
pre-created link port referenced by "linkPortId".
$ref: "#/definitions/Identifier"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment