Commit 095ee79e authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

Merge branch '2.7.1-maintenance' into '2.8.1-dev'

2.7.1 maintenance into 2.8.1 dev

See merge request !16
parents 7c48f6c5 41634468
Pipeline #5604 passed with stage
in 0 seconds
swagger: "2.0" swagger: "2.0"
info: info:
version: "1.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1" version: "1.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:2"
title: "SOL005 - NS Lifecycle Management Interface" title: "SOL005 - NS Lifecycle Management Interface"
description: > description: >
SOL005 - NS Lifecycle Management Interface SOL005 - NS Lifecycle Management Interface
......
...@@ -759,9 +759,7 @@ definitions: ...@@ -759,9 +759,7 @@ definitions:
Identifiers of the CP instances attached to the Identifiers of the CP instances attached to the
constituent VNFs and PNFs or the SAP instances of the constituent VNFs and PNFs or the SAP instances of the
VNFFG. See note. VNFFG. See note.
type: array $ref: "#/definitions/NsCpHandle"
items:
$ref: "#/definitions/NsCpHandle"
NfpInfo: NfpInfo:
description: > description: >
...@@ -800,7 +798,7 @@ definitions: ...@@ -800,7 +798,7 @@ definitions:
type: array type: array
minItems: 1 minItems: 1
items: items:
$ref: "#/definitions/NsCpHandle" $ref: "#/definitions/CpGroupInfo"
totalCp: totalCp:
description: > description: >
Total number of CP and SAP instances in this NFP instance. Total number of CP and SAP instances in this NFP instance.
...@@ -1588,9 +1586,7 @@ definitions: ...@@ -1588,9 +1586,7 @@ definitions:
sapInfo item in the NS instance. sapInfo item in the NS instance.
There shall be at most one link port associated with any There shall be at most one link port associated with any
connection point instance. connection point instance.
type: array $ref: "#/definitions/NsCpHandle"
items:
$ref: "#/definitions/NsCpHandle"
AffinityOrAntiAffinityRule: AffinityOrAntiAffinityRule:
description: > description: >
...@@ -2825,58 +2821,6 @@ definitions: ...@@ -2825,58 +2821,6 @@ definitions:
items: items:
$ref: "#/definitions/PnfExtCpData" $ref: "#/definitions/PnfExtCpData"
AffectedVirtualLink:
description: >
This type provides information about added, deleted, modified and
temporary VLs.
type: object
required:
- id
- virtualLinkDescId
- changeType
- networkResource
properties:
id:
description: >
Identifier of the virtual link instance, identifying the applicable
"vnfVirtualLinkResourceInfo" entry in the "VnfInstance" data type.
$ref: "#/definitions/IdentifierInVnf"
virtualLinkDescId:
description: >
Identifier of the related VLD in the VNFD.
$ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
changeType:
description: >
Signals the type of change. Permitted values:
* ADDED
* REMOVED
* MODIFIED
* TEMPORARY
* LINK_PORT_ADDED
* LINK_PORT_REMOVED
For a temporary resource, an AffectedVirtualLink structure exists as
long as the temporary resource exists.
type: string
enum:
- ADDED
- REMOVED
- MODIFIED
- TEMPORARY
- LINK_PORT_ADDED
- LINK_PORT_REMOVED
networkResource:
description: >
Reference to the VirtualNetwork resource. Detailed information is
(for new and modified resources) or has been (for removed
resources) available from the VIM.
$ref: "../../definitions/SOL005_def.yaml#/definitions/ResourceHandle"
metadata:
description: >
Metadata about this resource.
The content of this attribute shall be a copy of the content of the
"metadata" attribute of the VnfVirtualLinkResourceInfo structure.
$ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs"
AffectedVirtualStorage: AffectedVirtualStorage:
description: > description: >
This type provides information about added, deleted, modified and This type provides information about added, deleted, modified and
...@@ -3076,7 +3020,7 @@ definitions: ...@@ -3076,7 +3020,7 @@ definitions:
- ROLLED_BACK - ROLLED_BACK
- FAILED - FAILED
AffectedVl: AffectedVirtualLink:
description: > description: >
This type provides information about added, deleted and modified VLs. This type provides information about added, deleted and modified VLs.
It shall comply with the provisions in Table 6.5.3.4-1. It shall comply with the provisions in Table 6.5.3.4-1.
......
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