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, 49 insertions, 32 deletions

diff --git a/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml b/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml
index 384b7e1248..b6c2de81cd 100644
--- a/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml
@@ -1,4 +1,4 @@
-tosca.capabilities.Root: 
+tosca.capabilities.Root:
   description: The TOSCA root Capability Type all other TOSCA base Capability Types derive from
 tosca.capabilities.Attachment:
   derived_from: tosca.capabilities.Root
@@ -7,7 +7,7 @@ tosca.capabilities.Node:
 tosca.capabilities.Container:
   derived_from: tosca.capabilities.Root
   properties:
-    num_cpus: 
+    num_cpus:
       type: integer
       required: false
       constraints:
@@ -17,12 +17,12 @@ tosca.capabilities.Container:
       required: false
       constraints:
         - greater_or_equal: 0.1 GHz
-    disk_size: 
+    disk_size:
       type: scalar-unit.size
       required: false
       constraints:
         - greater_or_equal: 0 MB
-    mem_size: 
+    mem_size:
       type: scalar-unit.size
       required: false
       constraints:
@@ -30,7 +30,7 @@ tosca.capabilities.Container:
 org.openecomp.capabilities.PortMirroring:
   derived_from: tosca.capabilities.Root
   properties:
-    connection_point: 
+    connection_point:
         type: org.openecomp.datatypes.PortMirroringConnectionPointDescription
 tosca.capabilities.Endpoint:
   derived_from: tosca.capabilities.Root
@@ -44,15 +44,15 @@ tosca.capabilities.Endpoint:
     secure:
       type: boolean
       default: false
-    url_path: 
+    url_path:
       type: string
       required: false
-    port_name: 
+    port_name:
       type: string
       required: false
     network_name:
       type: string
-      required: false 
+      required: false
       default: PRIVATE
     initiator:
       type: string
@@ -77,15 +77,15 @@ tosca.capabilities.Endpoint.Public:
     # Change the default network_name to use the first public network found
     network_name: PUBLIC
     floating:
-      description: > 
+      description: >
         indicates that the public address should be allocated from a pool of floating IPs that are associated with the network.
       type: boolean
       default: false
       status: experimental
     dns_name:
-      description: The optional name to register with DNS 
+      description: The optional name to register with DNS
       type: string
-      required: false    
+      required: false
       status: experimental
 tosca.capabilities.Endpoint.Admin:
   derived_from: tosca.capabilities.Endpoint
@@ -93,13 +93,13 @@ tosca.capabilities.Endpoint.Admin:
   properties:
     secure: true
 tosca.capabilities.Endpoint.Database:
-  derived_from: tosca.capabilities.Endpoint 
+  derived_from: tosca.capabilities.Endpoint
 tosca.capabilities.OperatingSystem:
   derived_from: tosca.capabilities.Root
   properties:
     architecture:
       type: string
-      required: false 
+      required: false
     type:
       type: string
       required: false
@@ -226,54 +226,71 @@ org.openecomp.capabilities.FabricConfiguration:
 
 #ONAP types
 tosca.capabilities.nfv.VirtualStorage:
-    derived_from: tosca.capabilities.Root
-tosca.capabilities.nfv.VirtualCompute:
   derived_from: tosca.capabilities.Root
+  description: Describes the attachment capabilities related to Vdu.Storage
+tosca.capabilities.nfv.VirtualCompute:
+  derived_from: tosca.capabilities.Node
+  description: Describes the capabilities related to virtual compute resources
   properties:
     logical_node:
-      type: tosca.datatypes.nfv.LogicalNodeData
-      required: false
-    compute_requirements:
       type: map
-      entry_schema:
-        type: string
+      description: Describes the Logical Node requirements
       required: false
+      entry_schema:
+        type: tosca.datatypes.nfv.LogicalNodeData
     requested_additional_capabilities:
       type: map
+      description: Describes additional capability for a particular VDU
+      required: false
       entry_schema:
-         type: tosca.datatypes.nfv.RequestedAdditionalCapability
+        type: tosca.datatypes.nfv.RequestedAdditionalCapability
+    compute_requirements:
+      type: map
       required: false
+      entry_schema:
+        type: string
     virtual_memory:
       type: tosca.datatypes.nfv.VirtualMemory
+      description: Describes virtual memory of the virtualized compute
       required: true
     virtual_cpu:
       type: tosca.datatypes.nfv.VirtualCpu
+      description: Describes virtual CPU(s) of the virtualized compute
       required: true
+    virtual_local_storage:
+      type: list
+      description: A list of virtual system disks created and destroyed as part of the VM lifecycle
+      required: false
+      entry_schema:
+        type: tosca.datatypes.nfv.VirtualBlockStorageData
+        description: virtual system disk definition
 tosca.capabilities.nfv.VirtualBindable:
-  derived_from: tosca.capabilities.Root
+  derived_from: tosca.capabilities.Node
+  description: Indicates that the node that includes it can be pointed by a tosca.relationships.nfv.VirtualBindsTo relationship type which is used to model the VduHasCpd association
 tosca.capabilities.nfv.VirtualLinkable:
   derived_from: tosca.capabilities.Root
+  description: A node type that includes the VirtualLinkable capability indicates that it can be pointed by tosca.relationships.nfv.VirtualLinksTo relationship type
 tosca.capabilities.nfv.ExtVirtualLinkable:
   derived_from: tosca.capabilities.Root
-tosca.capabilities.nfv.Forwarder: 
+tosca.capabilities.nfv.Forwarder:
   derived_from: tosca.capabilities.Root
-tosca.capabilities.nfv.ext.GuestOs: 
+tosca.capabilities.nfv.ext.GuestOs:
   derived_from: tosca.capabilities.Root
-tosca.capabilities.nfv.ext.ImageFile: 
+tosca.capabilities.nfv.ext.ImageFile:
   derived_from: tosca.capabilities.Root
-tosca.capabilities.nfv.ext.LocalAttachment: 
+tosca.capabilities.nfv.ext.LocalAttachment:
   derived_from: tosca.capabilities.Root
-tosca.capabilities.nfv.ext.Compute.Container.Architecture: 
+tosca.capabilities.nfv.ext.Compute.Container.Architecture:
   derived_from: tosca.capabilities.Root
-  properties: 
-    num_cpus: 
+  properties:
+    num_cpus:
       type: string
       required: false
-    flavor_extra_specs: 
+    flavor_extra_specs:
       type: map
       required: false
-      entry_schema: 
+      entry_schema:
         type: string
-    mem_size: 
+    mem_size:
       type: string
       required: false