SOL002/SOL003 common data types fixed

src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml

@@ -924,14 +924,6 @@ definitions:
           The identifier of the resource in the scope of the VIM or the
           resource provider.
         $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim"
-      vnfLinkPort:
-        description: >
-          Externally provided link ports to be used to connect VNFC connection points to this externally-managed VL
-          on this network resource. If this attribute is not present, the VNFM shall create the link ports on the
-          externally-managed VL.
-        type: array
-        items:
-          $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VnfLinkPortData"
 
   ExtManagedVirtualLinkInfo:
     type: object
@@ -1195,12 +1187,6 @@ definitions:
           (for new and modified resources) or has been (for removed
           resources) available from the VIM.
         $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle"
-      resourceDefinitionId:
-        description: >
-          The identifier of the "ResourceDefinition" in the granting exchange
-          related to the LCM operation occurrence. It shall be present when
-          an applicable GrantInfo for thegranted resource exists. See note.
-        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierLocal"
       metadata:
         description: >
           Metadata about this resource.
@@ -1513,7 +1499,7 @@ definitions:
               received it due to an error or a wrongly configured subscription filter.
             type: array
             items:
-              $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/AffectedExtLinkPort"
+              $ref: "#/definitions/AffectedExtLinkPort"
           affectedVirtualStorages:
             description: >
               Information about virtualised storage instances that were affected
@@ -1531,7 +1517,7 @@ definitions:
           This allows the NFVO to obtain the information contained in the
           latest "result" notification if it has not received it due to an
           error or a wrongly configured subscription filter.
-        $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfInfoModifications"
+        $ref: "#/definitions/VnfInfoModifications"
       changedExtConnectivity:
         description: >
           Information about changed external connectivity, if applicable.
@@ -1602,4 +1588,124 @@ definitions:
             description: >
               Link to the VNF snapshot resource, if the VNF LCM operation occurrence is related to a VNF snapshot.
               Shall be present if operation="CREATE_SNAPSHOT" or operation="REVERT_TO_SNAPSHOT".
-            $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
\ No newline at end of file
+            $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
+
+  AffectedExtLinkPort:
+    description: >
+      This type provides information about added and deleted external link ports (link ports attached to external virtual links).
+    type: object
+    required:
+      - id
+      - changeType
+      - extCpInstanceId
+      - resourceHandle
+    properties:
+      id:
+        description: >
+          Identifier of the link port, identifying the applicable "extLinkPorts" entry in the "ExtVirtualLinkInfo" data
+          type (see clause 5.5.3.2).
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+      changeType:
+        description: >
+          Signals the type of change.
+          Permitted values:
+          -	ADDED
+          -	REMOVED
+        type: string
+        enum:
+          - ADDED
+          - REMOVED
+      extCpInstanceId:
+        description: >
+          Identifier of the related external CP instance.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
+      resourceHandle:
+        description: >
+          Reference to the link port resource.
+          Detailed information is (for added resources) or has been (for removed resources) available from the VIM.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle"
+
+  VnfInfoModifications:
+    description: >
+      This type represents attribute modifications that were performed on an
+      "Individual VNF instance" resource. The attributes that can be included
+      consist of those requested to be modified explicitly in the
+      "VnfInfoModificationRequest" data structure, and additional attributes
+      of the "VnfInstance" data structure that were modified implicitly e.g.
+      when modifying the referenced VNF package.
+    type: object
+    properties:
+      vnfInstanceName:
+        description: >
+          If present, this attribute signals modifications of the
+          "vnfInstanceName" attribute in "VnfInstance".
+        type: string
+      vnfInstanceDescription:
+        description: >
+          If present, this attribute signals modifications of the
+          "vnfInstanceDescription" attribute in "VnfInstance".
+        type: string
+      vnfConfigurableProperties:
+        description: >
+          If present, this attribute signals modifications of the
+          "vnfConfigurableProperties" attribute in "VnfInstance".
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
+      metadata:
+        description: >
+          If present, this attribute signals modifications of the "metadata"
+          attribute in "VnfInstance".
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
+      extensions:
+        description: >
+          If present, this attribute signals modifications of the "extensions"
+          attribute in "VnfInstance".
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
+      vnfdId:
+        description: >
+          If present, this attribute signals modifications of the "vnfdId"
+          attribute in "VnfInstance".
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+      vnfProvider:
+        description: >
+          If present, this attribute signals modifications of the
+          "vnfProvider" attribute in "VnfInstance".
+          If present, this attribute (which depends on the value of the
+          "vnfPkgId" attribute) was modified implicitly following a request to
+          modify the "vnfPkgId" attribute, by copying the value of this
+          attribute from the VNFD in the VNF Package identified by the
+          "vnfPkgId” attribute.
+        type: string
+      vnfProductName:
+        description: >
+          If present, this attribute signals modifications of the
+          "vnfProductName" attribute in "VnfInstance".
+          If present, this attribute (which depends on the value of the
+          "vnfPkgId" attribute) was modified implicitly following a request to
+          modify the "vnfPkgId" attribute, by copying the value of this
+          attribute from the VNFD in the VNF Package identified by the
+          "vnfPkgId” attribute.
+        type: string
+      vnfSoftwareVersion:
+        description: >
+          If present, this attribute signals modifications of the
+          "vnfSoftwareVersion" attribute in "VnfInstance".
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version"
+      vnfdVersion:
+        description: >
+          If present, this attribute signals modifications of the
+          "vnfdVersion" attribute in "VnfInstance".
+          If present, this attribute (which depends on the value of the
+          "vnfdId" attribute) was modified implicitly following a request to
+          modify the "vnfdId" attribute, by copying the value of this
+          attribute from the VNFD in the VNF Package identified by the
+          "vnfdId” attribute.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version"
+      vnfcInfoModifications:
+        description: >
+          If present, this attribute signals modifications of certain
+          entries in the "vnfcInfo" attribute array in the
+          "instantiatedVnfInfo" attribute of "VnfInstance", as defined
+          in clause 5.5.2.12
+        type: array
+        items:
+          $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfcInfoModifications"
\ No newline at end of file

src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml

@@ -428,7 +428,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: "../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/Alarm"
+            $ref: "./definitions/SOL003VNFFaultManagement_def.yaml#/definitions/Alarm"
     
     IndividualAlarm.Get.200:
       description: |
@@ -460,7 +460,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: "../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/Alarm"
+            $ref: "./definitions/SOL003VNFFaultManagement_def.yaml#/definitions/Alarm"
     
     IndividualAlarm.Patch.200:
       description: |

src/SOL003/VNFFaultManagement/definitions/SOL003VNFFaultManagement_def.yaml

+definitions:
+  Alarm:
+    description: >
+      The alarm data type encapsulates information about an alarm.
+    type: object
+    required:
+      - id
+      - managedObjectId
+      - alarmRaisedTime
+      - ackState
+      - perceivedSeverity
+      - eventTime
+      - eventType
+      - probableCause
+      - isRootCause
+      - _links
+    properties:
+      id:
+        description: >
+          Identifier of this Alarm information element.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+      managedObjectId:
+        description: >
+          Identifier of the affected VNF instance.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+      rootCauseFaultyResource:
+        description: >
+          The virtualised resources that are causing the VNF fault.
+          Shall be present if the alarm affects virtualised resources.
+        $ref: "../../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/FaultyResourceInfo"
+      alarmRaisedTime:
+        description: >
+          Time stamp indicating when the alarm is raised by the managed
+          object.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
+      alarmChangedTime:
+        description: >
+          Time stamp indicating when the alarm was last changed. It shall be
+          present if the alarm has been updated.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
+      alarmClearedTime:
+        description: >
+          Time stamp indicating when the alarm was cleared. It shall be
+          present if the alarm has been cleared.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
+      alarmAcknowledgedTime:
+        description: >
+          Time stamp indicating when the alarm was acknowledged.
+          It shall be present if the alarm has been acknowledged.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
+      ackState:
+        description: >
+          Acknowledgement state of the alarm.
+          Permitted values:
+          * UNACKNOWLEDGED
+          * ACKNOWLEDGED.
+        type: string
+        enum:
+          - UNACKNOWLEDGED
+          - ACKNOWLEDGED
+      perceivedSeverity:
+        description: >
+          Perceived severity of the managed object failure.
+        $ref: "../../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/PerceivedSeverityType"
+      eventTime:
+        description: >
+          Time stamp indicating when the fault was observed.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
+      eventType:
+        description: >
+          Type of event.
+        $ref: "../../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/EventType"
+      faultType:
+        description: >
+          Additional information to clarify the type of the fault.
+        type: string
+      probableCause:
+        description: >
+          Information about the probable cause of the fault.
+        type: string
+      isRootCause:
+        description: >
+          Attribute indicating if this fault is the root for other correlated
+          alarms. If true, then the alarms listed in the attribute
+          "correlatedAlarmIds" are caused by this fault.
+        type: boolean
+      correlatedAlarmIds:
+        description: >
+          List of identifiers of other alarms correlated to this fault.
+        type: array
+        items:
+          $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+      faultDetails:
+        description: >
+          Provides additional information about the fault.
+        type: array
+        items:
+          type: string
+      _links:
+        description: >
+          Links for this resource.
+        type: object
+        required:
+          - self
+        properties:
+          self:
+            description: >
+              URI of this resource.
+            $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
+          objectInstance:
+            description: >
+              Link to the resource representing the VNF instance to which the
+              notified alarm is correlated. Shall be present if the VNF
+              instance information is accessible as a resource.
+            $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
\ No newline at end of file

src/definitions/SOL002SOL003VNFFaultManagement_def.yaml

@@ -65,127 +65,6 @@ definitions:
               URI of this resource.
             $ref: "SOL002SOL003_def.yaml#/definitions/Link"
 
-  Alarm:
-    description: >
-      The alarm data type encapsulates information about an alarm.
-    type: object
-    required:
-      - id
-      - managedObjectId
-      - alarmRaisedTime
-      - ackState
-      - perceivedSeverity
-      - eventTime
-      - eventType
-      - probableCause
-      - isRootCause
-      - _links
-    properties:
-      id:
-        description: >
-          Identifier of this Alarm information element.
-        $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"
-      managedObjectId:
-        description: >
-          Identifier of the affected VNF instance.
-        $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"
-      vnfcInstanceIds:
-        description: >
-          Identifiers of the affected VNFC instances.
-        type: array
-        items:
-          $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
-      rootCauseFaultyResource:
-        description: >
-          The virtualised resources that are causing the VNF fault.
-          Shall be present if the alarm affects virtualised resources.
-        $ref: "#/definitions/FaultyResourceInfo"
-      alarmRaisedTime:
-        description: >
-          Time stamp indicating when the alarm is raised by the managed
-          object.
-        $ref: "SOL002SOL003_def.yaml#/definitions/DateTime"
-      alarmChangedTime:
-        description: >
-          Time stamp indicating when the alarm was last changed. It shall be
-          present if the alarm has been updated.
-        $ref: "SOL002SOL003_def.yaml#/definitions/DateTime"
-      alarmClearedTime:
-        description: >
-          Time stamp indicating when the alarm was cleared. It shall be
-          present if the alarm has been cleared.
-        $ref: "SOL002SOL003_def.yaml#/definitions/DateTime"
-      alarmAcknowledgedTime:
-        description: >
-          Time stamp indicating when the alarm was acknowledged.
-          It shall be present if the alarm has been acknowledged.
-        $ref: "SOL002SOL003_def.yaml#/definitions/DateTime"
-      ackState:
-        description: >
-          Acknowledgement state of the alarm.
-          Permitted values:
-          * UNACKNOWLEDGED
-          * ACKNOWLEDGED.
-        type: string
-        enum:
-          - UNACKNOWLEDGED
-          - ACKNOWLEDGED
-      perceivedSeverity:
-        description: >
-          Perceived severity of the managed object failure.
-        $ref: "#/definitions/PerceivedSeverityType"
-      eventTime:
-        description: >
-          Time stamp indicating when the fault was observed.
-        $ref: "SOL002SOL003_def.yaml#/definitions/DateTime"
-      eventType:
-        description: >
-          Type of event.
-        $ref: "#/definitions/EventType"
-      faultType:
-        description: >
-          Additional information to clarify the type of the fault.
-        type: string
-      probableCause:
-        description: >
-          Information about the probable cause of the fault.
-        type: string
-      isRootCause:
-        description: >
-          Attribute indicating if this fault is the root for other correlated
-          alarms. If true, then the alarms listed in the attribute
-          "correlatedAlarmIds" are caused by this fault.
-        type: boolean
-      correlatedAlarmIds:
-        description: >
-          List of identifiers of other alarms correlated to this fault.
-        type: array
-        items:
-          $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"
-      faultDetails:
-        description: >
-          Provides additional information about the fault.
-        type: array
-        items:
-          type: string
-      _links:
-        description: >
-          Links for this resource.
-        type: object
-        required:
-          - self
-        properties:
-          self:
-            description: >
-              URI of this resource.
-            $ref: "SOL002SOL003_def.yaml#/definitions/Link"
-          objectInstance:
-            description: >
-              Link to the resource representing the VNF instance to which the
-              notified alarm is correlated. Shall be present if the VNF
-              instance information is accessible as a resource.
-            $ref: "SOL002SOL003_def.yaml#/definitions/Link"
-
   AlarmNotification:
     description: >
       This type represents an alarm notification about VNF faults.

src/definitions/SOL002SOL003_def.yaml

@@ -582,59 +582,6 @@ definitions:
         items:
           $ref: "#/definitions/ExtLinkPortData"
 
-  ExtManagedVirtualLinkData:
-    type: object
-    required:
-      - id
-      - vnfVirtualLinkDescId
-      - resourceId
-    properties:
-      id:
-        description: >
-          The identifier of the externally-managed internal VL instance. The
-          identifier is assigned by the NFV-MANO entity that manages this VL
-          instance.
-        $ref: "#/definitions/Identifier"
-      vnfVirtualLinkDescId:
-        description: >
-          The identifier of the VLD in the VNFD for this VL.
-        $ref: "#/definitions/IdentifierInVnfd"
-      vimConnectionId:
-        description: >
-          Identifier of the VIM connection to manage this resource. This
-          attribute shall only be supported and present if VNF-related
-          resource management in direct mode is applicable.
-        $ref: "#/definitions/Identifier"
-      resourceProviderId:
-        description: >
-          Identifies the entity responsible for the management of this
-          resource. This attribute shall only be supported and present if
-          VNF-related resource management in indirect mode is applicable. The
-          identification scheme is outside the scope of the present document.
-        $ref: "#/definitions/Identifier"
-      resourceId:
-        description: >
-          The identifier of the resource in the scope of the VIM or the
-          resource provider.
-        $ref: "#/definitions/IdentifierInVim"
-      vnfLinkPort:
-        description: >
-          Externally provided link ports to be used to connect VNFC connection points to this externally-managed VL 
-          on this network resource. If this attribute is not present, the VNFM shall create the link ports on the 
-          externally-managed VL.
-        type: array
-        items:
-          $ref: "#/definitions/VnfLinkPortData"
-      extManagedMultisiteVirtualLinkId:
-        description: >
-          Identifier of the externally-managed multi-site VL instance. The identifier is assigned by the NFVMANO 
-          entity that manages the externally managed multi-site VL instance. It shall be present when the present 
-          externally-managed internal VL (indicated by extManagedVirtualLinkId) is part of a multi-site VL, e.g., 
-          in support of multi-site VNF spanning several VIMs. All externally-managed internal VL instances 
-          corresponding to an internal VL created based on the same virtualLinkDescId shall refer to the same 
-          extManagedMultisiteVirtualLinkId.
-        $ref: "#/definitions/Identifier"
-
   Identifier:
     description: >
       An identifier with the intention of being globally unique.