Commit 8e7b61f3 authored by Muhammad Hamza's avatar Muhammad Hamza
Browse files

fix minor issues in SOL002 VNFConfAPI and def.yaml

parent 8d4e733e
Loading
Loading
Loading
Loading
Loading
+9 −9
Original line number Diff line number Diff line
@@ -46,23 +46,23 @@ definitions:
    type: object
    properties:
      overridingCertificateProfile:
        type: array
        items:
          $ref: '#/definitions/CertificateBaseProfile'
        description: >
          Overriding certificate profile. This overrides the certificateBaseProfile provided
          in the VNFD, and the CA and CMF can additionally override aspects of this certificateBaseProfile
          at later point in the VNF lifecycle if necessary to meet operator security policy.
      securityPolicy:
        type: array
        items:
          $ref: '#/definitions/SecurityPolicy'
          $ref: '#/definitions/CertificateBaseProfile'
      securityPolicy:
        description: >
          Security policy to be satisfied for certificate.
        type: array
        items:
          $ref: '#/definitions/SecurityPolicy'      
      cmfData:
        $ref: '#/definitions/CmfData'
        description: >
          Information for CMF.
        $ref: '#/definitions/CmfData'

  CmfData:
    description: >
@@ -168,11 +168,11 @@ definitions:
        description: >
          Supported protocol by CMF instance.
      certificateChain:
        description: >
          Certificate chain that this CMF provides.
        type: array
        items:
          $ref: '#/definitions/KeyValuePairs'
        description: >
          Certificate chain that this CMF provides.

  ApiVersionInformation:
    description: >
@@ -933,9 +933,9 @@ definitions:
          Identifier of this certificate information.
        $ref: "#/definitions/Identifier"
      certificateConfigurationInfo:
        $ref: '#/definitions/CertificateConfigurationInfo'
        description: >
          Configuration for certificate management such as certificate profile, information of CMF, and security policy.
        $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
+8 −7
Original line number Diff line number Diff line
@@ -95,8 +95,8 @@ definitions:
  VnfcConfigurationData:
    description: >
      This type represents configuration parameters of a VNFC instance.
      *   NOTE:	ETSI GS NFV-SOL 001 specifies the structure and format
                of the VNFD based on TOSCA specifications.

      NOTE:	ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications.
    type: object
    required:
      - vnfcInstanceId
@@ -128,14 +128,15 @@ definitions:
  CertificateData:
    description: >
      This type provides input information related to subject of certificate.
      * NOTE: NOTE : Either set of “privatekey” and “certificateFile” or “keystoreFile” but not both shall be present.
    tyoe: object
      
      NOTE : Either set of “privatekey” and “certificateFile” or “keystoreFile” but not both shall be present.
    type: object
    properties:
      privateKey:
        type: string
        description: >
          Private key paired with the signed public key. VNFM shall generate both the private key and public key and set
          this attribute. See note.
          Private key paired with the signed public key. VNFM shall generate both the private key and
          public key and set this attribute. See note.
      certificateFile:
        type: string
        description: >
@@ -146,9 +147,9 @@ definitions:
          Keystore which includes the private key, signed certificate, and certificate chain (e.g., pkcs#12, pfx).
          Credentials to read this file shall be provided to the VNF instance by outbound. See note.
      certSubjectData:
        $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/CertSubjectData'
        description: >
          Subject to be signed.
        $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/CertSubjectData'
      certifiateProfileName:
        type: string
        description: >