Commit 3929108d authored by Muhammad Hamza's avatar Muhammad Hamza
Browse files

redefine few data models as per SOL specs

parent 61902a9c
Loading
Loading
Loading
Loading
Loading
+25 −38
Original line number Diff line number Diff line
@@ -275,46 +275,36 @@ definitions:
      - resourceId
    type: object
    description: >
      This type represents the information that allows addressing a virtualised
      resource that is used by a VNF instance. Information about the resource
      is available from the VIM.
      This type represents the information that allows addressing a virtualised resource that is used by a VNF instance.
      Information about the resource is available from the VIM.

      * NOTE 1: The information about the VIM or CISM connection referenced by the VIM connection id is 
                known to the VNFM. Moreover, the identifier of the VIM connection provides scope to the 
                resourceId. (This applies in case of SOL002)
      * NOTE 1: The information about the VIM or CISM connection referenced by the VIM connection id is known to the
                VNFM. Moreover, the identifier of the VIM connection provides scope to the resourceId.

      * NOTE 2: The value set of the "vimLevelResourceType" attribute is within the scope of the VIM
                or CISM or the resource provider and can be used as information that complements the
                ResourceHandle. This value set is different from the value set of the "type" attribute
                in the ResourceDefinition (refer to clause 9.5.3.2). When the container infrastructure
                service management 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: The value set of the "vimLevelResourceType" attribute is within the scope of the VIM or CISM 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 3: When the container infrastructure service management is a Kubernetes® instance the resourceId shall be
                populated in the following way:
      * NOTE 3: 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 NetworkAttachme.
                - For a network MCIO representing a NetworkAttachmentDefinition, a Service or an Ingress, it is the value of 
                the 'metadata.name' field in Kubernetes® manifest.
    properties:
      vimConnectionId:
        description: >
          Identifier of the VIM or CISM connection to manage the
          resource.
          This attribute shall be supported when the resource is
          managed by a CISM.
          When the resource is managed by a VIM, this attribute
          shall only be supported and present if VNF--related
          Identifier of the VIM or CISM connection to manage the resource.
          This attribute shall be supported when the resource is managed by a CISM.
          When the resource is managed by a VIM, this attribute shall only be supported and present if VNF-related
          resource management in direct mode is applicable.
          The applicable "VimConnectionInfo" structure, which is
          referenced by vimConnectionId, can be obtained from
          the "vimConnectionInfo" attribute of the "VnfInstance"
          structure.  (This applies in case of SOL003)
          See note 1. (This applies in case of SOL002)
          See note 1.
        $ref: "#/definitions/Identifier"
      resourceProviderId:
        description: >
@@ -528,7 +518,7 @@ definitions:
                of the packets or it may be an identifier used between the application and the NFVI networking
                infrastructure to identify the network sub-interface of the trunk port in question. In the latter
                case the NFVI infrastructure will map this local segmentationId to whatever segmentationId is
                actually used by the NFVIs transport technology.
                actually used by the NFVI's transport technology.
    type: object
    anyOf:
      - required:
@@ -627,11 +617,8 @@ definitions:

  VirtualCpAddressData:
    description: >
      This type represents network address data for a virtual CP. It shall comply with the provisions defined in
      table 4.4.1.10d-1.

      This type represents information about a link port of an external VL, i.e. a port providing connectivity 
      for the VNF to an NS VL. It shall comply with the provisions defined in table 5.5.3.6d-1. (This applies in case of SOL002)
      This type represents information about a link port of an external VL, i.e. a port providing connectivity for the VNF to an 
      NS VL. It shall comply with the provisions defined in table 5.5.3.6d-1.

      * NOTE 1: If the container cluster is set up to be able to configure an external load balancer this address will be used,
                otherwise it will be ignored by the CISM.
@@ -660,7 +647,7 @@ definitions:
    description: >
      This type represents an external VL.
      * NOTE 1: The information about the VIM connection referenced by the VIM connection id is known to the VNFM. 
                Moreover, the identifier of the VIM connection provides scope to the resourceId. (This applies in case of SOL002)
                Moreover, the identifier of the VIM connection provides scope to the resourceId.

      * NOTE 2:	A link port is not needed for an external CP instance that exposes a VIP CP in the following cases:
                1 For a VIP CP directly exposed as an external CP:
+25 −44
Original line number Diff line number Diff line
@@ -275,23 +275,18 @@ definitions:
      - resourceId
    type: object
    description: >
      This type represents the information that allows addressing a virtualised
      resource that is used by a VNF instance. Information about the resource
      is available from the VIM.
      This type represents the information that allows addressing a virtualised resource that is used by a VNF instance.
      Information about the resource is available from the VIM. The ResourceHandle type shall comply with the provisions 
      defined in table 4.4.1.7-1.

      * NOTE 1: The information about the VIM or CISM connection referenced by the VIM connection id is 
                known to the VNFM. Moreover, the identifier of the VIM connection provides scope to the 
                resourceId. (This applies in case of SOL002)
      * NOTE 1: The value set of the "vimLevelResourceType" attribute is within the scope of the VIM or CISM or the resource 
                provider and can be used as information that complements the ResourceHandle. This value set is different from 
                the value set of the "type" attribute in the ResourceDefinition (refer to clause 9.5.3.2). When the container 
                infrastructure service management 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: The value set of the "vimLevelResourceType" attribute is within the scope of the VIM
                or CISM or the resource provider and can be used as information that complements the
                ResourceHandle. This value set is different from the value set of the "type" attribute
                in the ResourceDefinition (refer to clause 9.5.3.2). When the container infrastructure
                service management 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 3: When the container infrastructure service management is a Kubernetes® instance the resourceId shall be
      * NOTE 2: When the container infrastructure service management 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.
@@ -299,22 +294,17 @@ definitions:
                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 NetworkAttachme.
                - For a network MCIO representing a NetworkAttachmentDefinition, a Service or an Ingress, it is the value of 
                the 'metadata.name' field in Kubernetes® manifest.
    properties:
      vimConnectionId:
        description: >
          Identifier of the VIM or CISM connection to manage the
          resource.
          This attribute shall be supported when the resource is
          managed by a CISM.
          When the resource is managed by a VIM, this attribute
          shall only be supported and present if VNF--related
          Identifier of the VIM or CISM connection to manage the resource.
          This attribute shall be supported when the resource is managed by a CISM.
          When the resource is managed by a VIM, this attribute shall only be supported and present if VNF--related
          resource management in direct mode is applicable.
          The applicable "VimConnectionInfo" structure, which is
          referenced by vimConnectionId, can be obtained from
          the "vimConnectionInfo" attribute of the "VnfInstance"
          structure.  (This applies in case of SOL003)
          See note 1. (This applies in case of SOL002)
          The applicable "VimConnectionInfo" structure, which is referenced by vimConnectionId, can be obtained from
          the "vimConnectionInfo" attribute of the "VnfInstance" structure.
        $ref: "#/definitions/Identifier"
      resourceProviderId:
        description: >
@@ -627,11 +617,7 @@ definitions:

  VirtualCpAddressData:
    description: >
      This type represents network address data for a virtual CP. It shall comply with the provisions defined in
      table 4.4.1.10d-1.

      This type represents information about a link port of an external VL, i.e. a port providing connectivity 
      for the VNF to an NS VL. It shall comply with the provisions defined in table 5.5.3.6d-1. (This applies in case of SOL002)
      This type represents network address data for a virtual CP. It shall comply with the provisions defined in table 4.4.1.10d-1.

      * NOTE 1: If the container cluster is set up to be able to configure an external load balancer this address will be used,
                otherwise it will be ignored by the CISM.
@@ -658,11 +644,9 @@ definitions:

  ExtVirtualLinkData:
    description: >
      This type represents an external VL.
      * NOTE 1: The information about the VIM connection referenced by the VIM connection id is known to the VNFM. 
                Moreover, the identifier of the VIM connection provides scope to the resourceId. (This applies in case of SOL002)
      This type represents an external VL. It shall comply with the provisions defined in table 4.4.1.11-1.

      * NOTE 2:	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 VIP CP in the following cases:
                1 For a VIP CP directly exposed as an external CP:
                  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, but the NFVO indicates that no port is needed
@@ -674,7 +658,7 @@ definitions:
                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 3: 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
                management is a Kubernetes® instance is a network attachment definition (NAD).
    type: object
    required:
@@ -898,9 +882,6 @@ definitions:
      Cheksum description
    type: string

########################################################################################################################
# TO CHECK IF INCLUDE THESE DATA TYPES IN ANOTHER DEF FILES

  VnfLinkPortData:
    description: >
      This type represents an externally provided link port to be used to connect a VNFC connection point