SOL005 attributes interdependencies

src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml

@@ -9,6 +9,11 @@ definitions:
       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.
     type: object
+    oneOf:
+      - required:
+          - healNsData
+      - required:
+          - healVnfData
     properties:
       healNsData:
         description: >
@@ -41,6 +46,11 @@ definitions:
     type: object
     required:
       - degreeHealing
+    oneOf:
+      - required:
+          - actionsHealing
+      - required:
+          - healScript
     properties:
       degreeHealing:
         description: >
@@ -856,6 +866,16 @@ definitions:
       It shall comply with the provisions defined in
       Table 6.5.3.56-1.
     type: object
+    oneOf:
+      - required:
+          - vnfInstanceId
+          - vnfExtCpInstanceId
+      - required:
+          - pnfInfoId
+          - pnfExtCpInstanceId
+      - required:
+          - nsInstanceId
+          - nsSapInstanceId
     properties:
       vnfInstanceId:
         description: >
@@ -986,6 +1006,9 @@ definitions:
     required:
       - id
       - cpdId
+    oneOf:
+      - associatedVnfcCpId
+      - associatedVnfVirtualLinkId
     properties:
       id:
         description: >
@@ -1174,9 +1197,11 @@ definitions:
       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.
     type: object
-    required:
-      - macAddress
-      - ipAddresses
+    anyOf:
+      - required:
+        - macAddress
+      - required:
+        - ipAddresses
     properties:
       macAddress:
         description: >
@@ -1203,6 +1228,11 @@ definitions:
           type: object
           required:
             - type
+          oneOf:
+            - required:
+                - addresses
+            - required:
+                - addressRange
           properties:
             type:
               description: >
@@ -2085,6 +2115,11 @@ definitions:
     type: object
     required:
       - scaleType
+    oneOf:
+      - required:
+          - scaleNsData
+      - required:
+          - scaleVnfData
     properties:
       scaleType:
         description: >
@@ -2844,6 +2879,29 @@ definitions:
       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.
     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:
       etherDestinationAddress:
         description: >
@@ -3001,6 +3059,11 @@ definitions:
     type: object
     required:
       - pnfId
+    anyOf:
+      - required:
+          - pnfName
+      - required:
+          - cpData
     properties:
       pnfId:
         description: >
@@ -3138,6 +3201,14 @@ definitions:
       - vnfName
       - changeType
       - changeResult
+    anyOf:
+      - required:
+          - changedExtConnectivity
+      - oneOf:
+          - required:
+              - changedVnfInfo
+          - required:
+              - modificationsTriggeredByVnfPkgChange
     properties:
       vnfInstanceId:
         description: >
@@ -3790,6 +3861,11 @@ definitions:
     required:
       - vnfInstanceid
       - scaleVnfType
+    oneOf:
+      - required:
+          - scaleToLevelData
+      - required:
+          - scaleByStepData
     properties:
       vnfInstanceId:
         description: >
@@ -3858,6 +3934,11 @@ definitions:
       instantiation levels, the NS scaling aspects and their corresponding NS scale levels applicable to the NS instance are
       declared in the NSD.
     type: object
+    oneOf:
+      - required:
+          - nsInstantiationLevel
+      - required:
+          - nsScaleInfo
     properties:
       nsInstantiationLevel:
         description: >
@@ -3879,6 +3960,11 @@ definitions:
       DF. Instantiation levels and scaling aspects are declared in the VNFD. The NFVO shall then invoke the
       ScaleVnfToLevel operation towards the appropriate VNFM..
     type: object
+    anyOf:
+      - required:
+          - vnfInstantiationLevelId
+      - required:
+          - vnfScaleInfo
     properties:
       vnfInstantiationLevelId:
         description: >
@@ -4251,6 +4337,11 @@ definitions:
     description: >
       This type represents network address data for IP over Ethernet.
     type: object
+    anyOf:
+      - required:
+          - ipAddresses
+      - required:
+          - macAddress
     properties:
       macAddress:
         description: >
@@ -4278,6 +4369,13 @@ definitions:
           type: object
           required:
             - type
+          oneOf:
+            - required:
+                - fixedAddresses
+            - required:
+                - numDynamicAddresses
+            - required:
+                - addressRange
           properties:
             type:
               description: >
@@ -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
       table 6.5.3.81-1.
     type: object
+    anyOf:
+      - required:
+          - mscsInfo
+      - required:
+          - connectivityServiceEndpointConfigDatas
+      - required:
+          - mscsConfigData
     properties:
       mscsInfo:
         description: >
@@ -5402,6 +5507,11 @@ definitions:
           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.
         type: object
+        oneOf:
+          - required:
+              - networkResources
+          - required:
+              - vnSegmentIds
         properties:
           networkResources:
             description: >

src/SOL005/VNFPackageManagement/definitions/SOL005VNFPackageManagement_def.yaml

@@ -433,11 +433,17 @@ definitions:
         $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs"
     description: >
       IndividualVNF package resource creation parameters, as defined
-      in clause 9.5.2.2.      
+      in clause 9.5.2.2.
+
   VnfPkgInfoModifications:
     description: >
       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.
+    anyOf:
+      - required:
+          - operationalState
+      - required:
+          - userDefinedData
     properties:
       operationalState:
         description: >
@@ -614,12 +620,19 @@ definitions:
           type: object
           required:
             - vnfProvider
+          oneOf:
+            - required:
+                - vnfProductsFromProviders
+            - required:
+                - vnfdId
+            - required:
+                - vnfPkgId
           properties:
             vnfProvider:
               description: >
                 Name of the VNFprovider to match.
               type: string
-            vnfProducts:
+            vnfProductsFromProviders:
               description: >
                 If present, match VNF packages that contain
                 VNF products with certain product names, from