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