Added new nodes type

Added new nodes type and new property in Port.
All test data need to be updated, so file count is much more.

Change-Id: Ic21befe8d7feee912fbed1d3eb676488db1fb68c
Issue-ID: SDC-1183
Signed-off-by: siddharth0905 <siddharth.singh4@amdocs.com>

1 files changed, 31 insertions, 53 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
index cb4c190ae4..ff3411cb33 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
@@ -2,38 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0
 metadata:
   template_name: Main
 imports:
-- CommonGlobalTypes:
-    file: CommonGlobalTypesServiceTemplate.yaml
-- NovaServerGlobalTypes:
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-- NeutronPortGlobalTypes:
-    file: NeutronPortGlobalTypesServiceTemplate.yaml
-- NeutronSecurityRulesGlobalTypes:
-    file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
-- NeutronNetGlobalTypes:
-    file: NeutronNetGlobalTypesServiceTemplate.yaml
-- CinderVolumeGlobalTypes:
-    file: CinderVolumeGlobalTypesServiceTemplate.yaml
-- ContrailVirtualNetworkGlobalType:
-    file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
-- ContrailNetworkRuleGlobalType:
-    file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
-- AbstractSubstituteGlobalTypes:
-    file: AbstractSubstituteGlobalTypesServiceTemplate.yaml
-- ContrailV2VirtualMachineInterfaceGlobalType:
-    file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml
-- ContrailComputeGlobalTypes:
-    file: ContrailComputeGlobalTypesServiceTemplate.yaml
-- ContrailPortGlobalTypes:
-    file: ContrailPortGlobalTypesServiceTemplate.yaml
-- ContrailAbstractSubstituteGlobalTypes:
-    file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml
-- ContrailV2VirtualNetworkGlobalType:
-    file: ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml
-- ContrailV2NetworkRuleGlobalType:
-    file: ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml
-- ContrailV2VLANSubInterfaceGlobalType:
-    file: ContrailV2VLANSubInterfaceGlobalTypeServiceTemplate.yaml
+- openecomp_heat_index:
+    file: openecomp-heat/_index.yml
 - GlobalSubstitutionTypes:
     file: GlobalSubstitutionTypesServiceTemplate.yaml
 node_types:
@@ -44,15 +14,39 @@ topology_template:
     contrail_net_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: contrail_net_name
       type: string
       description: network name of jsa log network
     jsa_net_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: jsa_net_name
       type: string
     jsa_name:
       hidden: false
       immutable: false
+      annotations:
+        source:
+          type: org.openecomp.annotations.Source
+          properties:
+            vf_module_label:
+            - main
+            source_type: HEAT
+            param_name: jsa_name
       type: string
       description: network name of jsa log network
   node_templates:
@@ -77,23 +71,11 @@ topology_template:
           capability: tosca.capabilities.network.Linkable
           node: test_contrailV2_net
           relationship: tosca.relationships.network.LinksTo
-      - link_template_Vlan_1:
-          capability: tosca.capabilities.network.Linkable
-          node: test_net
-          relationship: tosca.relationships.network.LinksTo
       - link_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level:
           capability: tosca.capabilities.network.Linkable
           node: test_net
           relationship: tosca.relationships.network.LinksTo
-      - link_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level:
-          capability: tosca.capabilities.network.Linkable
-          node: test_net
-          relationship: tosca.relationships.network.LinksTo
-      - link_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level:
-          capability: tosca.capabilities.network.Linkable
-          node: test_net
-          relationship: tosca.relationships.network.LinksTo
-      - link_template_Vlan_4_test_nested4Level_test_nested3Level_test_nested2Level:
+      - subinterface_link_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level_test_nested2Level:
           capability: tosca.capabilities.network.Linkable
           node: test_net
           relationship: tosca.relationships.network.LinksTo
@@ -101,7 +83,7 @@ topology_template:
           capability: tosca.capabilities.network.Linkable
           node: test_net
           relationship: tosca.relationships.network.LinksTo
-      - link_template_Vlan_3_test_nested3Level_test_nested2Level:
+      - link_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level:
           capability: tosca.capabilities.network.Linkable
           node: test_net
           relationship: tosca.relationships.network.LinksTo
@@ -113,10 +95,6 @@ topology_template:
           capability: tosca.capabilities.network.Linkable
           node: test_contrailV2_net
           relationship: tosca.relationships.network.LinksTo
-      - link_template_Vlan_2_test_nested2Level:
-          capability: tosca.capabilities.network.Linkable
-          node: test_contrailV2_net
-          relationship: tosca.relationships.network.LinksTo
     test_resourceGroup:
       type: org.openecomp.resource.abstract.nodes.heat.nested3
       directives:
@@ -138,15 +116,15 @@ topology_template:
           - service_template_filter
           - index_value
       requirements:
-      - link_template_VMInt_OAM_lb_8_test_nested4Level:
+      - subinterface_link_template_subint_oam_vmi_4_test_nested4Level:
           capability: tosca.capabilities.network.Linkable
           node: test_contrailV2_net
           relationship: tosca.relationships.network.LinksTo
-      - link_template_Vlan_4_test_nested4Level:
+      - link_template_VMInt_OAM_lb_6:
           capability: tosca.capabilities.network.Linkable
           node: test_contrailV2_net
           relationship: tosca.relationships.network.LinksTo
-      - link_template_VMInt_OAM_lb_6:
+      - link_template_VMInt_OAM_lb_8:
           capability: tosca.capabilities.network.Linkable
           node: test_contrailV2_net
           relationship: tosca.relationships.network.LinksTo