R2 model updates

All model verification changes and updated in single patch.

Change-Id: Ie794dc141400490bf1a858a8d6c9d1c45e5b9443
Issue-ID: SDC-1253
Signed-off-by: Michael Lando <ml636r@att.com>

1 files changed, 61 insertions, 92 deletions

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 a1c4b486b6..37e4c5edb1 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
@@ -1,96 +1,65 @@
 tosca_definitions_version: tosca_simple_yaml_1_0_0
 node_types:
-  tosca.nodes.nfv.VDU.Compute:
-    derived_from: tosca.nodes.Root
-    properties:
-      configurable_properties:
-        type: map
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: tosca.datatypes.nfv.VnfcConfigurableProperties
-      name:
-        type: string
-        required: true
-        status: SUPPORTED
-      nfvi_constraints:
-        type: list
-        required: false
-        status: SUPPORTED
-        entry_schema:
+    tosca.nodes.nfv.Vdu.Compute:
+      derived_from: tosca.nodes.Root
+      properties:
+        name:
           type: string
-      descrption:
-        type: string
-        required: true
-        status: SUPPORTED
-      boot_order:
-        type: list
-        required: false
-        status: SUPPORTED
-        entry_schema:
+          required: true
+        description:
           type: string
-    attributes:
-      private_address:
-        type: string
-        status: SUPPORTED
-      public_address:
-        type: string
-        status: SUPPORTED
-      networks:
-        type: string
-        status: SUPPORTED
-      ports:
-        type: string
-        status: SUPPORTED
-    requirements:
-    - local_storage:
-        capability: tosca.capabilities.Attachment
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - virtual_storage:
-        capability: tosca.capabilities.nfv.VirtualStorage
-        occurrences:
-        - 0
-        - UNBOUNDED
-    capabilities:
-      scalable:
-        type: tosca.capabilities.Scalable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      virtual_compute:
-        type: tosca.capabilities.nfv.VirtualCompute
-        occurrences:
-        - 1
-        - UNBOUNDED
-      endpoint:
-        type: tosca.capabilities.Endpoint.Admin
-        occurrences:
-        - 1
-        - UNBOUNDED
-      os:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      virtual_binding:
-        type: tosca.capabilities.nfv.VirtualBindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      host:
-        type: tosca.capabilities.Container
-        occurrences:
-        - 1
-        - UNBOUNDED
-      binding:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      monitoring_parameter:
-        type: tosca.capabilities.nfv.Metric
-        occurrences:
-        - 1
-        - UNBOUNDED
\ No newline at end of file
+          required: true
+        boot_order:
+          type: map
+          entry_schema:
+            type: string
+          required: false
+        nfvi_constraints: 
+          type: map # Align with IM, it shoul be a array of KeyValuePair/NameValuePair
+          entry_schema:
+            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 
+        vdu_profile:         
+           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.
+        meta_data: #metadata attached to the VM or container
+           type: map
+           entry_schema:
+             type: string
+           required: false
+        user_data: #cloudinit userdata script support
+          type: string
+          required: false
+      capabilities:
+        virtual_compute:
+          type: tosca.capabilities.nfv.VirtualCompute
+        virtual_binding:
+          type: tosca.capabilities.nfv.VirtualBindable
+          occurrences:
+          - 1
+          - UNBOUNDED
+        monitoring_parameter:    
+          type: tosca.capabilities.nfv.Metric
+          occurrences:
+          - 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
\ No newline at end of file