src/SOL003/VNFPackageManagement/definitions/SOL003VNFPackageManagement_def.yaml

@@ -4,7 +4,13 @@
 definitions:
   VnfPkgInfo:
     description: >
-      This type represents the information of an VNF package.
+      This type represents the information of a VNF package. It shall comply with the provisions defined in table 10.5.2.2-1.
+
+      NOTE 1:	If the value of the onboardingState attribute is not equal to "ONBOARDED", the value of the operationalState 
+              attribute shall be equal to "DISABLED".
+      NOTE 2:	If the value of the onboardingState attribute is not equal to "ONBOARDED", the value of the usageState attribute 
+              shall be equal to "NOT_IN_USE".
+      NOTE 3:	ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications.
     type: object
     required:
       - id
@@ -111,23 +117,15 @@ definitions:
         $ref: "#/definitions/PackageOnboardingStateType"
       operationalState:
         description: >
-          Operational state of the VNF package.
-          If the value of the onboardingState attribute is not equal to
-          "ONBOARDED", the value of the operationalState attribute shall be
-          equal to "DISABLED".
+          Operational state of the VNF package. See note 1.
         $ref: "#/definitions/PackageOperationalStateType"
       usageState:
         description: >
-          Usage state of the VNF package.
-          If the value of the onboardingState attribute is not equal to
-          "ONBOARDED", the value of the usageState attribute shall be
-          equal to "NOT_IN_USE".
+          Usage state of the VNF package. See note 2.
         $ref: "#/definitions/PackageUsageStateType"
       vnfmInfo:
         description: >
-          Specifies VNFMs compatible with the VNF. This information is copied from the VNFD.
-          ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on
-          TOSCA specifications.
+          Specifies VNFMs compatible with the VNF. This information is copied from the VNFD. See note 3.
         $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String"
       userDefinedData:
         description: >
@@ -229,9 +227,13 @@ definitions:
 
   VnfPackageSoftwareImageInfo:
     description: >
-      This type represents an artifact contained in or external to a VNF package which
-      represents a software image.
-      It shall comply with provisions defined in table 10.5.3.2-1.
+      This type represents an artifact contained in or external to a VNF package which represents a software image. 
+      It shall comply with the provisions defined in table 10.5.3.2-1.
+
+      NOTE 1:	The list of permitted values was taken from "Container formats" in OpenStack® documentation: "Disk and container formats for images"
+              (Available at https://docs.openstack.org/glance/pike/user/formats.html).
+      NOTE 2:	The list of permitted values was adapted from "Disk formats" in OpenStack® documentation: "Disk and container formats for images"
+              (Available at https://docs.openstack.org/glance/pike/user/formats.html).
     type: object
     required:
       - id
@@ -284,8 +286,7 @@ definitions:
           - DOCKER: docker container format
           - OVA: OVF package in a tarfile
           - OVF: OVF container format
-          The list of permitted values was taken from "Container formats" in
-          http://docs.openstack.org/image-guide/image-formats.html
+          See note 1.
         type: string
         enum:
           - AKI
@@ -312,8 +313,7 @@ definitions:
           - VHD: a common disk image format
           - VHDX: enhanced version of VHD format
           - VMDK: a common disk image format
-          The list of permitted values was adapted from "Disk formats" in
-          http://docs.openstack.org/image-guide/image-formats.html
+          See note 2.
         type: string
         enum:
           - AKI
@@ -456,14 +456,18 @@ definitions:
 
   PkgmNotificationsFilter:
     description: >
-      This type represents a subscription filter related to notifications
-      related to VNF package management.
-      At a particular nesting level in the filter structure, the following
-      applies: All attributes shall match in order for the filter to match
-      (logical "and" between different filter attributes). If an attribute
-      is an array, the attribute shall match if at least one of the values
-      in the array matches (logical "or" between the values of one filter
-      attribute).
+      This type represents a subscription filter related to notifications related to VNF package management. 
+      It shall comply with the provisions defined in table 10.5.3.4-1.
+      At a particular nesting level in the filter structure, the following applies: All attributes shall match 
+      in order for the filter to match (logical "and" between different filter attributes). If an attribute is 
+      an array, the attribute shall match if at least one of the values in the array matches (logical "or" 
+      between the values of one filter attribute).
+
+      NOTE 1:	The permitted values of the "notificationTypes" attribute are spelled exactly as the names of the 
+              notification types to facilitate automated code generation systems.
+      NOTE 2:	The attributes "vnfProductsFromProviders", "vnfdId" and "vnfPkgId" are alternatives to reference to 
+              particular VNF packages in a filter. They should not be used both in the same filter instance, but 
+              one alternative should be chosen.
     type: object
     anyOf:
       - oneOf:
@@ -480,9 +484,7 @@ definitions:
           Permitted values:
           - VnfPackageOnboardingNotification
           - VnfPackageChangeNotification
-          The permitted values of the "notificationTypes" attribute are
-          spelled exactly as the names of the notification types to
-          facilitate automated code generation systems.
+          See note 1.
         type: array
         items:
           type: string
@@ -493,10 +495,7 @@ definitions:
         description: >
           If present, match VNF packages that contain VNF products from
           certain providers.
-          The attributes "vnfProductsFromProviders", "vnfdId" and "vnfPkgId"
-          are alternatives to reference to particular VNF packages in a
-          filter. They should not be used both in the same filter instance,
-          but one alternative should be chosen.
+          See note 2.
         type: array
         items:
           type: object
@@ -548,10 +547,7 @@ definitions:
       vnfdId:
         description: >
           Match VNF packages with a VNFD identifier listed in the attribute.
-          The attributes "vnfProductsFromProviders", "vnfdId" and "vnfPkgId"
-          are alternatives to reference to particular VNF packages in a
-          filter. They should not be used both in the same filter instance,
-          but one alternative should be chosen.
+          See note 2.
         type: array
         items:
           $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
@@ -562,10 +558,7 @@ definitions:
           May be present if the "notificationTypes" attribute contains the
           value "VnfPackageChangeNotification" and shall be absent
           otherwise.
-          The attributes "vnfProductsFromProviders", "vnfdId" and "vnfPkgId"
-          are alternatives to reference to particular VNF packages in a
-          filter. They should not be used both in the same filter instance,
-          but one alternative should be chosen.
+          See note 2.
         type: array
         items:
           $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"

src/SOL003/VNFSnapshotPackageManagement/definitions/SOL003VNFSnapshotPackageManagement_def.yaml

@@ -4,7 +4,10 @@
 definitions:
   VnfSnapshotPkgInfo:
     description: >
-      This type represents the information of a VNF snapshot package.
+      This type represents the information of a VNF snapshot package. It shall comply with the provisions defined in table 12.5.2.2-1.
+
+      NOTE:	The attribute shall not be present before the VNF snapshot package content has been uploaded or built. Otherwise, this 
+            attribute shall be present unless it has been requested to be excluded per attribute selector.
     type: object
     required:
     - id
@@ -25,9 +28,7 @@ definitions:
           a globally unique way. It is created during the "build VNF snapshot package operation". 
           Multiples instances of the same VNF snapshot package share the same vnfSnapshotPkgUniqueId.
 
-          NOTE: The attribute shall not be present before the VNF snapshot package content 
-          has been uploaded or built. Otherwise, this attribute shall be present unless it 
-          has been requested to be excluded per attribute selector.
+          See note.
         $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
       name:
         description: > 
@@ -38,17 +39,13 @@ definitions:
           Checksum of the stored VNF snapshot package. Hash algorithms applicable to VNF 
           snapshot packages are defined in ETSI GS NFV-SOL 010.
 
-          NOTE: The attribute shall not be present before the VNF snapshot package content 
-          has been uploaded or built. Otherwise, this attribute shall be present unless it 
-          has been requested to be excluded per attribute selector.
+          See note.
         $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Checksum"
       createdAt:
         description: > 
           Timestamp indicating when the VNF snapshot package creation has been completed.
 
-          NOTE: The attribute shall not be present before the VNF snapshot package content 
-          has been uploaded or built. Otherwise, this attribute shall be present unless it 
-          has been requested to be excluded per attribute selector.
+          See note.
         $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
       vnfSnapshotId:
         description: > 
@@ -61,9 +58,7 @@ definitions:
           of the VNF snapshot and contained in the VNF snapshot package. This identifier 
           is allocated by the VNFM during the VNF snapshot creation.
 
-          NOTE: The attribute shall not be present before the VNF snapshot package content 
-          has been uploaded or built. Otherwise, this attribute shall be present unless it 
-          has been requested to be excluded per attribute selector.
+          See note.
         type: object
         items:
           $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierLocal"
@@ -86,9 +81,7 @@ definitions:
           Information about VNF snapshot artifacts that are VNFC snapshot images. Every local and 
           external snapshot image shall be included. No other artifacts shall be included.
 
-          NOTE: The attribute shall not be present before the VNF snapshot package content 
-          has been uploaded or built. Otherwise, this attribute shall be present unless it 
-          has been requested to be excluded per attribute selector.
+          See note.
         type: object
         items:
           $ref: "#/definitions/VnfcSnapshotImageInfo"
@@ -96,9 +89,7 @@ definitions:
         description: > 
           Information about VNF snapshot artifacts that are not VNFC snapshot images.
 
-          NOTE: The attribute shall not be present before the VNF snapshot package content 
-          has been uploaded or built. Otherwise, this attribute shall be present unless it 
-          has been requested to be excluded per attribute selector.
+          See note.
         type: object
         items:
           $ref: "#/definitions/SnapshotPkgArtifactInfo"
@@ -187,8 +178,13 @@ definitions:
 
   VnfcSnapshotImageInfo:
     description: >
-      This type represents an artifact contained in a VNF snapshot package which 
-      represents a snapshot image.
+      This type represents an artifact contained in a VNF snapshot package which represents a snapshot image. 
+      It shall comply with the provisions defined in table 12.5.3.2-1.
+
+      NOTE 1:	The list of permitted values was taken from "Container formats" in OpenStack® documentation: "Disk and container formats for images"
+              (Available at https://docs.openstack.org/glance/pike/user/formats.html).
+      NOTE 2:	The list of permitted values was adapted from "Disk formats" in OpenStack® documentation: "Disk and container formats for images"
+              (Available at https://docs.openstack.org/glance/pike/user/formats.html).
     type: object
     required:
     - id
@@ -212,7 +208,7 @@ definitions:
           - for an image artifact corresponding to a storage snapshot resource, the value is copied from the 
             "storageResourceId" attribute in the "VnfcSnapshotInfo" of the corresponding storage snapshot resource.
           When onboarding an existing VNF snapshot package, the NFVO shall set the value of this attribute as provided 
-          in the manifest file in the VNF snapshot package (refer to ETSI GS NFV-SOL 010 [i.14]).
+          in the manifest file in the VNF snapshot package (refer to ETSI GS NFV-SOL 010).
         $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierLocal"
       name:
         description: > 
@@ -245,8 +241,7 @@ definitions:
           - OVA: OVF package in a tarfile
           - OVF: OVF container format
 
-          NOTE: The list of permitted values was taken from "Container formats" in [i.5]
-          (OpenStack® documentation: "Disk and container formats for images").
+          See note 1.
         type: string
         enum:
           - AKI
@@ -272,8 +267,7 @@ definitions:
           - VHDX: enhanced version of VHD format
           - VMDK: a common disk image format
 
-          NOTE: The list of permitted values was adapted from "Disk formats" in [i.5]
-          (OpenStack® documentation: "Disk and container formats for images").
+          See note 2.
         type: string
         enum:
           - AKI

src/definitions/SOL002SOL003VNFFaultManagement_def.yaml

@@ -256,13 +256,15 @@ definitions:
 
   FmNotificationsFilter:
     description: >
-      This type represents a subscription filter related to notifications
-      about VNF faults.
-      At a particular nesting level in the filter structure, the following
-      applies: All attributes shall match in order for the filter to match
-      (logical "and" between different filter attributes). If an attribute is
-      an array, the attribute shall match if at least one of the values in the
-      array matches (logical "or" between the values of one filter attribute).
+      This type represents a subscription filter related to notifications about VNF faults. 
+      It shall comply with the provisions defined in table 7.5.3.2-1.
+      At a particular nesting level in the filter structure, the following applies: All attributes 
+      shall match in order for the filter to match (logical "and" between different filter attributes). 
+      If an attribute is an array, the attribute shall match if at least one of the values in the array 
+      matches (logical "or" between the values of one filter attribute).
+
+      NOTE:	The permitted values of the "notificationTypes" attribute are spelled exactly as the names 
+            of the notification types to facilitate automated code generation systems.
     type: object
     properties:
       vnfInstanceSubscriptionFilter:
@@ -271,14 +273,13 @@ definitions:
         $ref: "SOL002SOL003_def.yaml#/definitions/VnfInstanceSubscriptionFilter"
       notificationTypes:
         description: >
-          Match particular notification types.
+          Match particular notification types. 
+
           Permitted values:
-          * AlarmNotification
-          * AlarmClearedNotification
-          * AlarmListRebuiltNotification
-          The permitted values of the "notificationTypes" attribute are
-          spelled exactly as the names of the notification types to
-          facilitate automated code generation systems.
+          -	AlarmNotification
+          -	AlarmClearedNotification
+          -	AlarmListRebuiltNotification
+          See note.
         type: array
         items:
           type: string

src/definitions/SOL002SOL003VNFIndicator_def.yaml

@@ -4,7 +4,9 @@
 definitions:
   VnfIndicator:
     description: >
-      This type represents a VNF indicator value.
+      This type represents a VNF indicator value. It shall comply with the provisions defined in table 8.5.2.2-1.
+
+      NOTE:	ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications.
     type: object
     required:
       - id
@@ -23,10 +25,7 @@ definitions:
         type: string
       value:
         description: >
-          Provides the value of the indicator. The value format is defined in
-          the VNFD.
-          ETSI GS NFV-SOL 001 specifies the structure and format of the 
-          VNFD based on TOSCA specifications.
+          Provides the value of the indicator. The value format is defined in the VNFD. See note.
         type: object
       vnfInstanceId:
         description: >
@@ -51,13 +50,15 @@ definitions:
 
   VnfIndicatorNotificationsFilter:
     description: >
-      This type represents a subscription filter for notifications
-      related to VNF indicators.
-      At a particular nesting level in the filter structure, the following
-      applies: All attributes shall match in order for the filter to match
-      (logical "and" between different filter attributes). If an attribute is
-      an array, the attribute shall match if at least one of the values in the
-      array matches (logical "or" between the values of one filter attribute).
+      This type represents a subscription filter for notifications related to VNF indicators. 
+      It shall comply with the provisions defined in table 8.5.3.2-1. 
+      At a particular nesting level in the filter structure, the following applies: 
+      All attributes shall match in order for the filter to match (logical "and" between different 
+      filter attributes). If an attribute is an array, the attribute shall match if at least one of 
+      the values in the array matches (logical "or" between the values of one filter attribute).
+
+      NOTE:	The permitted values of the "notificationTypes" attribute are spelled exactly as the names 
+            of the notification types to facilitate automated code generation systems.
     type: object
     properties:
       vnfInstanceSubscriptionFilter:
@@ -66,13 +67,12 @@ definitions:
         $ref: "SOL002SOL003_def.yaml#/definitions/VnfInstanceSubscriptionFilter"
       notificationTypes:
         description: >
-          Match particular notification types.
+          Match particular notification types. 
+
           Permitted values:
-          *	VnfIndicatorValueChangeNotification
-          *	SupportedIndicatorsChangeNotification
-          The permitted values of the "notificationTypes" attribute are spelled exactly
-          as the names of the notification types to facilitate automated code generation
-          systems.
+          -	VnfIndicatorValueChangeNotification
+          -	SupportedIndicatorsChangeNotification
+          See note.
         type: string
         enum:
           - VnfIndicatorValueChangeNotification
@@ -152,9 +152,10 @@ definitions:
 
   VnfIndicatorValueChangeNotification:
     description: >
-      This type represents a VNF indicator value change notification.
-      The notification shall be triggered by the VNFM when the value of an
-      indicator has changed.
+      This type represents a VNF indicator value change notification. It shall comply with the provisions defined in table 8.5.2.5-1.
+      The notification shall be triggered by the VNFM when the value of an indicator has changed.
+
+      NOTE:	ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications.
     type: object
     required:
       - id
@@ -198,10 +199,7 @@ definitions:
         type: string
       value:
         description: >
-          Provides the value of the VNF indicator. The value format is defined
-          in the VNFD.
-          ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD
-          based on TOSCA specifications.
+          Provides the value of the VNF indicator. The value format is defined in the VNFD. See note.
         type: object
       vnfInstanceId:
         description: >
@@ -229,9 +227,12 @@ definitions:
     description: >
       This type represents a notification to inform the receiver that the set of indicators supported 
       by a VNF instance has changed. It shall comply with the provisions defined in table 8.5.2.6-1.
+      
       The notification shall be triggered by the VNFM when the set of supported VNF indicators has changed 
       as a side effect of the "Change current VNF package" operation. It may be triggered by the VNFM when 
       a VNF has been instantiated.
+
+      NOTE:	ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications.
     type: object
     required:
       - id
@@ -281,10 +282,7 @@ definitions:
               $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd" 
             name:
               description: >
-                Human readable name of the VNF indicator. 
-                Shall be  present if defined in the VNFD. 
-                ETSI GS NFV-SOL 001 specifies the structure and format of 
-                the VNFD based on TOSCA specifications.
+                Human readable name of the VNF indicator. Shall be present if defined in the VNFD. See note.
               type: string
       _links:
         description: >

src/definitions/SOL002SOL003VNFPerformanceManagement_def.yaml

@@ -202,9 +202,17 @@ definitions:
 
   PerformanceReport:
     description: >
-      This type defines the format of a performance report provided by the VNFM to the EM as a result
-      of collecting performance information as part of a PM job.
-      The type shall comply with the provisions defined in table 6.5.2.10-1.
+      This type defines the format of a performance report provided by the VNFM to the NFVO as a result of collecting 
+      performance information as part of a PM job. The type shall comply with the provisions defined in table 6.5.2.10-1.
+
+      NOTE:	The sub-object allows to structure the measured object but is not to be confused with sub-counters which allow 
+            to structure the measurement value.
+
+      EXAMPLE:
+        Measured object: VnfInstanceXYZ
+        Sub-object: VnfcInstance1
+        Measurement: vCPU_utilization
+        Sub-counters: vCPU utilization of each of the vCPUs of VnfcInstance1 (vCPU utilization.vCPU1, vCPU_utilization.vCPU2, etc.).
     type: object
     required:
       - entries
@@ -235,18 +243,9 @@ definitions:
               $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"
             subObjectInstanceId:
               description: >
-                Identifier of the sub-object instance of the measured object (i.e. of the measured object instance)
-                for which the performance metric is reported.
-                Shall be present if this is required in clause 6.2 of ETSI GS NFV-IFA 027
-                for the related measured object type.
-                The sub-object allows to structure the measured object but is not to be confused
-                with sub-counters which allow to structure the measurement value.
-                EXAMPLE:
-                  Measured object:  VnfInstanceXYZ
-                  Sub-object:       VnfcInstance1
-                  Measurement:      vCPU_utilization
-                  Sub-counters:     vCPU utilization of each of the vCPUs of VnfcInstance1
-                                    (vCPU_utilization.vCPU1, vCPU_utilization.vCPU2, etc.).
+                Identifier of the sub-object instance of the measured object instance for which the performance 
+                metric is reported. Shall be present if this is required in clause 6.2 of ETSI GS NFV-IFA 027
+                for the related measured object type. See note.
               $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
             performanceMetric:
               description: >
@@ -384,8 +383,9 @@ definitions:
 
   PmJobModifications:
     description: >
-      This type represents modifications to a PM job.
-      It shall comply with the provisions defined in table 6.5.2.12-1.
+      This type represents modifications to a PM job. It shall comply with the provisions defined in table 6.5.2.12-1.
+
+      NOTE:	At least one of the attributes defined in this type shall be present in request bodies.
     type: object
     oneOf:
       - required:
@@ -395,22 +395,27 @@ definitions:
     properties:
       callbackUri:
         description: >
-          New value of the "callbackUri" attribute.
-          The value "null" is not permitted. See note.
+          New value of the "callbackUri" attribute. The value "null" is not permitted. See note.
         $ref: "SOL002SOL003_def.yaml#/definitions/Uri"
       authentication:
         description: >
-          New value of the "authentication" attribute, or "null"
-          to remove the attribute. If present in a request body,
-          these modifications shall be applied according to the
-          rules of JSON Merge Patch (see IETF RFC 7396).
-          This attribute shall not be present in response bodies.
-          At least one of the attributes defined in this type shall be present in request bodies.
+          New value of the "authentication" attribute, or "null" to remove the attribute. If present 
+          in a request body, these modifications shall be applied according to the rules of JSON Merge 
+          Patch (see IETF RFC 7396).
+          
+          This attribute shall not be present in response bodies. See note.
         $ref: "SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication"
 
   PmJobCriteria:
     description: >
-      Criteria of the collection of performance information.
+      This type represents collection criteria for PM jobs. It shall comply with the provisions defined in table 6.5.3.3-1.
+
+      NOTE 1:	At the end of each reportingPeriod, the API producer will inform the API consumer about availability of the 
+              performance data collected for each completed collection period during this reportingPeriod. 
+              The reportingPeriod should be equal to or a multiple of the collectionPeriod. In the latter case, the performance 
+              data for the collection periods within one reporting period are reported together.
+      NOTE 2:	In particular when choosing short collection and reporting periods, the number of PM jobs that can be supported 
+              depends on the capability of the producing entity.
     type: object
     required:
       - collectionPeriod
@@ -437,15 +442,8 @@ definitions:
           type: string
       collectionPeriod:
         description: >
-          Specifies the periodicity at which the API producer will collect
-          performance information. The unit shall be seconds.
-          At the end of each reportingPeriod, the API producer will inform the
-          consumer about availability of the performance data collected for
-          each completed collection period during this reportingPeriod. The
-          reportingPeriod should be equal to or a multiple of the
-          collectionPeriod. In the latter case, the performance data for the
-          collection periods within one reporting period are reported
-          together.
+          SSpecifies the periodicity at which the API producer will collect performance information. 
+          The unit shall be seconds. See notes 1 and 2.
         type: integer
         minimum: 0
         maximum: 1024
@@ -453,15 +451,8 @@ definitions:
         # Done using min and max params to set a range for positive int.
       reportingPeriod:
         description: >
-          Specifies the periodicity at which the API producer will report to the
-          API consumer. about performance information. The unit shall be seconds.
-          At the end of each reportingPeriod, the API producer will inform the
-          API consumer about availability of the performance data collected for
-          each completed collection period during this reportingPeriod. The
-          reportingPeriod should be equal to or a multiple of the
-          collectionPeriod. In the latter case, the performance data for the
-          collection periods within one reporting period are reported
-          together.
+          Specifies the periodicity at which the API producer will report to the API consumer 
+          about performance information. The unit shall be seconds. See notes 1 and 2.
         type: integer
         minimum: 0
         maximum: 1024
@@ -541,8 +532,9 @@ definitions:
 
   ThresholdModifications:
     description: >
-      This type represents modifications to a threshold.
-      It shall comply with the provisions defined in table 6.5.2.11-1.
+      This type represents modifications to a threshold. It shall comply with the provisions defined in table 6.5.2.11-1.
+
+      NOTE:	At least one of the attributes defined in this type shall be present in request bodies.
     type: object
     oneOf:
       - required:
@@ -552,22 +544,25 @@ definitions:
     properties:
       callbackUri:
         description: >
-          New value of the "callbackUri" attribute.
-          The value "null" is not permitted. See note.
+          New value of the "callbackUri" attribute. The value "null" is not permitted. See note.
         $ref: "SOL002SOL003_def.yaml#/definitions/Uri"
       authentication:
         description: >
-          New value of the "authentication" attribute, or "null"
-          to remove the attribute. If present in a request body,
-          these modifications shall be applied according to the
-          rules of JSON Merge PATCH (see IETF RFC 7396).
-          This attribute shall not be present in response bodies.
-          At least one of the attributes defined in this type shall be present in request bodies.
+          New value of the "authentication" attribute, or "null" to remove the attribute. If present 
+          in a request body, these modifications shall be applied according to the rules of JSON Merge 
+          Patch (see IETF RFC 7396).
+          This attribute shall not be present in response bodies. See note.
         $ref: "SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication"
 
   ThresholdCriteria:
     description: >
-      This type represents criteria that define a threshold.
+      This type represents criteria that define a threshold. It shall comply with the provisions defined in table 6.5.3.4-1.
+
+      NOTE 1:	In the present document, simple thresholds are defined. The definition of additional threshold types is left for 
+              future specification.
+      NOTE 2:	The hysteresis is defined to prevent storms of threshold crossing notifications. When processing a request to create 
+              a threshold, implementations should enforce a suitable minimum value for this attribute (e.g. override the value or 
+              reject the request). 
     type: object
     required:
       - performanceMetric
@@ -580,13 +575,11 @@ definitions:
         type: string
       thresholdType:
         description: >
-          Type of threshold. This attribute determines which other attributes
-          are present in the data structure.
+          Type of threshold. This attribute determines which other attributes are present in the data structure.
+          
           Permitted values:
-          * SIMPLE: Single-valued static threshold
-          In the present document, simple thresholds are defined. The
-          definition of additional threshold types is left for future
-          specification.
+          -	SIMPLE: Single-valued static threshold.
+          See note 1.
         type: string
         enum:
           - SIMPLE
@@ -609,18 +602,12 @@ definitions:
             format: float
           hysteresis:
             description: >
-              The hysteresis of the threshold. Shall be represented as a
-              non-negative floating point number.
-              A notification with crossing direction "UP" will be generated if
-              the measured value reaches or exceeds
-              "thresholdValue" + "hysteresis". A notification with crossing
-              direction "DOWN" will be generated if the measured value reaches
-              or undercuts "thresholdValue" - "hysteresis".
-              The hysteresis is defined to prevent storms of threshold
-              crossing notifications. When processing a request to create a
-              threshold, implementations should enforce a suitable minimum
-              value for this attribute (e.g. override the value or reject the
-              request).
+              The hysteresis of the threshold. 
+              Shall be represented as a non-negative floating point number.
+              
+              A notification with crossing direction "UP" will be generated if the measured value reaches or exceeds 
+              "thresholdValue" + "hysteresis". A notification with crossing direction "DOWN" will be generated if the 
+              measured value reaches or undercuts "thresholdValue" - "hysteresis". See note 2.
             # TODO: This should be floating.
             # Done using Number type and floating format.
             type: number
@@ -628,15 +615,18 @@ definitions:
             maximum: 1024
             format: float
 
-
   ThresholdCrossedNotification:
     description: >
-      This type represents a notification that is sent when a threshold has
-      been crossed.
-      The timing of sending this notification is determined by the capability
-      of the producing entity to evaluate the threshold crossing condition.
-      The notification shall be triggered by the VNFM when a threshold has
-      been crossed.
+      This type represents a notification that is sent when a threshold has been crossed. 
+      It shall comply with the provisions defined in table 6.5.2.4-1.
+      
+      NOTE:	The timing of sending this notification is determined by the capability of the 
+            producing entity to evaluate the threshold crossing condition.
+            
+      The notification shall be triggered by the VNFM when a threshold has been crossed.
+
+      NOTE:	The sub-object allows to structure the measured object, but is not to be confused 
+            with sub-counters which allow to structure the measurement.
     type: object
     required:
       - id
@@ -687,11 +677,10 @@ definitions:
         $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"
       subObjectInstanceId:
         description: >
-          Identifier of the sub-object of the measured object (i.e. a VNFC instance)
-          to which the measurement applies.
-          Shall be present if this is required in an external measurement specification.
-          The sub-object allows to structure the measured object, but is not to be confused
-          with sub-counters which allow to structure the measurement.
+          Identifier of the sub-object of the measured object to which the measurement applies. 
+          Shall be present if this is required in clause 6.2 of ETSI GS NFV-IFA 027 for the related 
+          measured object type.
+          See note.
         $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
       performanceMetric:
         description: >