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>

2 files changed, 28 insertions, 15 deletions

diff --git a/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.json b/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.json
index caea6a8063..c2e5aee81d 100644
--- a/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.json
+++ b/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.json
@@ -3,6 +3,10 @@
     "displayName": "Root",
     "icon": "group-root"
   },
+  "tosca.groups.nfv.PlacementGroup": {
+    "displayName": "NFV PlacementGroup",
+    "icon": "group-nfv-placementgroup"
+  },
   "org.openecomp.groups.heat.HeatStack": {
     "displayName": "Heat Stack",
     "icon": "group-heat-stack"
@@ -19,4 +23,4 @@
     "displayName": "Vfc Instance",
     "icon": "group-vfc-instance"
   }
-}
\ No newline at end of file
+}
diff --git a/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.yml b/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.yml
index 394ffb1f6e..b8d5954fde 100644
--- a/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.yml
@@ -1,8 +1,17 @@
 tosca.groups.Root:
   description: The TOSCA Group Type all other TOSCA Group Types derive from
-  interfaces: 
+  interfaces:
     Standard:
       type: tosca.interfaces.node.lifecycle.Standard
+tosca.groups.nfv.PlacementGroup:
+  derived_from: tosca.groups.Root
+  description: PlacementGroup is used for describing the affinity or anti-affinity relationship applicable between the virtualization containers to be created based on different VDUs, or between internal VLs to be created based on different VnfVirtualLinkDesc(s)
+  properties:
+    description:
+      type: string
+      description: Human readable description of the group
+      required: true
+  members: [ tosca.nodes.nfv.Vdu.Compute, tosca.nodes.nfv.VnfVirtualLink ]
 org.openecomp.groups.heat.HeatStack:
   derived_from: tosca.groups.Root
   description: Grouped all heat resources which are in the same heat stack
@@ -16,7 +25,7 @@ org.openecomp.groups.heat.HeatStack:
       type: string
       description: group description
       required: true
-      status: SUPPORTED      
+      status: SUPPORTED
 org.openecomp.groups.VfModule:
   derived_from: tosca.groups.Root
   description: Grouped all heat resources which are in the same VF Module
@@ -27,23 +36,23 @@ org.openecomp.groups.VfModule:
       required: true
       default: false
       status: SUPPORTED
-    vf_module_label: 
+    vf_module_label:
       type: string
       required: true
-      description: > 
-        Alternate textual key used to reference this VF-Module model. 
+      description: >
+        Alternate textual key used to reference this VF-Module model.
         Must be unique within the VNF model
     vf_module_description:
       type: string
       required: true
       description: >
-        Description of the VF-modules contents and purpose  
+        Description of the VF-modules contents and purpose
         (e.g. "Front-End" or "Database Cluster")
     min_vf_module_instances:
       type: integer
       required: true
       description: The minimum instances of this VF-Module
-    max_vf_module_instances: 
+    max_vf_module_instances:
       type: integer
       required: false
       description: The maximum instances of this VF-Module
@@ -51,7 +60,7 @@ org.openecomp.groups.VfModule:
       type: integer
       required: false
       description: >
-        The initial count of instances of the VF-Module. The value must be in the 
+        The initial count of instances of the VF-Module. The value must be in the
         range between min_vfmodule_instances and max_vfmodule_instances.
         If no value provided the initial count is the min_vfmodule_instances.
     vf_module_type:
@@ -64,19 +73,19 @@ org.openecomp.groups.VfModule:
       required: true
       default: false
       description: >
-        "true" indicates that this VF Module model requires attachment to a Volume  
-        Group. 
-        VID operator must select the Volume Group instance to attach to a VF-Module 
+        "true" indicates that this VF Module model requires attachment to a Volume
+        Group.
+        VID operator must select the Volume Group instance to attach to a VF-Module
         at deployment time.
     availability_zone_count:
       type: integer
       required: false
       description: >
-        Quantity of Availability Zones needed for this VF-Module    
+        Quantity of Availability Zones needed for this VF-Module
         (source: Extracted from VF-Module HEAT template)
     vfc_list:
       type: map
-      entry_schema: 
+      entry_schema:
         description: <vfc_id>:<count>
         type: string
       required: false
@@ -119,4 +128,4 @@ org.openecomp.groups.VfcInstanceGroup:
       type: org.openecomp.capabilities.VLANAssignment
       properties:
         vfc_instance_group_reference:
-          type: string
\ No newline at end of file
+          type: string