[SDC-29] Amdocs OnBoard 1707 initial commit.

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

1 files changed, 14 insertions, 38 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/oneServiceInstance/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/oneServiceInstance/expectedoutputfiles/MainServiceTemplate.yaml
index 016e4d3f70..7b2ef898db 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/oneServiceInstance/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/oneServiceInstance/expectedoutputfiles/MainServiceTemplate.yaml
@@ -2,34 +2,10 @@ 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
 topology_template:
   inputs:
     protected_net:
@@ -93,12 +69,6 @@ topology_template:
       type: float
       description: Start of dst port
       default: -1
-    st_flavor:
-      hidden: false
-      immutable: false
-      type: string
-      description: Flavor
-      default: lc.medium
     st_scaling:
       hidden: false
       immutable: false
@@ -133,6 +103,12 @@ topology_template:
       type: string
       description: Direction of Policy
       default: <>
+    st_flavor_name:
+      hidden: false
+      immutable: false
+      type: string
+      description: Flavor
+      default: lc.medium
     st_name:
       hidden: false
       immutable: false
@@ -205,11 +181,11 @@ topology_template:
           get_input: st_name
         ordered_interfaces: true
         flavor:
-          get_input: st_flavor
+          get_input: st_flavor_name
         image_name:
           get_input: st_image
         service_template_filter:
-          substitute_service_template: service_instanceServiceTemplate.yaml
+          substitute_service_template: lcp1_mss.oam-fw_si_service_instanceServiceTemplate.yaml
           count: 5
           scaling_enabled:
             get_input: st_scaling
@@ -233,6 +209,8 @@ topology_template:
           - get_input: st_service_interface_type_list
           - ','
           - 3
+        service_instance_name:
+          get_input: service_instance_name
         interface_list:
         - virtual_network:
             get_input: oam_mgmt_net_id
@@ -245,8 +223,6 @@ topology_template:
             get_input: oam_direct_net_id
         - virtual_network:
             get_input: oam_hsl_net_id
-        service_instance_name:
-          get_input: service_instance_name
         service_mode:
           get_input: st_mode
         shared_ip_list:
@@ -289,7 +265,7 @@ topology_template:
           node: service_instance
           relationship: tosca.relationships.DependsOn
   groups:
-    lcp1_mss.oam-fw_si:
+    lcp1_mss.oam-fw_si_group:
       type: org.openecomp.groups.heat.HeatStack
       properties:
         heat_file: ../Artifacts/lcp1_mss.oam-fw_si.yaml