Commit 38a49355 authored by Francesca Moscatelli's avatar Francesca Moscatelli
Browse files

SOL005 attributes interdependencies

parent 5407809e
Pipeline #3801 failed with stage
in 0 seconds
...@@ -9,6 +9,11 @@ definitions: ...@@ -9,6 +9,11 @@ definitions:
NS. It shall comply with the provisions defined in Table 6.5.2.13-1. NS. It shall comply with the provisions defined in Table 6.5.2.13-1.
Either the parameter healNsData or the parameter healVnfData, but not both shall be provided. Either the parameter healNsData or the parameter healVnfData, but not both shall be provided.
type: object type: object
oneOf:
- required:
- healNsData
- required:
- healVnfData
properties: properties:
healNsData: healNsData:
description: > description: >
...@@ -41,6 +46,11 @@ definitions: ...@@ -41,6 +46,11 @@ definitions:
type: object type: object
required: required:
- degreeHealing - degreeHealing
oneOf:
- required:
- actionsHealing
- required:
- healScript
properties: properties:
degreeHealing: degreeHealing:
description: > description: >
...@@ -856,6 +866,16 @@ definitions: ...@@ -856,6 +866,16 @@ definitions:
It shall comply with the provisions defined in It shall comply with the provisions defined in
Table 6.5.3.56-1. Table 6.5.3.56-1.
type: object type: object
oneOf:
- required:
- vnfInstanceId
- vnfExtCpInstanceId
- required:
- pnfInfoId
- pnfExtCpInstanceId
- required:
- nsInstanceId
- nsSapInstanceId
properties: properties:
vnfInstanceId: vnfInstanceId:
description: > description: >
...@@ -986,6 +1006,9 @@ definitions: ...@@ -986,6 +1006,9 @@ definitions:
required: required:
- id - id
- cpdId - cpdId
oneOf:
- associatedVnfcCpId
- associatedVnfVirtualLinkId
properties: properties:
id: id:
description: > description: >
...@@ -1174,9 +1197,11 @@ definitions: ...@@ -1174,9 +1197,11 @@ definitions:
This type represents information about a network address that has been assigned. This type represents information about a network address that has been assigned.
It shall comply with the provisions defined in Table 6.5.3.18-1. It shall comply with the provisions defined in Table 6.5.3.18-1.
type: object type: object
required: anyOf:
- macAddress - required:
- ipAddresses - macAddress
- required:
- ipAddresses
properties: properties:
macAddress: macAddress:
description: > description: >
...@@ -1203,6 +1228,11 @@ definitions: ...@@ -1203,6 +1228,11 @@ definitions:
type: object type: object
required: required:
- type - type
oneOf:
- required:
- addresses
- required:
- addressRange
properties: properties:
type: type:
description: > description: >
...@@ -2085,6 +2115,11 @@ definitions: ...@@ -2085,6 +2115,11 @@ definitions:
type: object type: object
required: required:
- scaleType - scaleType
oneOf:
- required:
- scaleNsData
- required:
- scaleVnfData
properties: properties:
scaleType: scaleType:
description: > description: >
...@@ -2844,6 +2879,29 @@ definitions: ...@@ -2844,6 +2879,29 @@ definitions:
it is met only if all the values expressed in the condition are matched it is met only if all the values expressed in the condition are matched
by those in the packet. It shall comply with the provisions defined in Table 6.5.3.40-1. by those in the packet. It shall comply with the provisions defined in Table 6.5.3.40-1.
type: object type: object
anyOf:
- required:
- etherDestinationAddress
- required:
- etherSourceAddress
- required:
- etherType
- required:
- vlanTag
- required:
- protocol
- required:
- dscp
- required:
- sourcePortRange
- required:
- destinationPortRange
- required:
- sourceIpAddressPrefix
- required:
- destinationIpAddressPrefix
- required:
- extendedCriteria
properties: properties:
etherDestinationAddress: etherDestinationAddress:
description: > description: >
...@@ -3001,6 +3059,11 @@ definitions: ...@@ -3001,6 +3059,11 @@ definitions:
type: object type: object
required: required:
- pnfId - pnfId
anyOf:
- required:
- pnfName
- required:
- cpData
properties: properties:
pnfId: pnfId:
description: > description: >
...@@ -3138,6 +3201,14 @@ definitions: ...@@ -3138,6 +3201,14 @@ definitions:
- vnfName - vnfName
- changeType - changeType
- changeResult - changeResult
anyOf:
- required:
- changedExtConnectivity
- oneOf:
- required:
- changedVnfInfo
- required:
- modificationsTriggeredByVnfPkgChange
properties: properties:
vnfInstanceId: vnfInstanceId:
description: > description: >
...@@ -3790,6 +3861,11 @@ definitions: ...@@ -3790,6 +3861,11 @@ definitions:
required: required:
- vnfInstanceid - vnfInstanceid
- scaleVnfType - scaleVnfType
oneOf:
- required:
- scaleToLevelData
- required:
- scaleByStepData
properties: properties:
vnfInstanceId: vnfInstanceId:
description: > description: >
...@@ -3858,6 +3934,11 @@ definitions: ...@@ -3858,6 +3934,11 @@ definitions:
instantiation levels, the NS scaling aspects and their corresponding NS scale levels applicable to the NS instance are instantiation levels, the NS scaling aspects and their corresponding NS scale levels applicable to the NS instance are
declared in the NSD. declared in the NSD.
type: object type: object
oneOf:
- required:
- nsInstantiationLevel
- required:
- nsScaleInfo
properties: properties:
nsInstantiationLevel: nsInstantiationLevel:
description: > description: >
...@@ -3879,6 +3960,11 @@ definitions: ...@@ -3879,6 +3960,11 @@ definitions:
DF. Instantiation levels and scaling aspects are declared in the VNFD. The NFVO shall then invoke the DF. Instantiation levels and scaling aspects are declared in the VNFD. The NFVO shall then invoke the
ScaleVnfToLevel operation towards the appropriate VNFM.. ScaleVnfToLevel operation towards the appropriate VNFM..
type: object type: object
anyOf:
- required:
- vnfInstantiationLevelId
- required:
- vnfScaleInfo
properties: properties:
vnfInstantiationLevelId: vnfInstantiationLevelId:
description: > description: >
...@@ -4251,6 +4337,11 @@ definitions: ...@@ -4251,6 +4337,11 @@ definitions:
description: > description: >
This type represents network address data for IP over Ethernet. This type represents network address data for IP over Ethernet.
type: object type: object
anyOf:
- required:
- ipAddresses
- required:
- macAddress
properties: properties:
macAddress: macAddress:
description: > description: >
...@@ -4278,6 +4369,13 @@ definitions: ...@@ -4278,6 +4369,13 @@ definitions:
type: object type: object
required: required:
- type - type
oneOf:
- required:
- fixedAddresses
- required:
- numDynamicAddresses
- required:
- addressRange
properties: properties:
type: type:
description: > description: >
...@@ -5091,6 +5189,13 @@ definitions: ...@@ -5091,6 +5189,13 @@ definitions:
e.g., when the VL is deployed on several sites and across a WAN. It shall comply with the provisions defined in e.g., when the VL is deployed on several sites and across a WAN. It shall comply with the provisions defined in
table 6.5.3.81-1. table 6.5.3.81-1.
type: object type: object
anyOf:
- required:
- mscsInfo
- required:
- connectivityServiceEndpointConfigDatas
- required:
- mscsConfigData
properties: properties:
mscsInfo: mscsInfo:
description: > description: >
...@@ -5402,6 +5507,11 @@ definitions: ...@@ -5402,6 +5507,11 @@ definitions:
Information related to the forwarding of the VN in the NFVI-PoP to the connectivity service endpoint, Information related to the forwarding of the VN in the NFVI-PoP to the connectivity service endpoint,
if information about the VN to "stitch" is already known. if information about the VN to "stitch" is already known.
type: object type: object
oneOf:
- required:
- networkResources
- required:
- vnSegmentIds
properties: properties:
networkResources: networkResources:
description: > description: >
......
...@@ -433,11 +433,17 @@ definitions: ...@@ -433,11 +433,17 @@ definitions:
$ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs" $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs"
description: > description: >
IndividualVNF package resource creation parameters, as defined IndividualVNF package resource creation parameters, as defined
in clause 9.5.2.2. in clause 9.5.2.2.
VnfPkgInfoModifications: VnfPkgInfoModifications:
description: > description: >
This type represents modifications to the information of a VNF package. This type represents modifications to the information of a VNF package.
It shall comply with the provisions defined in Table 9.5.2.3-1. It shall comply with the provisions defined in Table 9.5.2.3-1.
anyOf:
- required:
- operationalState
- required:
- userDefinedData
properties: properties:
operationalState: operationalState:
description: > description: >
...@@ -614,12 +620,19 @@ definitions: ...@@ -614,12 +620,19 @@ definitions:
type: object type: object
required: required:
- vnfProvider - vnfProvider
oneOf:
- required:
- vnfProductsFromProviders
- required:
- vnfdId
- required:
- vnfPkgId
properties: properties:
vnfProvider: vnfProvider:
description: > description: >
Name of the VNFprovider to match. Name of the VNFprovider to match.
type: string type: string
vnfProducts: vnfProductsFromProviders:
description: > description: >
If present, match VNF packages that contain If present, match VNF packages that contain
VNF products with certain product names, from VNF products with certain product names, from
......
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