[SDC-29] Amdocs OnBoard 1707 initial commit.

Change-Id: Ie4d12a3f574008b792899b368a0902a8b46b5370
Signed-off-by: AviZi <avi.ziv@amdocs.com>

1 files changed, 12 insertions, 64 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml
index a762422392..0ef23f2905 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml
@@ -2,43 +2,12 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0
 metadata:
   template_name: Main
 imports:
-  ContrailComputeGlobalTypes:
-    file: ContrailComputeGlobalTypesServiceTemplate.yaml
-  CinderVolumeGlobalTypes:
-    file: CinderVolumeGlobalTypesServiceTemplate.yaml
-  ContrailVirtualNetworkGlobalType:
-    file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
-  AbstractSubstituteGlobalTypes:
-    file: AbstractSubstituteGlobalTypesServiceTemplate.yaml
-  ContrailPortGlobalTypes:
-    file: ContrailPortGlobalTypesServiceTemplate.yaml
-  GlobalSubstitutionTypes:
+- openecomp_heat_index:
+    file: openecomp-heat/_index.yml
+- GlobalSubstitutionTypes:
     file: GlobalSubstitutionTypesServiceTemplate.yaml
-  NeutronPortGlobalTypes:
-    file: NeutronPortGlobalTypesServiceTemplate.yaml
-  NeutronNetGlobalTypes:
-    file: NeutronNetGlobalTypesServiceTemplate.yaml
-  CommonGlobalTypes:
-    file: CommonGlobalTypesServiceTemplate.yaml
-  ContrailAbstractSubstituteGlobalTypes:
-    file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml
-  ContrailNetworkRuleGlobalType:
-    file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
-  NeutronSecurityRulesGlobalTypes:
-    file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
-  NovaServerGlobalTypes:
-    file: NovaServerGlobalTypesServiceTemplate.yaml
-  ContrailV2VirtualMachineInterfaceGlobalType:
-    file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml
-node_types:
-  org.openecomp.resource.vfc.nodes.heat.jsa:
-    derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    shared_test_nova:
-      hidden: false
-      immutable: false
-      type: string
     shared_network_id1:
       hidden: false
       immutable: false
@@ -54,20 +23,7 @@ topology_template:
       immutable: false
       type: string
       description: network name of jsa log network
-    jsa_name:
-      hidden: false
-      immutable: false
-      type: string
   node_templates:
-    test_nestedInvalidConnectionToNetwork:
-      type: org.openecomp.resource.abstract.nodes.heat.nested1
-      directives:
-      - substitutable
-      properties:
-        service_template_filter:
-          substitute_service_template: nested1ServiceTemplate.yaml
-        shared_network_id1:
-          get_input: shared_test_nova
     test_net2:
       type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
       properties:
@@ -142,31 +98,23 @@ topology_template:
           capability: tosca.capabilities.network.Linkable
           node: test_net1
           relationship: tosca.relationships.network.LinksTo
-    test_nova:
-      type: org.openecomp.resource.vfc.nodes.heat.jsa
-      properties:
-        image: image
-        name:
-          get_input: jsa_name
   groups:
-    addOn:
+    main_group:
       type: org.openecomp.groups.heat.HeatStack
       properties:
-        heat_file: ../Artifacts/addOn.yml
+        heat_file: ../Artifacts/main.yml
         description: |
           Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
       members:
-      - test_nestedInvalidConnectionToNetwork
-      - test_nested2
-      - test_nested3
-      - test_nested1
-    main:
+      - test_net2
+      - test_net1
+    addOn_group:
       type: org.openecomp.groups.heat.HeatStack
       properties:
-        heat_file: ../Artifacts/main.yml
+        heat_file: ../Artifacts/addOn.yml
         description: |
           Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
       members:
-      - test_net2
-      - test_net1
-      - test_nova
\ No newline at end of file
+      - test_nested2
+      - test_nested3
+      - test_nested1
\ No newline at end of file