Commit 813c7fb9 authored by Muhammad Hamza's avatar Muhammad Hamza
Browse files

fix minor issues in SOL002 OAS v4.5.1

parent 6e3c67e9
Loading
Loading
Loading
Loading
+59 −77
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ definitions:
    description: >
      This type provides input information related to certificate management.
    type: object
    required:
      - securityPolicy
    properties:
      overridingCertificateProfile:
        description: >
@@ -73,21 +75,20 @@ definitions:
      - supportedProtocol
    properties:
      endPoint:
        description: >
          End point of CMF instance.
        description: End point of CMF instance.
        type: object
        required:
          - ipAddress
          - link
        properties:
          ipAddress:
            description: An IP address of this end point.
            $ref: '#/definitions/IpAddress'
            description: >
              An IP address of this end point.
          link:
            description: A link to this end point.
            $ref: '#/definitions/Link'
            description: >
              A link to this end point.
      supportedProtocol:
        description: >
          Supported protocols by CMF instance.
        description: Supported protocols by CMF instance.
        type: array
        items:
          type: string
@@ -139,26 +140,24 @@ definitions:
      - supportedProtocol
    properties:
      id:
        description: Identifier of this CMF information.
        type: string
        description: >
          Identifier of this CMF information.
        $ref: "#/definitions/Identifier"
      endPoint:
        description: >
          End point of CMF instance.
        description: End point of CMF instance.
        type: object
        required:
          - ipAddress
          - link
        properties:
          ipAddress:
            description: >
              An IP address of this end point.
            description: An IP address of this end point.
            $ref: '#/definitions/IpAddress'
          link:
            description: >
              A link to this end point.
            description: A link to this end point.
            $ref: '#/definitions/Link'
      supportedProtocols:
        description: >
          Supported protocol by CMF instance.
        description: Supported protocol by CMF instance.
        type: array
        items:
          type: string
@@ -168,8 +167,7 @@ definitions:
            - EST
            - SCEP
      certificateChain:
        description: >
          Certificate chain that this CMF provides.
        description: Certificate chain that this CMF provides.
        type: array
        items:
          $ref: '#/definitions/KeyValuePairs'
@@ -887,29 +885,29 @@ definitions:
      - changeType
    properties:
      certificateInfoId:
        type: string
        description: >
          Identifier of certificate information.
        type: string
        $ref: "#/definitions/Identifier"
      certificateBaseProfileId:
        type: string
        description: >
          Identifier of certificate base profile.
        type: string
        $ref: "#/definitions/Identifier"
      securityPolicyId:
        type: string
        description: >
          Identifier of security policy.
        type: string
        $ref: "#/definitions/Identifier"
      cmfInfoId:
        type: string
        description: >
          Identifier of CMF information.
        type: string
        $ref: "#/definitions/Identifier"
      certificateContentId:
        type: string
        description: >
          Identifier of certificate content.
        type: string
        $ref: "#/definitions/Identifier"
      changeType:
        description: >
@@ -928,9 +926,9 @@ definitions:
      - id
    properties:
      id:
        type: string
        description: >
          Identifier of this certificate information.
        type: string
        $ref: "#/definitions/Identifier"
      certificateConfigurationInfo:
        description: >
@@ -938,8 +936,8 @@ definitions:
        $ref: '#/definitions/CertificateConfigurationInfo'
      certificateContents:
        description: >
          Information for contents of issued certificates. The information contained in this attribute may be updated over time during the VNF
          LCM, e.g., certificate(s) renewal.
          Information for contents of issued certificates. The information contained in this attribute may be
          updated over time during the VNF LCM, e.g., certificate(s) renewal.
        type: array
        items:
          $ref: '#/definitions/CertificateContent'
@@ -954,16 +952,16 @@ definitions:
      - certificateType
    properties:
      id:
        type: string
        description: Identifier of this certificate.
        type: string
        $ref: "#/definitions/Identifier"
      certficateDescId:
        type: string
        description: Identifier of certificate description in VNFD to be used to issue this certificate.
        type: string
        $ref: "#/definitions/IdentifierInVnfd"
      certificateType:
        type: string
        description: Type of this certificate.
        type: string
        enum:
          - VNFCI_CERT
          - VNFOAM_CERT
@@ -971,33 +969,33 @@ definitions:
        description: Describes supported certificate management information.
        $ref: "#/definitions/KeyValuePairs"
      version:
        type: string
        description: Version of this certificate.
        type: string
        $ref: "#/definitions/Version"
      serialNumber:
        type: integer
        description: Serial number of this certificate.
        type: integer
      signatureAlgorithm:
        type: string
        description: Algorithm of this certificate's signature.
      issuer:
        type: string
      issuer:
        description: Issuer of this certificate.
      notBefore:
        type: string
      notBefore:
        description: Start date of valid period for this certificate.
      notAfter:
        type: string
      notAfter:
        description: End date of valid period for this certificate.
      subject:
        type: string
      subject:
        description: Subject of this certificate.
      publicKeyAlgorithm:
        type: string
      publicKeyAlgorithm:
        description: Algorithm of this certificate's public key.
      publicKey:
        type: string
      publicKey:
        description: Public key of this certificate.
        type: string
      certificateExtensions:
        $ref: "#/definitions/KeyValuePairs"
        description: Extension of this certificate.
@@ -1034,79 +1032,69 @@ definitions:
    description: >
      This type provides input information related to security policy for certificate management.
    type: object
    required:
      - id
    properties:
      id:
        description: Identifier of this security policy.
        type: string
        description: >
          Identifier of this security policy.
        $ref: "#/definitions/Identifier"
      maxValidityPeriod:
        description: Allowed max validity period for certificates.
        type: integer
        description: >
          Allowed max validity period for certificates.
      allowedAlgorithm:
        description: Allowed signature algorithm.
        type: string
        description: >
          Allowed signature algorithm.
      minimumKeyLength:
        description: Minimum key length for certificates.
        type: integer
        description: >
          Minimum key length for certificates.

  CertificateBaseProfile:
    description: >
      This type provides input information to override certificate base profile for
      certificate management

      * NOTE : At least one overriding attributes shall be present, otherwise shall be absent.
      NOTE : At least one overriding attributes shall be present, otherwise shall be absent.
    required:
      - id
    properties:
      id:
        description: The identifier of this certificate profile.
        type: string
        description: >
          The identifier of this certificate profile.
        $ref: "#/definitions/Identifier"
      issuer:
        type: string
        description: >
          Issuer of certificates. See note.
        description: Issuer of certificates. See note.
      issuerUniqueIdentifier:
        type: string
        description: >
          Identifier of this issuer of certificates. See note.
        description: Identifier of this issuer of certificates. See note.
        $ref: "#/definitions/Identifier"
      subject:
        description: >
          Subject of certificates. See note.
        description: Subject of certificates. See note.
        $ref: '#/definitions/CertSubjectData'
      subjectUniqueIdentifier:
        description: Identifier of this subject of certificates. See note.
        type: string
        description: >
          Identifier of this subject of certificates. See note.
        $ref: "#/definitions/Identifier"
      basicConstraints:
        type: string
        description: >
          Basic constraints of certificates. See note.
      issuerAltName:
        description: Alternative name of issuer of certificates in this NS. See note.
        type: array
        items:
          type: string
        description: >
          Alternative name of issuer of certificates in this NS. See note.
      subjectAltName:
        description: Alternative name of subject of certificates. See note.
        type: array
        items:
          type: string
        description: >
          Alternative name of subject of certificates. See note.
      nameConstraints:
        description: Name constraints of certificates. See note.
        type: array
        items:
          type: string
        description: >
          Name constraints of certificates. See note.

  CertSubjectData:
    description: >
@@ -1116,29 +1104,23 @@ definitions:
    type: object
    properties:
      commonName:
        description: Information of certification target subject FQDN. See note.
        type: string
        description: >
          Information of certification target subject FQDN. See note.
      organization:
        description: Information of certification target subject Organization. See note.
        type: string
        description: >
          Information of certification target subject Organization. See note.
      country:
        description: Information of certification target subject Country. See note.
        type: string
        description: >
          Information of certification target subject Country. See note.
      state:
        description: Information of certification target subject State. See note.
        type: string
        description: >
          Information of certification target subject State. See note.
      locality:
        description: Information of certification target subject Locality. See note.
        type: string
        description: >
          Information of certification target subject Locality. See note.
      emailAddress:
        description: Information of certification contact email address. See note.
        type: string
        description: >
          Information of certification contact email address. See note.


  DateTime:
+40 −5
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ paths:
    parameters:
      - $ref: '#/components/parameters/VnfInstanceId'
      - $ref: ../../components/SOL002_params.yaml#/components/parameters/Version
      - $ref: ../../components/SOL003_params.yaml#/components/parameters/Accept
      - $ref: ../../components/SOL002_params.yaml#/components/parameters/Authorization
    post:
      description: |
@@ -231,17 +232,17 @@ paths:
        $ref: '#/components/requestBodies/SelectVnfDeployableModulesRequest'
      responses:
        "202":
          $ref: '#/components/responses/InstantiateVnfInstance.Post.202'
          $ref: '#/components/responses/Selectdeployablemodules.Post.202'
        "404":
          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/404
        "409":
          $ref: '#/components/responses/InstantiateVnfInstance.Post.409'
          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/409
        "400":
          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/400
        "401":
          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/401
        "403":
          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/403
        "404":
          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/404
        "405":
          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/405
        "406":
@@ -3338,3 +3339,37 @@ components:
        application/json:
          schema:
            $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails"
    
    Selectdeployablemodules.Post.202:
      description: |
        202 ACCEPTED

        Shall be returned when the request has been accepted for processing.
        The response body shall be empty.
        The HTTP response shall include a "Location" HTTP header that contains the URI of the newly-created 
        "Individual VNF LCM operation occurrence" resource corresponding to the operation.
      headers:
        Location:
          description: |
            The resource URI of the created "Individual VNF LCM operation
            occurrence" resource.
          style: simple
          explode: false
          schema:
            type: string
            format: url
        WWW-Authenticate:
          description: |
            Challenge if the corresponding HTTP request has not provided
            authorization, or error details if the corresponding HTTP request
            has provided an invalid authorization token.
          style: simple
          explode: false
          schema:
            type: string
        Version:
          description: The used API version.
          style: simple
          explode: false
          schema:
            type: string
 No newline at end of file
+4 −4
Original line number Diff line number Diff line
@@ -3307,29 +3307,29 @@ definitions:
      - paasServiceHandle
    properties:
      id:
        type: string
        description: >
          Identifier of this PaaS Service Information.
        type: string
        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier"
      paasServiceId:
        type: string
        description: >
          Identifier of the assigned PaaS Service as managed by the PaaS Services Management
          (PSM) function.
        type: string
        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier"
      paasServiceType:
        type: string
        description: >
          The type of PaaS Service. The value of this attribute is expected to be matched against
          values of the registered PaaS Services in the PSR.
        type: string
      paasServiceVersion:
        description: >
          Version of the PaaS Service. It shall be present if the PaaS Service is versioned.
        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Version"
      paasServiceRequestId:
        type: string
        description: >
          Identifier of the PaaS Service request in the VNFD that maps to the assigned PaaS Service.
        type: string
        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd"
      paasServiceHandle:
        description: >
+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ info:
  license:
    name: ETSI Forge copyright notice
    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:
  description: ETSI GS NFV-SOL 002 V4.4.1