Add support of interface in TOSCA datatypes

Move all interface functionality from DataModelUtil class to TOSCA datatype relevant class

Change-Id: Ifea22b60e9a71fe024e87f9987a749e9d56aad82
Issue-ID: SDC-1781
Signed-off-by: shiria <shiri.amichai@amdocs.com>

1 files changed, 66 insertions, 41 deletions

diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateInterfaceInheritanceTest.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateInterfaceInheritanceTest.yaml
index 4abc7ca681..17cfe33592 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateInterfaceInheritanceTest.yaml
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateInterfaceInheritanceTest.yaml
@@ -39,11 +39,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.cmaui_image
     interfaces:
       Standard:
+        type: amdocs.interfaces.interfaceNoOper
         inputs:
           url_path:
             type: string
             required: false
-        type: tosca.interfaces.node.lifecycle.Standard
         create:
           inputs:
             peeringSessions:
@@ -55,6 +55,21 @@ node_types:
             time:
               type: string
 
+
+  org.openecomp.resource.vfc.nodes.heat.cmaui_image_interfaceTest:
+    derived_from: org.openecomp.resource.vfc.nodes.heat.cmaui_image
+    interfaces:
+      Standard:
+        type: amdocs.interfaces.interfaceInheritance
+        inputs:
+          url_path:
+            type: string
+            required: false
+        newOper:
+          inputs:
+            name:
+              type: string
+
 data_types:
   org.openecomp.datatypes.heat.network.MyAddressPair:
     derived_from: org.openecomp.datatypes.heat.network.AddressPair
@@ -81,6 +96,16 @@ data_types:
         status: SUPPORTED
         required: true
         default: overridden default value
+interface_types:
+  amdocs.interfaces.interfaceNoOper:
+    derived_from: tosca.interfaces.node.lifecycle.Standard
+
+  amdocs.interfaces.interfaceInheritance:
+    derived_from: tosca.interfaces.node.lifecycle.Standard
+    newOper:
+      description: new operation
+
+
 topology_template:
   inputs:
     cmaui_names:
@@ -148,48 +173,48 @@ topology_template:
           node: server_cmaui
           relationship: tosca.relationships.network.BindsTo
     cmaui1_port_1:
-          type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-          properties:
-            replacement_policy: AUTO
-            security_groups:
-            - get_input: security_group_name
-            fixed_ips:
-            - subnet: subnetNameVal
-              ip_address:
-                get_input:
-                - cmaui_oam_ips
-                - 1
-            - subnet: subnetNameVal2
-              ip_address:
-                get_input:
-                - cmaui_oam_ips
-                - 1
-            network: jsa_net
-          requirements:
-          - link:
-              capability: tosca.capabilities.network.Linkable
-              node: jsa_net1
-              relationship: tosca.relationships.network.LinksTo
-          - link:
-              capability: tosca.capabilities.network.Linkable
-              node: jsa_net2
-              relationship: tosca.relationships.network.LinksTo
-          - binding:
-              capability: tosca.capabilities.network.Bindable
-              node: server_cmaui
-              relationship: tosca.relationships.network.BindsTo
+      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+      properties:
+        replacement_policy: AUTO
+        security_groups:
+        - get_input: security_group_name
+        fixed_ips:
+        - subnet: subnetNameVal
+          ip_address:
+            get_input:
+            - cmaui_oam_ips
+            - 1
+        - subnet: subnetNameVal2
+          ip_address:
+            get_input:
+            - cmaui_oam_ips
+            - 1
+        network: jsa_net
+      requirements:
+      - link:
+          capability: tosca.capabilities.network.Linkable
+          node: jsa_net1
+          relationship: tosca.relationships.network.LinksTo
+      - link:
+          capability: tosca.capabilities.network.Linkable
+          node: jsa_net2
+          relationship: tosca.relationships.network.LinksTo
+      - binding:
+          capability: tosca.capabilities.network.Bindable
+          node: server_cmaui
+          relationship: tosca.relationships.network.BindsTo
     jsa_net1:
-          type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
-          properties:
-            shared: true
-            network_name:
-              get_input: jsa_net_name
+      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
+      properties:
+        shared: true
+        network_name:
+          get_input: jsa_net_name
     jsa_net2:
-              type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
-              properties:
-                shared: true
-                network_name:
-                  get_input: jsa_net_name
+      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
+      properties:
+        shared: true
+        network_name:
+          get_input: jsa_net_name
   groups:
     nested:
       type: org.openecomp.groups.heat.HeatStack