DM modification to align with R2 DM clean version

Change-Id: Ifcb5d3e644f46e4c9a4467e28b0dd7616b485497
Issue-ID: SDC-1415
Signed-off-by: liang ding <liang.ding@intel.com>

4 files changed, 94 insertions, 78 deletions

diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/capabilities.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/capabilities.yml
index e37169ba04..93382765ad 100644
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/capabilities.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/capabilities.yml
@@ -42,9 +42,11 @@ capability_types:
       logical_node:
         type: tosca.datatypes.nfv.LogicalNodeData
         required: false
-        #compute_requirements: Type is TBD
-        #type: map
-        #required: false
+      compute_requirements:
+        type: map
+        entry_schema:
+          type: string
+        required: false
       requested_additional_capabilities:
         type: map
         entry_schema:
@@ -82,4 +84,5 @@ capability_types:
     derived_from: tosca.capabilities.Root
 
   tosca.capabilities.nfv.ext.LocalAttachment:
-    derived_from: tosca.capabilities.Root
\ No newline at end of file
+    derived_from: tosca.capabilities.Root
+
diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/data.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/data.yml
index 36f2ae3b0f..b5cdaec6bb 100644
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/data.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/data.yml
@@ -48,7 +48,7 @@ data_types:
     derived_from: tosca.datatypes.Root
     properties:
       virtual_mem_size:
-        type: string
+        type: scalar-unit.size
         required: true
       virtual_mem_oversubscription_policy:
         type: string
@@ -106,6 +106,7 @@ data_types:
           type: string
         required: false
   tosca.datatypes.nfv.VnfcConfigurableProperties:
+    derived_from: tosca.datatypes.Root
     properties:
       additional_vnfc_configurable_properties:
         entry_schema:
@@ -162,12 +163,15 @@ data_types:
         required: true
       dest_path:
         type: string
+        required: true
   tosca.datatype.nfv.AddressData:
+    derived_from: tosca.datatypes.Root
     properties:
       address_type:
         constraints:
         - valid_values: [mac_address, ip_address]
         type: string
+        required: true
       l2_address_data:
         required: false
         type: tosca.datatypes.nfv.L2AddressData
@@ -181,17 +185,13 @@ data_types:
         type: boolean
         required: true
   tosca.datatypes.nfv.ConnectivityType:
+    derived_from: tosca.datatypes.Root
     properties:
       layer_protocol:
         constraints:
-        - valid_values:
-          - ethernet
-          - mpls
-          - odu2
-          - ipv4
-          - ipv6
-          - pseudo_wire
+          - valid_values: [ethernet, mpls, odu2, ipv4, ipv6, pseudo_wire ]
         type: string
+        required: true
       flow_pattern:
         required: false
         type: string
@@ -277,7 +277,7 @@ data_types:
         required: true
       vmBootUpTimeOut: #Align with ONAP R2 IM. not defined in IFA011 v2.4.1 and SOL001 v.6.0
         type: integer
-        required: optional
+        required: false
   tosca.datatypes.nfv.LinkBitRateRequirements:
     derived_from: tosca.datatypes.Root
     properties:
@@ -298,6 +298,8 @@ data_types:
         required: true
       packet_loss_ratio:
         type: float #Number [0 ..1]
+        constraints:
+          - in_range: [ 0.0, 1.0 ]
         required: false
   tosca.datatypes.nfv.VlProfile:
     derived_from: tosca.datatypes.Root
@@ -391,9 +393,12 @@ data_types:
         required: false
         entry_schema:
           type: tosca.datatypes.nfv.ScaleInfo
-  #tosca.datatypes.nfv.VnfInstantiateOperationConfiguration:
-  #  derived_from: tosca.datatypes.Root
-    #properties:
+  tosca.datatypes.nfv.VnfInstantiateOperationConfiguration:
+    derived_from: tosca.datatypes.Root
+    properties:
+      description:
+        type: string
+        required: false
       #parameters:
          #modeled as part of operation parameter list
   tosca.datatypes.nfv.VnfScaleOperationConfiguration:
@@ -436,8 +441,8 @@ data_types:
   tosca.datatypes.nfv.VnfLcmOperationsConfiguration:
     derived_from: tosca.datatypes.Root
     properties:
-      #    instantiate:
-      #      type: tosca.datatypes.nfv.VnfInstantiateOperationConfiguration
+      instantiate:
+        type: tosca.datatypes.nfv.VnfInstantiateOperationConfiguration
       scale:
         type: tosca.datatypes.nfv.VnfScaleOperationConfiguration
       scale_to_level:
@@ -459,8 +464,12 @@ data_types:
       address_data:
         type: tosca.datatypes.nfv.AddressData
         required: false
-  #tosca.datatypes.nfv.VnfAdditionalConfigurableProperties:
-  #  derived_from: tosca.datatypes.Root
+  tosca.datatypes.nfv.VnfAdditionalConfigurableProperties:
+    derived_from: tosca.datatypes.Root
+    properties:
+      description:
+        type: string
+        required: false
   tosca.datatypes.nfv.VnfConfigurableProperties:
     derived_from: tosca.datatypes.Root
     properties:
@@ -470,19 +479,27 @@ data_types:
       is_autoheal_enabled:
         type: boolean
         required: false
-  #    additional_configurable_properties:
-  #      type: tosca.datatypes.nfv.VnfAdditionalConfigurableProperties
-  #      required: false
-  #tosca.datatypes.nfv.VnfInfoModifiableAttributesExtensions:
-  #  derived_from: tosca.datatypes.Root
-  #tosca.datatypes.nfv.VnfInfoModifiableAttributesMetadata:
-  #  derived_from: tosca.datatypes.Root
-  #tosca.datatypes.nfv.VnfInfoModifiableAttributes:
-  #  derived_from: tosca.datatypes.Root
-  #  properties:
-  #    extensions:
-  #      type: tosca.datatypes.nfv.VnfInfoModifiableAttributesExtensions
-  #      required: false
-  #    metadata:
-  #      type: tosca.datatypes.nfv.VnfInfoModifiableAttributesMetadata
-  #      required: false
+      additional_configurable_properties:
+        type: tosca.datatypes.nfv.VnfAdditionalConfigurableProperties
+        required: false
+  tosca.datatypes.nfv.VnfInfoModifiableAttributesExtensions:
+    derived_from: tosca.datatypes.Root
+    properties:
+      description:
+        type: string
+        required: false
+  tosca.datatypes.nfv.VnfInfoModifiableAttributesMetadata:
+    derived_from: tosca.datatypes.Root
+    properties:
+      description:
+        type: string
+        required: false
+  tosca.datatypes.nfv.VnfInfoModifiableAttributes:
+    derived_from: tosca.datatypes.Root
+    properties:
+      extensions:
+        type: tosca.datatypes.nfv.VnfInfoModifiableAttributesExtensions
+        required: false
+      metadata:
+        type: tosca.datatypes.nfv.VnfInfoModifiableAttributesMetadata
+        required: false
diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/nodes.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/nodes.yml
index f6a7c90b3c..369dfb0943 100644
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/nodes.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/nodes.yml
@@ -17,7 +17,7 @@ tosca_definitions_version: tosca_simple_yaml_1_1
 metadata:
   filename: onap/nodes.yml
   version: '1.0'
-  
+
 imports:
 - onap_index:
     file: _index.yml
@@ -142,21 +142,21 @@ node_types:
           type: string
         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
+        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
+        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.
+        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
+        type: map
+        entry_schema:
+          type: string
+        required: false
       user_data: #cloudinit userdata script support
         type: string
         required: false
@@ -174,17 +174,17 @@ node_types:
         - 0
         - 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:
-      sw_image:
-        file:
-        type: tosca.artifacts.nfv.SwImage
+      - 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
 
 
   tosca.nodes.nfv.Vdu.VirtualStorage:
@@ -211,10 +211,10 @@ node_types:
     capabilities:
       virtual_storage:
         type: tosca.capabilities.nfv.VirtualStorage
-    artifacts:
-      sw_image:
-        file:
-        type: tosca.artifacts.Deployment.Image
+    #artifacts: artifacts should be defined in template file instead of node type
+    #  sw_image:
+    #    file:
+    #    type: tosca.artifacts.Deployment.Image
 
   tosca.nodes.nfv.ext.zte.VNF:
     capabilities:
@@ -361,16 +361,16 @@ node_types:
       configurable_properties:
         type: tosca.datatypes.nfv.VnfConfigurableProperties
         required: false
-        #        modifiable_attributes:
-        #          type: tosca.datatypes.nfv.VnfInfoModifiableAttributes
-        #          required: false  # true in IFA011, but all of members are false. Align with the IM, it is false
+      modifiable_attributes:
+        type: tosca.datatypes.nfv.VnfInfoModifiableAttributes
+        required: false  # true in IFA011, but all of members are false. Align with the IM, it is false
       flavour_id:
         type: string
         required: true
       flavour_description:
         type: string
         required: true
-    capabilities:
+    #capabilities:
       # monitoring_parameter:
       # modelled as ad hoc capabilities in the VNF node template
     requirements:
@@ -383,7 +383,7 @@ node_types:
         - UNBOUNDED
     interfaces:
       Nfv:
-        type: tosca.interfaces.node.lifecycle.Standard
+        type: tosca.interfaces.nfv.vnf.lifecycle.Nfv
 
   tosca.nodes.nfv.VduCp:
     derived_from: tosca.nodes.nfv.Cp
diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/relationships.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/relationships.yml
index cad5e96e6c..ca74e8432e 100644
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/relationships.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/relationships.yml
@@ -23,14 +23,6 @@ imports:
     file: _index.yml
 
 relationship_types:
-  
-  tosca.relationships.nfv.VDU.AttachedTo:
-    derived_from: tosca.relationships.Root
-    properties:
-      location:
-        required: false
-        type: string
-
   tosca.relationships.nfv.VirtualBindsTo:
     derived_from: tosca.relationships.DependsOn
     valid_target_types:
@@ -39,4 +31,8 @@ relationship_types:
   tosca.relationships.nfv.VirtualLinksTo:
     derived_from: tosca.relationships.DependsOn
     valid_target_types:
-    - tosca.capabilities.nfv.VirtualLinkable
\ No newline at end of file
+    - tosca.capabilities.nfv.VirtualLinkable
+
+  tosca.relationships.nfv.Vdu.AttachedTo:
+    derived_from: tosca.relationships.DependsOn
+    valid_target_types: [ tosca.capabilities.nfv.VirtualStorage ]