From 8efb15270421833ffea495c8769b30b998d88577 Mon Sep 17 00:00:00 2001
From: liang ding <liang.ding@intel.com>
Date: Fri, 3 Aug 2018 01:26:04 -0700
Subject: 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>
---
 .../import/tosca/data-types/dataTypes.yml          | 41 ++++++++++++++--------
 1 file changed, 27 insertions(+), 14 deletions(-)

(limited to 'catalog-be/src/main/resources/import/tosca/data-types')

diff --git a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
index 169ecb0552..0a8a37bf73 100644
--- a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
@@ -1399,6 +1399,7 @@ tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements:
       required: true
     requirement:
       type: string      # not specified
+      required: false
     network_interface_requirements:
       type: map
       entry_schema:
@@ -1448,11 +1449,13 @@ tosca.datatypes.nfv.L3AddressData:
         type: string
       required: false
 tosca.datatypes.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
@@ -1556,7 +1559,7 @@ tosca.datatypes.nfv.VduProfile:
       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:
@@ -1577,6 +1580,8 @@ tosca.datatypes.nfv.Qos:
       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
@@ -1752,16 +1757,24 @@ tosca.datatypes.nfv.VnfConfigurableProperties:
 #    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
+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
-- 
cgit 1.2.3-korg