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>

1 files changed, 217 insertions, 64 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/nodes.yml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/nodes.yml
index dad7feb604..7c5c453afa 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/nodes.yml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/nodes.yml
@@ -1005,41 +1005,59 @@ node_types:
         - 0
         - UNBOUNDED
 
-  tosca.nodes.nfv.VDU.Compute:
-    attributes:
-      private_address:
-        type: string
-      public_address:
-        type: string
-      networks:
-        type: string
-      ports:
-        type: string
+  tosca.nodes.nfv.Vdu.Compute:
+    #attributes:
+    #  private_address:
+    #    type: string
+    #  public_address:
+    #    type: string
+    #  networks:
+    #    type: string
+    #  ports:
+    #    type: string
     capabilities:
-      scalable:
-        type: tosca.capabilities.Scalable
+      #scalable:
+      #  type: tosca.capabilities.Scalable
       virtual_compute:
         type: tosca.capabilities.nfv.VirtualCompute
-      endpoint:
-        type: tosca.capabilities.Endpoint.Admin
-      os:
-        type: tosca.capabilities.OperatingSystem
+      #endpoint:
+      #  type: tosca.capabilities.Endpoint.Admin
+      #os:
+      #  type: tosca.capabilities.OperatingSystem
       virtual_binding:
         type: tosca.capabilities.nfv.VirtualBindable
-      host:
-        type: tosca.capabilities.Container
-      binding:
-        type: tosca.capabilities.network.Bindable
+        occurrences: [1, UNBOUNDED]
+      #host:
+      #  type: tosca.capabilities.Container
+      #binding:
+      #  type: tosca.capabilities.network.Bindable
       monitoring_parameter:
         type: tosca.capabilities.nfv.Metric
+        occurrences: [0, UNBOUNDED]
     derived_from: tosca.nodes.Root
     properties:
+      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
+      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
       configurable_properties:
         entry_schema:
           type: tosca.datatypes.nfv.VnfcConfigurableProperties
         type: map
+        required: true
       name:
         type: string
+        required: true
       nfvi_constraints:
         entry_schema:
           type: string
@@ -1047,38 +1065,78 @@ node_types:
         type: list
       descrption:
         type: string
+        required: true
       boot_order:
         entry_schema:
           type: string
         required: false
         type: list
     requirements:
-    - local_storage:
-        capability: tosca.capabilities.Attachment
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - virtual_storage:
-        capability: tosca.capabilities.nfv.VirtualStorage
-        occurrences:
-        - 0
-        - UNBOUNDED
+    #- local_storage:
+    #    capability: tosca.capabilities.Attachment
+    #    occurrences:
+    #    - 0
+    #    - UNBOUNDED
+      - virtual_storage:
+          capability: tosca.capabilities.nfv.VirtualStorage
+          relationship: tosca.relationships.nfv.Vdu.AttachedTo
+          node: tosca.nodes.nfv.VDU.VirtualStorage
+          occurences: [ 0, UNBOUNDED ]
 
-  tosca.nodes.nfv.VDU.VirtualStorage:
+  tosca.nodes.nfv.Vdu.VirtualStorage:
     capabilities:
       virtual_storage:
         type: tosca.capabilities.nfv.VirtualStorage
     derived_from: tosca.nodes.Root
     properties:
-      id:
-        type: string
+      #id:
+      #  type: string
       size_of_storage:
-        type: string
+        type: scalar-unit.size
+        required: true
+      vdu_storage_requirements:
+        type: map
+        entry_schema:
+          type: string
+        required: false
       rdma_enabled:
         required: false
         type: boolean
       type_of_storage:
         type: string
+        constraints:
+          - valid_values: [volume, object, root, block]
+        required: true
+
+  tosca.nodes.nfv.Cp:
+    derived_from: tosca.nodes.Root
+    properties:
+      layer_protocol:
+        type: list
+        entry_schema:
+          constraints:
+            - valid_values: [ethernet, mpls, odu2, ipv4, ipv6, pseudo_wire ]
+          type: string
+        required: true
+      role: #Name in ETSI NFV IFA011 v0.7.3 cpRole
+        type: string
+        constraints:
+          - valid_values: [ root, leaf ]
+        required: false
+      description:
+        type: string
+        required: false
+      protocol_data:
+        type: list
+        entry_schema:
+          type: tosca.datatypes.nfv.CpProtocolData
+        required: true
+      trunk_mode:
+        type: boolean
+        required: true
+      allowedAddressData: # Aligned with ONAP R2 Im.not defined in IFA011 v2.4.1 and SOL001 v0.6.0
+        type: tosca.datatypes.nfv.AddressData
+        required: false
 
   tosca.nodes.nfv.VduCpd:
     derived_from: tosca.nodes.Root
@@ -1088,45 +1146,140 @@ node_types:
           type: tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements
         required: false
         type: list
-      role:
-        constraints:
-        - valid_values:
-          - root
-          - leaf
-        required: false
-        type: string
+      #role:
+      #  constraints:
+      #  - valid_values:
+      #    - root
+      #    - leaf
+      #  required: false
+      #  type: string
       bitrate_requirement:
         required: false
         type: integer
-      description:
+      #description:
+      #  required: false
+      #  type: string
+      #layer_protocol:
+      #  constraints:
+      #  - valid_values:
+      #    - ethernet
+      #    - mpls
+      #    - odu2
+      #    - ipv4
+      #    - ipv6
+      #    - pseudo_wire
+      #  type: string
+      #address_data:
+      #  entry_schema:
+      #    type: tosca.datatype.nfv.AddressData
+      #  required: false
+      #  type: list
+      vnic_name: #  Aligned with ONAP R2 Im.not defined in IFA011 v2.4.1 and SOL001 v0.6.0
+        type: string
+        required: false
+      vnic_order: # Aligned with ONAP R2 Im. not defined in IFA011 v2.4.1 and SOL001 v0.6.0
+        type: integer
         required: false
+      vnic_type: # Aligned with ONAP R2 Im. not defined in IFA011 v2.4.1 and SOL001 v0.6.0
         type: string
-      layer_protocol:
         constraints:
-        - valid_values:
-          - ethernet
-          - mpls
-          - odu2
-          - ipv4
-          - ipv6
-          - pseudo_wire
-        type: string
-      address_data:
+          - valid_values: [normal, macvtap, direct, baremetal, direct-physical, virtio-forwarder]
+        required: false
+    requirements:
+      - virtual_binding:
+          capability: tosca.capabilities.nfv.VirtualBindable
+          relationship: tosca.relationships.nfv.VirtualBindsTo
+          node: tosca.nodes.nfv.Vdu.Compute
+      - virtual_link:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          node: tosca.nodes.nfv.VnfVirtualLink
+
+  tosca.nodes.nfv.VnfVirtualLink:
+    derived_from: tosca.nodes.Root
+    properties:
+      connectivity_type:
+        type: tosca.datatypes.nfv.ConnectivityType
+        required: true
+      description:
+        type: string
+        required: false
+      test_access:
+        type: list
         entry_schema:
-          type: tosca.datatype.nfv.AddressData
+          type: string
+        required: false
+      vl_profile:
+        type: tosca.datatypes.nfv.VlProfile
+        required: true
+    capabilities:
+      monitoring_parameter:
+        type: tosca.capabilities.nfv.Metric
+        occurrences: [0, UNBOUNDED]
+      virtual_linkable:
+        type: tosca.capabilities.nfv.VirtualLinkable
+
+  tosca.nodes.nfv.VNF:
+    derived_from: tosca.nodes.Root
+    properties:
+      descriptor_id: # instead of vnfd_id
+        type: string # GUID
+        required: true
+      descriptor_version: # instead of vnfd_version
+        type: string
+        required: true
+      provider: # instead of vnf_provider
+        type: string
+        required: true
+      product_name: # instead of vnf_product_name
+        type: string
+        required: true
+      software_version: # instead of vnf_software_version
+        type: string
+        required: true
+      product_info_name: # instead of vnf_product_info_name
+        type: string
+        required: false
+      product_info_description: # instead of vnf_product_info_description
+        type: string
         required: false
+      vnfm_info:
         type: list
+        entry_schema:
+          type: string
+        required: true
+      localization_languages:
+        type: list
+        entry_schema:
+          type: string
+        required: false
+      default_localization_language:
+        type: string
+        required: false
+      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
+      flavour_id:
+        type: string
+        required: true
+      flavour_description:
+        type: string
+        required: true
+    #capabilities:
+      # monitoring_parameter:
+        # modelled as ad hoc capabilities in the VNF node template
     requirements:
-    - virtual_binding:
-        capability: tosca.capabilities.nfv.VirtualBindable
-        occurrences:
-        - 0
-        - UNBOUNDED
-    - virtual_link:
-        capability: tosca.capabilities.nfv.VirtualBindable
-        occurrences:
-        - 0
-        - UNBOUNDED
+      - virtual_link:
+          capability: tosca.capabilities.nfv.VirtualLinkable
+          relationship: tosca.relationships.nfv.VirtualLinksTo
+          node: tosca.nodes.nfv.VnfVirtualLink
+          occurrences: [ 0, UNBOUNDED ]
+    interfaces:
+      Nfv:
+        type: tosca.interfaces.nfv.vnf.lifecycle.Nfv
   tosca.nodes.nfv.ext.ImageFile:
     capabilities:
       guest_os:
@@ -1463,4 +1616,4 @@ node_types:
         required: false
         type: list
       connectivity_type:
-        type: tosca.datatypes.nfv.ConnectivityType
\ No newline at end of file
+        type: tosca.datatypes.nfv.ConnectivityType