Versions Compared

Old Version 37

changes.mady.by.user Byung-Woo Jun

Saved on

compared with

New Version 38

changes.mady.by.user Byung-Woo Jun

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

  • Node type for ASD and data type for the deployment items added to Definitions/nodes.yaml and Definitions/data.yaml respectively
  • interface type (i.e. the substitution mapping type) created from org.openecomp.resource.abstract.nodes.VF, in standard ONAP way, with the standard ONAP properties
  • Main template generated as follows: 
    • node template added for the ASD type generated from the definition in the onboarded csar
    • vfModule group type added for each deployment item. see below for explanation of the properties and values used
    • sub. mapping added in standard ONAP way
  • Helm charts added to Artifacts/Deployment/HELM (similar to what is done today for onap zip cnf packages)
  • Original onboarded ASD csar is included in the same way as we do for ETSI.
  • Can we add anything specific to allow SO identify the package as ASD?; it could be done by SO deducing from the info already there (e.g. does it have a node template of the ASD type), but will be straightforward to add something explicitly if that is preferred, similar to what we have suggested in the TOSCA.meta
  • We need a way for SDC to recognise the onboarded csar as an ASD, for etsi we reply on presence of ETSI-... metdata. We can add something similar for ASD
    • we can use ASD-specific metadata the main manifest file
    • we can use the TOSCA.metadata model type flag


filetypesComments
data.yaml

org.onap.asd.datatypes.deploymentItem:

    derivedFrom: tosca.datatypes.Root

    properties:

        deployment_item_id: 

            type: string         

            description: UUID of deployment item

            required: true 

        artifact_type:

            type: enum

            values: ["HELM", "HELMFILE", "CRD"]

            default: "HELM"

            required: true

        artifact_id:

            type: string

            description: UUID of artifact id

            required: true

        deployment_order:

            type: integer

            required: false

        lifecycle_parameters:

            type: list

            entry_schema:

                type: string

            required: false


org.onap.asd.datatypes.ext_cpd:

    derivedFrom: tosca.datatypes.Root

TBD

org.onap.datatypes.enhanced_cluster_capabilities:

    derivedFrom: tosca.datatypes.Root

TBD
nodes.yaml  

org.onap.asd.CNF:
    derived_from: tosca.nodes.Root

    properties:

        asd_id:

            type: string

            description: UUID of ASD 

            required: true         

        asc_schema_version:

            type: string

            description: version of ASD schema

            required: true

        asd_provider:

            type: string

            description: provider of AS and ASD

            required: true       

        asd_application_name:

            type: string

            description: name of Application Service. Invariant for the AS lifetime

            required: true       

        asd_application_version:

            type: string

            description: version of Application Service

            required: true       

        asd_application_info_name:

            type: string

            description: Human readable name of Application Service. Can change during the AS lifetime

            required: false

        asd_info_description:

            type: string

            description: Human readable description of AS. Can change during the AS lifetime

            required: false

        asd_ext_cpd:

            entry_schema:

                type: org.onap.asd.datatypes.ext_cpd

            description: describes the externally exposed connection points of the application

            type: list

            required: false

        enhanced_cluster_capabilities:

            entry_schema:

                type: org.onap.datatypes.enhanced_cluster_capabilities

            description: expected capabilities of the target cluster to aid placement of AS

            type: list

filenode_typesdata_typesdata.yaml

org.onap.asd.datatypes.deploymentItem:

    derivedFrom: tosca.datatypes.Root

    properties:

        deployment_item_id: 

            type: string         

            description: UUID of deployment item

            required: true 

        artifact_type:

            type: enum

            values: ["HELM", "HELMFILE", "CRD"]

            default: "HELM"

            required:

true

false

       

artifact

deployment_

id

items:

           

type

entry_schema:

string

               

description: UUID of artifact id

type: org.onap.asd.datatypes.deploymentItem

         

  required: true

 description: deployment artifacts

           type: list

        deployment_order:

            type: integer

             required: false


resource-<asd>-template.yml

  node_templates:
   

  lifecycle

asd_

parameters

instance:

     

      type:

list

org.onap.asd.CNF
     

      entry_schema

metadata:
        invariantUUID: 3948bd3d-f4e2-41a9-b3b4-edc6c6db927e
       

type: string

UUID: 05329593-52f8-482d-a967-8dbb28bb117a
       

    required: false

org.onap.asd.datatypes.ext_cpd:

    derivedFrom: tosca.datatypes.Root

org.onap.datatypes.enhanced_cluster_capabilities:

    derivedFrom: tosca.datatypes.Root

nodes.yaml

org.onap.asd.CNF:
    derived_from: tosca.nodes.Root

    properties:

        asd_id:

            type: string

            description: UUID of ASD 

            required: true         

        asc_schema_version:

            type: string

            description: version of ASD schema

            required: true

        asd_provider:

            type: string

            description: provider of AS and ASD

            required: true       

        asd_application_name:

            type: string

            description: name of Application Service. Invariant for the AS lifetime

            required: true       

name: Asd1.CNF
        description: Not reusable inner VFC
        category: Generic
        version: '1.0'
        customizationUUID: 59c10655-f68e-47d3-bf7b-d8f5698f6f75
        type: VFC
        subcategory: Abstract
        resourceVendor: d
        resourceVendorRelease: 2.6.1
        reourceVendorModelNumber: ''
      properties:
        asd_id: ASD Instance
        asd_schema_version: 1.0.0
  group:
    Asd..helmA..module-0:
      type: org.openecomp.groups.VfModule
      metadata:
        vfModuleModelName: Asd..helmA..module-0
        vfModuleModelInvariantUUID: 766017db-5c11-47f9-a3c4-1fed0dbae9cb
        vfModuleModelUUID: 57a35aad-4290-4b55-a0b2-150aad6da058
        vfModuleModelVersion: '0.0'
      properties:
        min_vf_module_instances: 1
        vf_module_label: helmA
        max_vf_module_instances: 1
        vf_module_type: Base
        isBase: true
        initial_count: 1
        volume_group: false

        deployment_order: 1

        lifecycle_parameters

        asd_application_version

:

           

type: string

         

  description: version of Application Service

- "Values.db.fullBackupInterval"

           

required: true 

     

     

   

    asd_application_info_name:

- "Values.db.walConsolidationInterval" 
    Asd..helmB..module-1:
      type:

string            description: Human readable name of Application Service. Can change during the AS lifetime

org.openecomp.groups.VfModule
     

      required

metadata:

false


       

asd_info_description:

vfModuleModelName: Asd..helmB..module-0
       

    type: string

vfModuleModelInvariantUUID: 766017db-5c11-47f9-a3c4-1fed0dbae9cb
       

    description: Human readable description of AS. Can change during the AS lifetime

vfModuleModelUUID: 57a35aad-4290-4b55-a0b2-150aad6da058
        vfModuleModelVersion: '0.0'
   

required

  properties:

false


       

asd

min_vf_

ext

module_

cpd

instances: 0
       

    entry_schema:

vf_module_label: helmB
        vf_module_type: Expansion
       

type: org.onap.asd.datatypes.ext_cpd

isBase: false
       

    description: describes the externally exposed connection points of the application

initial_count: 0
       

    type: list

volume_group: false

       

    required: false

deployment_order: 2

       

enhanced

lifecycle_

cluster_capabilities

parameters:

           

entry_schema:

          - "Values.db.initialWebReplicas" 

  substitution_mappings:
    node_type: org.openecomp.

onap

resource.

datatypes.enhanced_cluster_capabilities

vf.Asd1
    properties:
      nf_naming:
      - nf_naming
     

description: expected capabilities of the target cluster to aid placement of AS

skip_post_instantiation_configuration:
      - skip_post_instantiation_configuration
     

type

multi_stage_design:

list


      - multi_stage_design
     

required

nf_function:

false


      - nf_function
     

deployment

nf_naming_

items

code:
      - nf_naming_code
     

entry

controller_

schema

actor:
      - controller_actor
     

    type: org.onap.asd.datatypes.deploymentItem           type: list

availability_zone_max_count:
      - availability_zone_max_count
   

 description: deployment artifacts

  sdnc_artifact_name:


     

        required: false

    

  

...

  • node template added for the ASD type generated from the definition in the onboarded csar
  • vfModule group type added for each deployment item. see below for explanation of the properties and values used
  • sub. mapping added in standard ONAP way

...

- sdnc_artifact_name
      max_instances:
      - max_instances
      nf_type:
      - nf_type
      sdnc_model_version:
      - sdnc_model_version
      nf_role:
      - nf_role
      min_instances:
      - min_instances
      sdnc_model_name:
      - sdnc_model_name

  • for the asd_instance, can we use the "type" for indicating "ASD"
  • can we extend the org.openecomp.groups.VfModule to add an optional property for the VfModule order to represent the DeploymentItems order?

      e.g., deployment_order

  • can we extend the org.openecomp.groups.VfModule to add the lifecycle_parameters from the lifecycleParameters from the DeploymentItems?

...





Create Service CSAR file

  • TOSCA-Metadata REQUIREMENT #<23>: SDC generates TOSCA-Metadata directory and TOSCA.meta
    • TOSCA.meta
  • Definitions. REQUIREMENT #<24>: SDC maps the onboarding ASD models into the ONAP internal. Note: mapping is under discussion
    • annotations.yml
    • artifacts.yml
    • capabilities.yml
    • data.yml
    • groups.yml
    • interfaces.yml
    • nodes.yml
    • policies.yml
    • relationships.yml
    • asd_types.yaml.                            // instead of using ONAP type definitions, support the ASD model specific definitions are included; TBD
    • resource-<...>-template-inteface.yml (came from VF)
    • resource-<...>-template.yml
    • service-<...>-template-interface.yml
    • service-<...>-template.yml. (put input parameters, additional properties...)
  • Artifacts
    • Resources
      • <VF-name>
        • Deployment //REQUIREMENT #<25>: use the "HELM" directory to contain Helm Charts
          • HELM
            • <helm files>
  • csar.meta
  • NS.mf