Commit d0ee854b authored by Pietro Piscione's avatar Pietro Piscione
Browse files

Fixed errors mentioned of issue #38

parent 966ea327
Loading
Loading
Loading
Loading
Loading
+5 −3
Original line number Original line Diff line number Diff line
@@ -365,8 +365,8 @@ components:
      name: vimId
      name: vimId
      in: path
      in: path
      description: |
      description: |
        Identifier of the VIM with associated NFVI capacity information.
        Identifier of the VIM with associated NFVI capacity information. See note.
        This identifier can be retrieved from the "vimId" attribute in the CapacityShortageNotification.
        * NOTE: This identifier can be retrieved from the "vimId" attribute in the CapacityShortageNotification.
                It can also be retrieved from the "vimId" attribute in the message content of the response.
                It can also be retrieved from the "vimId" attribute in the message content of the response.
      required: true
      required: true
      style: simple
      style: simple
@@ -379,6 +379,8 @@ components:
      in: path
      in: path
      description: |
      description: |
        Identifier of the CCM with associated NFVI capacity information. See note.
        Identifier of the CCM with associated NFVI capacity information. See note.
        * NOTE: This identifier can be retrieved from the "ccmId" attribute in the CapacityShortageNotification. It can also be
                retrieved from the "ccmId" attribute in the message content of the response. 
      required: true
      required: true
      style: simple
      style: simple
      explode: false
      explode: false
+1 −1
Original line number Original line Diff line number Diff line
@@ -304,7 +304,7 @@ definitions:
        description: >
        description: >
          The URI of the endpoint to send the notification to.
          The URI of the endpoint to send the notification to.
        $ref: "../../definitions/SOL005_def.yaml#/definitions/Uri"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/Uri"
      pmJobConnection:
      fmConnection:
        description: >
        description: >
          An access information and interface information to monitor the FM of VNF instance
          An access information and interface information to monitor the FM of VNF instance
          by the VNFM. This can include for instance certain interface endpoint URI together
          by the VNFM. This can include for instance certain interface endpoint URI together
+27 −27
Original line number Original line Diff line number Diff line
@@ -6646,23 +6646,22 @@ definitions:
      This type represents network address data for a virtual CP. 
      This type represents network address data for a virtual CP. 
      It shall comply with the provisions defined in table 6.5.3.12a-1.
      It shall comply with the provisions defined in table 6.5.3.12a-1.
      
      
      NOTE 1: The loadBalancerIp and the loadBalancerSourceRanges attributes are only used if the CIS cluster is set up to be 
      * NOTE 1: The loadBalancerIp and the loadBalancerSourceRanges attributes are only used if the CIS cluster is set up to be 
                able to configure an external load balancer. Otherwise it shall be ignored.
                able to configure an external load balancer. Otherwise it shall be ignored.
      NOTE 2: In case the cluster can configure an external load balancer but no loadBalancerIp is provided the
      * NOTE 2: In case the cluster can configure an external load balancer but no loadBalancerIp is provided the
                container cluster will assign an IP address. 
                container cluster will assign an IP address. 
      NOTE 3: The attribute is only relevant if the virtual CP is instantiated in a cluster that supports configuration of IP
      * NOTE 3: The attribute is only relevant if the virtual CP is instantiated in a cluster that supports configuration of IP
                address pools for virtual CPs. Otherwise it shall be ignored. MetalLB is an example of a solution for
                address pools for virtual CPs. Otherwise it shall be ignored. MetalLB is an example of a solution for
                Kubernetes® that supports configuration of address pools for load balancer services.
                Kubernetes® that supports configuration of address pools for load balancer services.
      NOTE 4: The loadBalancerIp and the addressPoolName and the externalIp attributes shall not be present at the same time.
      * NOTE 4: The loadBalancerIp, addressPoolName and the externalIp attributes shall not be present at the same time. 

    type: object
    type: object
    required:
    required:
      - type
      - type
    properties:
    properties:
      type:
      type:
        description: >
        description: >
          Identifier of layer(s) and protocol(s).
          The type of the IP addresses.
          Permitted values: IP_OVER_ETHERNET.
          Permitted values: IPV4, IPV6.
        type: string
        type: string
        enum:
        enum:
          - IPV4
          - IPV4
@@ -6679,15 +6678,16 @@ definitions:
        $ref: "#/definitions/IpAddress"
        $ref: "#/definitions/IpAddress"
      addressPoolName:
      addressPoolName:
        description: >
        description: >
          Name of an address pool from which the
          Name of an address pool from which the CIS cluster will assign an IP address to the virtual CP. 
          container cluster will assign an IP address to
          See notes 3 and 4.
          the virtual CP. See notes 3 and 4.
        type: array
        type: array
        items:
        items:
         type: string
         type: string
      loadBalancerSourceRanges:
      loadBalancerSourceRanges:
        description: >
        description: >
          List of client IP address ranges allowed to access an external load balancer. See note 1.
          List of client IP address ranges allowed to access an external load balancer. See note 1.
        type: array
        items:
          type: object
          type: object
          required:
          required:
           - minAddress
           - minAddress
+16 −14
Original line number Original line Diff line number Diff line
@@ -188,6 +188,7 @@ definitions:
      - objectInstanceIds
      - objectInstanceIds
      - criteria
      - criteria
      - callbackUri
      - callbackUri
      - _links
    properties:
    properties:
      id:
      id:
        description: >
        description: >
@@ -201,8 +202,7 @@ definitions:
        $ref: "../../definitions/SOL005_def.yaml#/definitions/String"
        $ref: "../../definitions/SOL005_def.yaml#/definitions/String"
      objectInstanceIds:
      objectInstanceIds:
        description: >
        description: >
          Identifiers of the NS instances for which
          Identifiers of the measured object instances for which performance information is collected. 
          performance information is collected.
        type: array
        type: array
        items:
        items:
          $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
          $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
@@ -210,13 +210,13 @@ definitions:
        description: >
        description: >
          Identifiers of the sub-object instances of the measured object
          Identifiers of the sub-object instances of the measured object
          instance for which performance information is requested to be collected.
          instance for which performance information is requested to be collected.
          May be present if a sub-object is defined in clause 6.2 of ETSI GS NFV-IFA 027
          May be present if a sub-object is defined in clause 6.2 of 
          for the related measured object type.
          ETSI GS NFV-IFA 027 for the related measured object type.
          If this attribute is present, the cardinality of the "objectInstanceIds"
          If this attribute is present, the cardinality of the "objectInstanceIds"
          attribute shall be 1.
          attribute shall be 1.
          If this attribute is absent and a sub-object is defined in clause 6.2 of
          If this attribute is absent and a sub-object is defined in clause 6.2 of
          ETSI GS NFV IFA 027  for the related measured object type, measurements
          ETSI GS NFV IFA 027  for the related measured object type, measurements will 
          will be taken for all sub-object instances of the measured object instance.
          be taken for all sub-object instances of the measured object instance.
        type: array
        type: array
        items:
        items:
          $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInNs"
          $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInNs"
@@ -239,7 +239,7 @@ definitions:
        properties:
        properties:
          href:
          href:
            description: >
            description: >
              The Uri where the report can be obtained.
              The URI where the report can be obtained.
            $ref: "../../definitions/SOL005_def.yaml#/definitions/Uri"
            $ref: "../../definitions/SOL005_def.yaml#/definitions/Uri"
          readyTime:
          readyTime:
            description: >
            description: >
@@ -253,11 +253,12 @@ definitions:
            description: >
            description: >
              The size of the report file in bytes, if known.
              The size of the report file in bytes, if known.
            type: integer
            type: integer
            minimum: 0
          pmJobConnection:
          pmJobConnection:
            description: >
            description: >
              An access information and interface information of PM job to monitor 
              An access information and interface information of PM job to monitor the PM of VNF 
              the PM of VNF instance by the VNFM. This can include for instance certain 
              instance by the VNFM. This can include for instance certain interface endpoint URI together with
              interface endpoint URI together with necessary credentials to access it.
              necessary credentials to access it.
            type: array
            type: array
            items:
            items:
              $ref: "../../definitions/SOL005_def.yaml#/definitions/MonitoringConnection"
              $ref: "../../definitions/SOL005_def.yaml#/definitions/MonitoringConnection"
@@ -274,10 +275,11 @@ definitions:
                $ref: "../../definitions/SOL005_def.yaml#/definitions/Link"
                $ref: "../../definitions/SOL005_def.yaml#/definitions/Link"
              objects:
              objects:
                description: >
                description: >
                  Links to resources representing the measured object
                  Links to resources representing the measure
                  instances for which performance information is
                  object instances for which performance
                  collected. Shall be present if the measured object instance
                  information is collected. Shall be present if the
                  information is accessible as a resource.
                  measured object instance information is
                  accessible as a resource.
                type: array
                type: array
                items:
                items:
                  $ref: "../../definitions/SOL005_def.yaml#/definitions/Link"
                  $ref: "../../definitions/SOL005_def.yaml#/definitions/Link"