Commit 1371b7a4 authored by piscione's avatar piscione
Browse files

SOL005_77 to SOL005_80

parent 8b0eb2e8
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.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
  version: 1.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1


externalDocs:
externalDocs:
  description: ETSI GS NFV-SOL 005 V3.6.1
  description: ETSI GS NFV-SOL 005 V3.6.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.2.1-impl:etsi.org:ETSI_NFV_OpenAPI:1
  version: 2.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1


externalDocs:
externalDocs:
  description: ETSI GS NFV-SOL 005 V3.6.1
  description: ETSI GS NFV-SOL 005 V3.6.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.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
  version: 1.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1


externalDocs:
externalDocs:
  description: ETSI GS NFV-SOL 005 V3.6.1
  description: ETSI GS NFV-SOL 005 V3.6.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.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
  version: 1.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1


externalDocs:
externalDocs:
  description: ETSI GS NFV-SOL 005 V3.6.1
  description: ETSI GS NFV-SOL 005 V3.6.1
+63 −13
Original line number Original line Diff line number Diff line
@@ -239,8 +239,20 @@ definitions:
      This type represents the information that allows addressing a virtualised resource
      This type represents the information that allows addressing a virtualised resource
      that is used by a VNF instance or by an NS instance. Information about the resource
      that is used by a VNF instance or by an NS instance. Information about the resource
      is available from the VIM.
      is available from the VIM.
      NOTE: The value set of the "vimLevelResourceType" attribute is within the scope of the VIM,
      
      the WIM or the resource provider and can be used as information that complements the ResourceHandle.
      NOTE 1:	The value set of the "vimLevelResourceType" attribute is within the scope of the VIM, 
      the CISM, the WIM or the resource provider and can be used as information that complements
      the ResourceHandle. When the container infrastructure service is a Kubernetes® instance the 
      vimLevelResourceType is the type of resource, as would correspond to the ‘kind’ field if the 
      resource is declared in its own Kubernetes® manifest, e.g.: Pod, PersistentVolumeClaim, 
      NetworkAttachmentDefinition. 
      NOTE 2:	When the container infrastructure service is a Kubernetes® instance the resourceId shall be populated in the following way: 
      * For a compute MCIO, it is the instance identifier that Kubernetes® assigns, which is unique cluster wide per resource type. 
      * For a storage MCIO modelled as a persistent volume claim, it is the name of the persistent volume claim, i.e. the value of the
      ‘claimName’ field in the Kubernetes® manifest, or a compound name built by Kubernetes® if the persistent volume claim is 
      defined inline in another template instead of in its own manifest. 
      * For a network MCIO representing a NetworkAttachmentDefinition, a Service or an Ingress, it is the value of the
      ‘metadata.name’ field in Kubernetes® manifest. 


    type: object
    type: object
    required:
    required:
@@ -248,10 +260,11 @@ definitions:
    properties:
    properties:
      vimId:
      vimId:
        description: >
        description: >
          Identifier of the VIM or WIM under whose control this resource is placed.
          Identifier of the VIM or CISM or WIM under whose control this resource is placed. 
          This attribute shall be present if VNF-related resource management
          This attribute shall be supported when the resource is managed by a CISM. 
          in direct mode is applicable. It shall also be present for resources
          When the resource is managed by a VIM or WIM, this attribute shall be present 
          that are part of an NS instance such as virtual link resources.
          if VNF-related resource management in direct mode is applicable. It shall also
          be present for resources that are part of an NS instance such as virtual link resources. 
        $ref: "#/definitions/Identifier"
        $ref: "#/definitions/Identifier"
      resourceProviderId:
      resourceProviderId:
        description: >
        description: >
@@ -262,16 +275,53 @@ definitions:
        $ref: "#/definitions/Identifier"
        $ref: "#/definitions/Identifier"
      resourceId:
      resourceId:
        description: >
        description: >
          Identifier of the resource in the scope of the VIM, the WIM or the resource provider.
          Identifier of the resource in the scope of the VIM, the CISM, the WIM or the resource provider. 
          See note 2. 
        $ref: "#/definitions/IdentifierInVim"
        $ref: "#/definitions/IdentifierInVim"
      vimLevelResourceType:
      vimLevelResourceType:
        description: >
        description: >
          Type of the resource in the scope of the VIM, the WIM or the resource provider.
          Additional resource information which is specific to this resource and its type, and which 
          The value set of the "vimLevelResourceType" attribute is within the scope
          is available from the VIM or the CISM or the resource provider. 
          of the VIM, the WIM or the resource provider and can be used as information that
        type: string
          complements the ResourceHandle.
      
      vimLevelAdditionalResourceInfo:
        description: >
          Type of the resource in the scope of the VIM, the CISM, the WIM or the resource provider. 
          See note 1. 
        $ref: "#/definitions/AdditionalResourceInfo"

      containerNamespace:
        description: >
          The value of the namespace in which the MCIO corresponding to the resource is deployed. 
          This attribute shall be present if the resource is managed by a CISM and it shall be absent otherwise. 
        type: string

  AdditionalResourceInfo:
    description: >
      This type represents additional resource information which resource and resource type specific, and which 
      is available from the VIM or the CISM or the resource providers.
      NOTE:	At least one attribute shall be present. 
    type: object
    properties:
      hostName:
        description: >
          Name of the host where the resource is allocated. It shall be present for compute resources in the 
          scope of the CISM and shall be absent otherwise. See note. 
        type: string
      persistentVolume:
        description: >
          Name of the persistent volume to which the persistent volume claim representing the storage resource
          is bound. It may be present for storage resources in the scope of the CISM and shall be absent otherwise. 
          See note. 
          See note. 
        type: string
        type: string
      additionalInfo:
        description: >
          nformation related to other properties directly owned by the resource and available from the VIM or 
          CISM or WIM or the resource provider. See note. 
        $ref: "#/definitions/KeyValuePairs"


      


  IdentifierInNs:
  IdentifierInNs:
    description: >
    description: >
@@ -292,7 +342,7 @@ definitions:


  IdentifierInVim:
  IdentifierInVim:
    description: >
    description: >
      An identifier maintained by the VIM or other resource provider.
      An identifier maintained by the VIM or the CISM or other resource provider.
      It is expected to be unique within the VIM instance. Representation: string of variable length.
      It is expected to be unique within the VIM instance. Representation: string of variable length.
    type: string
    type: string