updating the VNFD (SOL001) type based on SOL001 v2.5.1

updated VNFD types (tosca*.*nfv.) based on latest v2.5.1 version, not supported backward compatibility of SOL draft version, will be documented as limitation while upgrading from SOL draft version, updated importscript for new nodes, Also fixed java files for policyType having groupType reference

Change-Id: I8b8175ec908809608e6bdac990052d909792a2ba
Issue-ID: SDC-2170
Signed-off-by: sarada prasad sahoo <sarada.prasad.sahoo@huawei.com>

1 files changed, 42 insertions, 37 deletions

diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.yml
index 64bf536a0d..83bba36fe0 100644
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.yml
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.yml
@@ -2,64 +2,69 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0
 node_types:
     tosca.nodes.nfv.Vdu.Compute:
       derived_from: tosca.nodes.Root
+      description:  Describes the virtual compute part of a VDU which is a construct   supporting the description of the deployment and operational behavior of a VNFC
       properties:
         name:
           type: string
+          description: Human readable name of the VDU
           required: true
         description:
           type: string
+          description: Human readable description of the VDU
           required: true
         boot_order:
-          type: map
+          type: list # explicit index (boot index) not necessary, contrary to IFA011
+          description: References a node template name from which a valid boot device is created
+          required: false
           entry_schema:
             type: string
+        nfvi_constraints:
+          type: list
+          description: Describes constraints on the NFVI for the VNFC instance(s) created from this VDU
           required: false
-        nfvi_constraints: 
-          type: map # Align with IM, it shoul be a array of KeyValuePair/NameValuePair
           entry_schema:
             type: string
+        monitoring_parameters:
+          type: list
+          description: Describes monitoring parameters applicable to a VNFC instantiated from this VDU
           required: false
-        configurable_properties:
-           type: map   #In the IM, the multipilicity of VnfcConfigurableProperties is 1, not a map.
-           entry_schema:
-              type: tosca.datatypes.nfv.VnfcConfigurableProperties
-           required: true 
-        vdu_profile:         
-           type: tosca.datatypes.nfv.VduProfile
-           required: true
-        inject_files: # Used for vCPE usecase Aligned with ONAP R2 IM. not defined in IFA011 v2.4.1 and SOL001 v0.6.0.
-           type: tosca.datatypes.nfv.injectFile
-           required: false  #Aligned with ONAP R2 IM. it should be false.
-        meta_data: #metadata attached to the VM or container
-           type: map
-           entry_schema:
-             type: string
-           required: false
-        user_data: #cloudinit userdata script support
+          entry_schema:
+            type: tosca.datatypes.nfv.VnfcMonitoringParameter
+        #configurable_properties:
+           #type: tosca.datatypes.nfv.VnfcConfigurableProperties
+           #required: false
+           # derived types are expected to introduce
+           # configurable_properties with its type derived from
+           # tosca.datatypes.nfv.VnfcConfigurableProperties
+        vdu_profile:
+          type: tosca.datatypes.nfv.VduProfile
+          description: Defines additional instantiation data for the VDU.Compute node
+          required: true
+        sw_image_data:
+          type: tosca.datatypes.nfv.SwImageData
+          description: Defines information related to a SwImage artifact used by this Vdu.Compute node
+          required: false # property is required when the node template has an associated artifact of type tosca.artifacts.nfv.SwImage and not required otherwise
+        boot_data:
           type: string
+          description: Contains a string or a URL to a file contained in the VNF package used to customize a virtualised compute resource at boot time. The bootData may contain variable parts that are replaced by deployment specific values before being sent to the VIM.
+          required: false
+        inject_files: #Introduced from Beijing release, used for vCPE usecase, outside the scope of SOL001 v2.5.1
+          type: tosca.datatypes.nfv.injectFile
+          required: false  #Aligned with ONAP R2 IM. it should be false.
+        meta_data: #Introduced from Beijing release, used for metadata attached to the VM or container, outside the scope of SOL001 v2.5.1
+          type: map
+          entry_schema:
+            type: string
           required: false
       capabilities:
         virtual_compute:
           type: tosca.capabilities.nfv.VirtualCompute
+          occurrences: [ 1, 1 ]
         virtual_binding:
           type: tosca.capabilities.nfv.VirtualBindable
-          occurrences:
-          - 1
-          - UNBOUNDED
-        monitoring_parameter:    
-          type: tosca.capabilities.nfv.Metric
-          occurrences:
-          - 0
-          - UNBOUNDED
+          occurrences: [ 1, UNBOUNDED ]
       requirements:
         - virtual_storage:
             capability: tosca.capabilities.nfv.VirtualStorage
-            relationship: tosca.relationships.nfv.Vdu.AttachedTo
-            node: tosca.nodes.nfv.Vdu.VirtualStorage
-            occurences:
-            - 0
-            - UNBOUNDED
-      #artifacts: artifacts should be defined in template file instead of node type  
-      #  - sw_image:
-      #      file:   
-      #      type: tosca.artifacts.nfv.SwImage
+            relationship: tosca.relationships.nfv.AttachesTo
+            occurrences: [ 0, UNBOUNDED ]