Commit 1d35bae2 authored by Pietro Piscione's avatar Pietro Piscione
Browse files

Fix on issues after SOL005 feedback

parent e56c9adf
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ info:
  license:
  license:
    name: ETSI Forge copyright notice
    name: ETSI Forge copyright notice
    url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
    url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
  version: 1.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
  version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1


externalDocs:
externalDocs:
  description: ETSI GS NFV-SOL 005 V4.5.1
  description: ETSI GS NFV-SOL 005 V4.5.1
+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ info:
  license:
  license:
    name: ETSI Forge copyright notice
    name: ETSI Forge copyright notice
    url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
    url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
  version: 2.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
  version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1


externalDocs:
externalDocs:
  description: ETSI GS NFV-SOL 005 V4.5.1
  description: ETSI GS NFV-SOL 005 V4.5.1
+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ info:
  license:
  license:
    name: ETSI Forge copyright notice
    name: ETSI Forge copyright notice
    url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
    url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
  version: 1.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
  version: 1.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1


externalDocs:
externalDocs:
  description: ETSI GS NFV-SOL 005 V4.5.1
  description: ETSI GS NFV-SOL 005 V4.5.1
+40 −33
Original line number Original line Diff line number Diff line
@@ -215,7 +215,7 @@ definitions:
                * CMPv2
                * CMPv2
                * EST
                * EST
                * SCEP
                * SCEP
        minumumElement: 1
            minItems: 1
            items: 
            items: 
              type: string
              type: string
              enum:
              enum:
@@ -324,7 +324,7 @@ definitions:
        issuerUniqueIdentifier:
        issuerUniqueIdentifier:
          description: >
          description: >
            Identifier of this issuer of certificates. See note.
            Identifier of this issuer of certificates. See note.
          type: string
          $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
        subject:
        subject:
          description: >
          description: >
            Subject of certificates. See note.
            Subject of certificates. See note.
@@ -424,6 +424,7 @@ definitions:
    type: object
    type: object
    required:
    required:
      - overridingCertificateProfile
      - overridingCertificateProfile
      - securityPolicy
    properties:
    properties:
      overridingCertificateProfile:
      overridingCertificateProfile:
        description: >
        description: >
@@ -436,7 +437,6 @@ definitions:
        type: array
        type: array
        items:
        items:
          $ref: "#/definitions/CertificateBaseProfile"        
          $ref: "#/definitions/CertificateBaseProfile"        
                    
      securityPolicy:
      securityPolicy:
        description: >
        description: >
          Security policy to be satisfied for certificate.
          Security policy to be satisfied for certificate.
@@ -447,11 +447,7 @@ definitions:
      cmfData:
      cmfData:
        description: >
        description: >
          Information for CMF. Shall be present in delegation mode.
          Information for CMF. Shall be present in delegation mode.
        type: array
        $ref: "#/definitions/CmfData"
        minItems: 1
        items:
          #$ref: "#/definitions/CmfData"
          type: string
          
          
  CancelModeType:
  CancelModeType:
    description: >
    description: >
@@ -648,6 +644,8 @@ definitions:
                pre-empted during resource allocation.
                pre-empted during resource allocation.
      NOTE 3: Examples for the usage of priority include conflict resolution in case of resource shortage
      NOTE 3: Examples for the usage of priority include conflict resolution in case of resource shortage
      
      
      NOTE 4: Information about PaaS Services assigned to VNF instances shall only be included in the corresponding
              VnfInstance (see clause 6.5.3.57)
    type: object
    type: object
    required:
    required:
      - id
      - id
@@ -795,6 +793,13 @@ definitions:
        type: array
        type: array
        items:
        items:
          $ref: "#/definitions/MirroringInfo"
          $ref: "#/definitions/MirroringInfo"
      nsPaasServiceInfo:
        description: >
          Information on the PaaS Services assigned and used by an NS constituent 
          other than VNF instances. See note 4. 
        type: array
        items:
          $ref: "#/definitions/PaasServiceInfo"


      _links:
      _links:
        type: object
        type: object
@@ -1063,7 +1068,7 @@ definitions:
              VNFCs.
              VNFCs.
            type: array
            type: array
            items:
            items:
              $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnf"
              $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
          extCpInfo:
          extCpInfo:
            description: >
            description: >
              Information about the external CPs exposed by the VNF instance.
              Information about the external CPs exposed by the VNF instance.
@@ -3082,8 +3087,7 @@ definitions:
         from the VNF profile indicated in profileId attribute.
         from the VNF profile indicated in profileId attribute.
        type: array
        type: array
        items:
        items:
         $ref: "#/definitions/IdentifierInVnf"
         $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"

  ParamsForNestedNs:
  ParamsForNestedNs:
    description: >
    description: >
      This type specifies additional parameters on a per-nested NS instance basis. 
      This type specifies additional parameters on a per-nested NS instance basis. 
@@ -5335,7 +5339,7 @@ definitions:
      certificateExtensions:
      certificateExtensions:
        description: >
        description: >
          Extension of this certificate.
          Extension of this certificate.
        type: string             
        $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs"             




  CertificateInfo:
  CertificateInfo:
@@ -6770,7 +6774,7 @@ definitions:
    description: >
    description: >
      This type represents an external VL.
      This type represents an external VL.


      NOTE 1: A link port is not needed for an external CP instance that exposes a VIP CP in the following cases:
      NOTE 1: A link port is not needed for an external CP instance that exposes a CP in the following cases:
      1. For a VIP CP directly exposed as extCP:
      1. For a VIP CP directly exposed as extCP:
        1.1. no dedicated IP address is allocated as VIP address, as indicated in the VNFD
        1.1. no dedicated IP address is allocated as VIP address, as indicated in the VNFD
        1.2. a dedicated IP address is allocated as VIP address,
        1.2. a dedicated IP address is allocated as VIP address,
@@ -6778,6 +6782,9 @@ definitions:
      2. For a VIP CP exposed as extCP via a floating IP address:
      2. For a VIP CP exposed as extCP via a floating IP address:
      2.1. no dedicated IP address is allocated as VIP address, as indicated in the VNFD,
      2.1. no dedicated IP address is allocated as VIP address, as indicated in the VNFD,
        and the VNFC CP associated to the VIP CP is also exposed via a floating IP address.
        and the VNFC CP associated to the VIP CP is also exposed via a floating IP address.
      3. For a VIRTUAL CP exposed as an external CP.
      4. For a VNFC CP exposed as an external CP in a secondary container cluster external network or a
        secondary container cluster internal network
      NOTE 2:  An example of the network attachment definition resource when the container infrastructure service
      NOTE 2:  An example of the network attachment definition resource when the container infrastructure service
      is a Kubernetes® instance is a network attachment definition (NAD).
      is a Kubernetes® instance is a network attachment definition (NAD).
    type: object
    type: object
@@ -7516,7 +7523,7 @@ definitions:
          mappings, remain valid. See note 2.
          mappings, remain valid. See note 2.
        type: array
        type: array
        items:
        items:
         $ref: "#/definitions/IdentifierInVnf"
         $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      certificateConfigurationData: 
      certificateConfigurationData: 
          description: >
          description: >
            Configuration for certificate management such as
            Configuration for certificate management such as
+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ info:
  license:
  license:
    name: ETSI Forge copyright notice
    name: ETSI Forge copyright notice
    url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
    url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
  version: 2.11.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
  version: 2.12.0-impl:etsi.org:ETSI_NFV_OpenAPI:1


externalDocs:
externalDocs:
  description: ETSI GS NFV-SOL 005 V4.5.1
  description: ETSI GS NFV-SOL 005 V4.5.1
Loading