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>

6 files changed, 51 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 b647651990..384b7e1248 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
@@ -233,9 +233,11 @@ tosca.capabilities.nfv.VirtualCompute:
     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:
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
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/VNF/VNF.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/VNF/VNF.yml
index f0800a8de3..5eeedba2a9 100644
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/VNF/VNF.yml
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/VNF/VNF.yml
@@ -40,16 +40,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:
@@ -62,4 +62,4 @@ node_types:
             - UNBOUNDED
       interfaces:
         Nfv:
-          type: tosca.interfaces.node.lifecycle.Standard
+          type: tosca.interfaces.nfv.vnf.lifecycle.Nfv
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.yml
index 37e4c5edb1..64bf536a0d 100644
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.yml
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.yml
@@ -55,11 +55,11 @@ node_types:
         - virtual_storage:
             capability: tosca.capabilities.nfv.VirtualStorage
             relationship: tosca.relationships.nfv.Vdu.AttachedTo
-            node: tosca.nodes.nfv.VDU.VirtualStorage
+            node: tosca.nodes.nfv.Vdu.VirtualStorage
             occurences:
             - 0
             - UNBOUNDED
-      artifacts:   
-        - sw_image:
-            file:   
-            type: tosca.artifacts.nfv.SwImage
\ No newline at end of file
+      #artifacts: artifacts should be defined in template file instead of node type  
+      #  - sw_image:
+      #      file:   
+      #      type: tosca.artifacts.nfv.SwImage
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.yml
index 12fb306c16..2b3c1dc055 100644
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.yml
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.yml
@@ -24,7 +24,7 @@ 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
diff --git a/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.yml b/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.yml
index 2ed8c0e785..4506fa1b97 100644
--- a/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.yml
@@ -126,4 +126,8 @@ tosca.relationships.nfv.VirtualBindsTo:
 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 ]