[SDC-29] Amdocs OnBoard 1707 initial commit.

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

7 files changed, 0 insertions, 1022 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkNested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkNested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
deleted file mode 100644
index a11b54226b..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkNested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml
+++ /dev/null
@@ -1,154 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
-  template_name: GlobalSubstitutionTypes
-imports:
-  ContrailComputeGlobalTypes:
-    file: ContrailComputeGlobalTypesServiceTemplate.yaml
-  CinderVolumeGlobalTypes:
-    file: CinderVolumeGlobalTypesServiceTemplate.yaml
-  ContrailVirtualNetworkGlobalType:
-    file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
-  AbstractSubstituteGlobalTypes:
-    file: AbstractSubstituteGlobalTypesServiceTemplate.yaml
-  ContrailPortGlobalTypes:
-    file: ContrailPortGlobalTypesServiceTemplate.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.st_image:
-    derived_from: org.openecomp.resource.vfc.nodes.heat.contrail.Compute
-  org.openecomp.resource.abstract.nodes.heat.service_template:
-    derived_from: org.openecomp.resource.abstract.nodes.contrail.AbstractSubstitute
-    requirements:
-    - link_port_0:
-        capability: tosca.capabilities.network.Linkable
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-  org.openecomp.resource.abstract.nodes.heat.OCS-fw:
-    derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
-    properties:
-      service_policy_name:
-        type: string
-        description: Policy Name
-      st_static_routes_list:
-        type: string
-        description: List of static routes enabled-disabled
-      st_type:
-        type: string
-        description: service type
-      st_service_interface_type_list:
-        type: string
-        description: List of interface types
-      st_mode:
-        type: string
-        description: service mode
-      Cricket_OCS_protected_net_id:
-        type: string
-        description: Name of Cricket OCS network
-      oam_mgmt_net_0_id:
-        type: string
-        description: Name of OAM network
-      start_dst_ports:
-        type: float
-        description: Start of dst port
-      st_flavor:
-        type: string
-        description: Flavor
-      availability_zone_1:
-        type: string
-        description: availability zone
-      service_instance_name:
-        type: string
-        description: Service instance name
-      st_scaling:
-        type: string
-        description: Indicates whether service scaling is enabled
-      max_num_fw_instances:
-        type: float
-        description: maximum number of firewall instances for scaling
-      start_src_ports:
-        type: float
-        description: Start of src port
-      service_policy_direction:
-        type: string
-        description: Direction of Policy
-      st_name:
-        type: string
-        description: Name of service template
-      hsl_direct_net3:
-        type: string
-      hsl_direct_net4:
-        type: string
-      HSL_direct_net_gateway:
-        type: string
-        description: HSL (Logging) network gateway address
-      hsl_direct_net1:
-        type: string
-      hsl_direct_net2:
-        type: string
-      st_image:
-        type: string
-        description: Name of the image
-      st_shared_ip_list:
-        type: string
-        description: List of shared ip enabled-disabled
-      Cricket_OCS_direct_net_id:
-        type: string
-        description: Name of Cricket OCS network
-      network_param:
-        type: string
-      end_src_ports:
-        type: float
-        description: End of src port
-      end_dst_ports:
-        type: float
-        description: End of dst port
-      HSL_direct_net_id:
-        type: string
-        description: Name of HSL (Logging) network
-      HSL_direct_net_cidr:
-        type: string
-        description: HSL (Logging) network address (CIDR notation)
-    requirements:
-    - link_port_0_service_instance:
-        capability: tosca.capabilities.network.Linkable
-        node: tosca.nodes.Root
-        relationship: tosca.relationships.network.LinksTo
-        occurrences:
-        - 1
-        - 1
-    - network_service_policy:
-        capability: tosca.capabilities.Attachment
-        node: tosca.nodes.network.Network
-        relationship: org.openecomp.relationships.AttachesTo
-        occurrences:
-        - 0
-        - UNBOUNDED
-    capabilities:
-      link_hsl_direct_net:
-        type: tosca.capabilities.network.Linkable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      attachment_hsl_direct_net:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkNested/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkNested/expectedoutputfiles/MainServiceTemplate.yaml
deleted file mode 100644
index 53ecba9888..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkNested/expectedoutputfiles/MainServiceTemplate.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
-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:
-    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:
-    Internal1_shared:
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_forwarding_mode:
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_net_name:
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_forwarding_mode:
-      hidden: false
-      immutable: false
-      type: string
-    Internal2_shared:
-      hidden: false
-      immutable: false
-      type: string
-    Internal1_net_name:
-      hidden: false
-      immutable: false
-      type: string
-  node_templates:
-    Internal1-net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-      properties:
-        shared:
-          get_input: Internal1_shared
-        forwarding_mode:
-          get_input: Internal1_forwarding_mode
-        network_name:
-          get_input: Internal1_net_name
-    test_nested:
-      type: org.openecomp.resource.abstract.nodes.heat.OCS-fw
-      directives:
-      - substitutable
-      properties:
-        service_template_filter:
-          substitute_service_template: OCS-fwServiceTemplate.yaml
-        network_param: Internal1-net
-      requirements:
-      - link_port_0:
-          capability: tosca.capabilities.network.Linkable
-          node: Internal1-net
-          relationship: tosca.relationships.network.LinksTo
-  groups:
-    main:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/main.yml
-        description: ASC External Networks Template
-      members:
-      - Internal1-net
-      - test_nested
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkNested/expectedoutputfiles/OCS-fwServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkNested/expectedoutputfiles/OCS-fwServiceTemplate.yaml
deleted file mode 100644
index 1f504169ab..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkNested/expectedoutputfiles/OCS-fwServiceTemplate.yaml
+++ /dev/null
@@ -1,294 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
-  template_name: OCS-fw
-imports:
-  ContrailComputeGlobalTypes:
-    file: ContrailComputeGlobalTypesServiceTemplate.yaml
-  CinderVolumeGlobalTypes:
-    file: CinderVolumeGlobalTypesServiceTemplate.yaml
-  ContrailVirtualNetworkGlobalType:
-    file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
-  AbstractSubstituteGlobalTypes:
-    file: AbstractSubstituteGlobalTypesServiceTemplate.yaml
-  ContrailPortGlobalTypes:
-    file: ContrailPortGlobalTypesServiceTemplate.yaml
-  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:
-    service_policy_name:
-      hidden: false
-      immutable: false
-      type: string
-      description: Policy Name
-    st_static_routes_list:
-      hidden: false
-      immutable: false
-      type: string
-      description: List of static routes enabled-disabled
-    st_type:
-      hidden: false
-      immutable: false
-      type: string
-      description: service type
-    st_service_interface_type_list:
-      hidden: false
-      immutable: false
-      type: string
-      description: List of interface types
-    st_mode:
-      hidden: false
-      immutable: false
-      type: string
-      description: service mode
-    Cricket_OCS_protected_net_id:
-      hidden: false
-      immutable: false
-      type: string
-      description: Name of Cricket OCS network
-    oam_mgmt_net_0_id:
-      hidden: false
-      immutable: false
-      type: string
-      description: Name of OAM network
-    start_dst_ports:
-      hidden: false
-      immutable: false
-      type: float
-      description: Start of dst port
-    st_flavor:
-      hidden: false
-      immutable: false
-      type: string
-      description: Flavor
-    availability_zone_1:
-      hidden: false
-      immutable: false
-      type: string
-      description: availability zone
-    service_instance_name:
-      hidden: false
-      immutable: false
-      type: string
-      description: Service instance name
-    st_scaling:
-      hidden: false
-      immutable: false
-      type: string
-      description: Indicates whether service scaling is enabled
-    max_num_fw_instances:
-      hidden: false
-      immutable: false
-      type: float
-      description: maximum number of firewall instances for scaling
-    start_src_ports:
-      hidden: false
-      immutable: false
-      type: float
-      description: Start of src port
-    service_policy_direction:
-      hidden: false
-      immutable: false
-      type: string
-      description: Direction of Policy
-    st_name:
-      hidden: false
-      immutable: false
-      type: string
-      description: Name of service template
-    hsl_direct_net3:
-      hidden: false
-      immutable: false
-      type: string
-    hsl_direct_net4:
-      hidden: false
-      immutable: false
-      type: string
-    HSL_direct_net_gateway:
-      hidden: false
-      immutable: false
-      type: string
-      description: HSL (Logging) network gateway address
-    hsl_direct_net1:
-      hidden: false
-      immutable: false
-      type: string
-    hsl_direct_net2:
-      hidden: false
-      immutable: false
-      type: string
-    st_image:
-      hidden: false
-      immutable: false
-      type: string
-      description: Name of the image
-    st_shared_ip_list:
-      hidden: false
-      immutable: false
-      type: string
-      description: List of shared ip enabled-disabled
-    Cricket_OCS_direct_net_id:
-      hidden: false
-      immutable: false
-      type: string
-      description: Name of Cricket OCS network
-    network_param:
-      hidden: false
-      immutable: false
-      type: string
-    end_src_ports:
-      hidden: false
-      immutable: false
-      type: float
-      description: End of src port
-    end_dst_ports:
-      hidden: false
-      immutable: false
-      type: float
-      description: End of dst port
-    HSL_direct_net_id:
-      hidden: false
-      immutable: false
-      type: string
-      description: Name of HSL (Logging) network
-    HSL_direct_net_cidr:
-      hidden: false
-      immutable: false
-      type: string
-      description: HSL (Logging) network address (CIDR notation)
-  node_templates:
-    hsl_direct_net:
-      type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork
-      properties:
-        network_name:
-          get_input: HSL_direct_net_id
-        subnets:
-          hsl_ip_subnet:
-            cidr:
-              get_input: HSL_direct_net_cidr
-            gateway_ip:
-              get_input: HSL_direct_net_gateway
-    service_instance:
-      type: org.openecomp.resource.abstract.nodes.heat.service_template
-      directives:
-      - substitutable
-      properties:
-        flavor:
-          get_input: st_flavor
-        availability_zone:
-          get_input: availability_zone_1
-        image_name:
-          get_input: st_image
-        service_template_filter:
-          substitute_service_template: service_instanceServiceTemplate.yaml
-          count:
-            get_input: max_num_fw_instances
-          mandatory: false
-        service_type:
-          get_input: st_type
-        static_routes_list:
-        - token:
-          - get_input: st_static_routes_list
-          - ','
-          - 0
-        service_template_name:
-          get_input: st_name
-        service_interface_type_list:
-        - token:
-          - get_input: st_service_interface_type_list
-          - ','
-          - 0
-        interface_list:
-        - virtual_network:
-            get_input: network_param
-        service_instance_name:
-          get_input: service_instance_name
-        service_mode:
-          get_input: st_mode
-        shared_ip_list:
-        - token:
-          - get_input: st_shared_ip_list
-          - ','
-          - 0
-      requirements:
-      - dependency:
-          capability: tosca.capabilities.Node
-          node: hsl_direct_net
-          relationship: tosca.relationships.DependsOn
-    service_policy:
-      type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules
-      properties:
-        entries:
-          policy_rule:
-          - src_ports:
-            - start_port:
-                get_input: start_src_ports
-              end_port:
-                get_input: end_src_ports
-            protocol: any
-            action_list:
-              apply_service:
-              - service_instance
-            dst_addresses:
-            - virtual_network:
-                get_input: Cricket_OCS_direct_net_id
-            dst_ports:
-            - start_port:
-                get_input: start_dst_ports
-              end_port:
-                get_input: end_dst_ports
-            src_addresses:
-            - virtual_network:
-                get_input: Cricket_OCS_protected_net_id
-            direction:
-              get_input: service_policy_direction
-        name:
-          get_input: service_policy_name
-      requirements:
-      - dependency:
-          capability: tosca.capabilities.Node
-          node: service_instance
-          relationship: tosca.relationships.DependsOn
-  groups:
-    OCS-fw:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/OCS-fw.yml
-        description: |
-          Based on the following reference for the HOT-DMZ-FW template: Version 3.5 8-10-2015 (Authors: Art Mishurov,am254u & Johhny Chen, jc3066) - HOT-DMZ-FW template that creates two DMZ networks (direct and protected) with a scaled out firewall service between the two.
-      members:
-      - hsl_direct_net
-      - service_instance
-      - service_policy
-  substitution_mappings:
-    node_type: org.openecomp.resource.abstract.nodes.heat.OCS-fw
-    capabilities:
-      link_hsl_direct_net:
-      - hsl_direct_net
-      - link
-      attachment_hsl_direct_net:
-      - hsl_direct_net
-      - attachment
-    requirements:
-      network_service_policy:
-      - service_policy
-      - network
-      link_port_0_service_instance:
-      - service_instance
-      - link_port_0
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkNested/expectedoutputfiles/service_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkNested/expectedoutputfiles/service_instanceServiceTemplate.yaml
deleted file mode 100644
index bbc95728c9..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkNested/expectedoutputfiles/service_instanceServiceTemplate.yaml
+++ /dev/null
@@ -1,275 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
-  template_name: service_instance
-imports:
-  ContrailComputeGlobalTypes:
-    file: ContrailComputeGlobalTypesServiceTemplate.yaml
-  CinderVolumeGlobalTypes:
-    file: CinderVolumeGlobalTypesServiceTemplate.yaml
-  ContrailVirtualNetworkGlobalType:
-    file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
-  AbstractSubstituteGlobalTypes:
-    file: AbstractSubstituteGlobalTypesServiceTemplate.yaml
-  ContrailPortGlobalTypes:
-    file: ContrailPortGlobalTypesServiceTemplate.yaml
-  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:
-    availability_zone:
-      hidden: false
-      immutable: false
-      type: string
-      description: Availability zone to create servers in
-      required: false
-      status: SUPPORTED
-    static_routes_list:
-      hidden: false
-      immutable: false
-      type: list
-      description: Static routes enabled
-      required: false
-      status: SUPPORTED
-      entry_schema:
-        type: boolean
-    availability_zone_enable:
-      hidden: false
-      immutable: false
-      type: boolean
-      description: Indicates availability zone is enabled
-      required: false
-      default: false
-      status: SUPPORTED
-    service_template_name:
-      hidden: false
-      immutable: false
-      type: string
-      description: Service template name
-      required: false
-      status: SUPPORTED
-    ordered_interfaces:
-      hidden: false
-      immutable: false
-      type: boolean
-      description: Indicates if service interface are ordered
-      required: false
-      default: false
-      status: SUPPORTED
-    flavor:
-      hidden: false
-      immutable: false
-      type: string
-      description: flavor
-      required: false
-      status: SUPPORTED
-    image_name:
-      hidden: false
-      immutable: false
-      type: string
-      description: Image name
-      required: true
-      status: SUPPORTED
-    service_type:
-      hidden: false
-      immutable: false
-      type: string
-      description: Service type
-      required: true
-      status: SUPPORTED
-      constraints:
-      - valid_values:
-        - firewall
-        - analyzer
-        - source-nat
-        - loadbalancer
-    service_interface_type_list:
-      hidden: false
-      immutable: false
-      type: list
-      description: List of interface types
-      required: true
-      status: SUPPORTED
-      entry_schema:
-        type: string
-        constraints:
-        - valid_values:
-          - management
-          - left
-          - right
-          - other
-    service_instance_name:
-      hidden: false
-      immutable: false
-      type: string
-      description: Service instance name
-      required: true
-      status: SUPPORTED
-    interface_list:
-      hidden: false
-      immutable: false
-      type: list
-      description: List of interfaces
-      required: false
-      status: SUPPORTED
-      entry_schema:
-        type: org.openecomp.datatypes.heat.network.contrail.InterfaceData
-    service_mode:
-      hidden: false
-      immutable: false
-      type: string
-      description: Service mode
-      required: true
-      status: SUPPORTED
-      constraints:
-      - valid_values:
-        - transparent
-        - in-network
-        - in-network-nat
-    shared_ip_list:
-      hidden: false
-      immutable: false
-      type: list
-      description: Shared ips enabled
-      required: false
-      status: SUPPORTED
-      entry_schema:
-        type: boolean
-  node_templates:
-    port_0:
-      type: org.openecomp.resource.cp.nodes.heat.network.contrail.Port
-      properties:
-        static_routes:
-          get_input:
-          - interface_list
-          - 0
-          - static_routes
-        virtual_network:
-          get_input:
-          - interface_list
-          - 0
-          - virtual_network
-        static_route:
-          get_input:
-          - static_routes_list
-          - 0
-        allowed_address_pairs:
-          get_input:
-          - interface_list
-          - 0
-          - allowed_address_pairs
-        shared_ip:
-          get_input:
-          - shared_ip_list
-          - 0
-        ip_address:
-          get_input:
-          - interface_list
-          - 0
-          - ip_address
-        interface_type:
-          get_input:
-          - service_interface_type_list
-          - 0
-      requirements:
-      - binding:
-          capability: tosca.capabilities.network.Bindable
-          node: service_instance
-          relationship: tosca.relationships.network.BindsTo
-    service_instance:
-      type: org.openecomp.resource.vfc.nodes.heat.st_image
-      properties:
-        flavor:
-          get_input: flavor
-        image_name:
-          get_input: image_name
-        availability_zone:
-          get_input: availability_zone
-        service_type:
-          get_input: service_type
-        availability_zone_enable:
-          get_input: availability_zone_enable
-        service_template_name:
-          get_input: service_template_name
-        service_instance_name:
-          get_input: service_instance_name
-        service_mode:
-          get_input: service_mode
-  groups:
-    service_instance:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/OCS-fw.yml
-      members:
-      - service_instance
-      - port_0
-  outputs:
-    tenant_id:
-      description: Tenant id of the Service Instance
-      value:
-        get_attribute:
-        - service_instance
-        - tenant_id
-    fq_name:
-      description: The FQ name of the service instance
-      value:
-        get_attribute:
-        - service_instance
-        - fq_name
-    service_template_name:
-      description: Service Template of the Service Instance
-      value:
-        get_attribute:
-        - service_instance
-        - service_template_name
-    show:
-      description: All attributes
-      value:
-        get_attribute:
-        - service_instance
-        - show
-    active_vms:
-      description: Number of service VMs active for this Service Instance
-      value:
-        get_attribute:
-        - service_instance
-        - active_vms
-    service_instance_name:
-      description: The name of the service instance
-      value:
-        get_attribute:
-        - service_instance
-        - service_instance_name
-    virtual_machines:
-      description: Service VMs for the Service Instance
-      value:
-        get_attribute:
-        - service_instance
-        - virtual_machines
-    status:
-      description: Status of the service instance
-      value:
-        get_attribute:
-        - service_instance
-        - status
-  substitution_mappings:
-    node_type: org.openecomp.resource.abstract.nodes.heat.service_template
-    requirements:
-      link_port_0:
-      - port_0
-      - link
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkNested/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkNested/inputfiles/MANIFEST.json
deleted file mode 100644
index ba27604c3f..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkNested/inputfiles/MANIFEST.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "name": "vMME_Small",
-  "description": "HOT template to create 2 cinder volume attachment",
-  "version": "2013-05-23",
-  "data": [
-    {
-      "file": "OCS-fw.yml",
-      "type": "HEAT",
-      "isBase": "false"
-    },
-    {
-      "file": "main.yml",
-      "type": "HEAT"
-    }
-  ]
-}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkNested/inputfiles/OCS-fw.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkNested/inputfiles/OCS-fw.yml
deleted file mode 100644
index 86c3fcadc8..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkNested/inputfiles/OCS-fw.yml
+++ /dev/null
@@ -1,163 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
-  Based on the following reference for the HOT-DMZ-FW template:
-  Version 3.5 8-10-2015 (Authors: Art Mishurov,am254u & Johhny Chen, jc3066) - HOT-DMZ-FW template that creates two DMZ networks (direct and protected) with a scaled out firewall service between the two.
-
-parameters:
-  hsl_direct_net1:
-    type: string
-  hsl_direct_net2:
-    type: string
-  hsl_direct_net3:
-    type: string
-  hsl_direct_net4:
-    type: string
-  HSL_direct_net_id:
-    type: string
-    description: Name of HSL (Logging) network
-  HSL_direct_net_cidr:
-    type: string
-    description: HSL (Logging) network address (CIDR notation)
-  HSL_direct_net_gateway:
-    type: string
-    description: HSL (Logging) network gateway address
-  oam_mgmt_net_0_id:
-    type: string
-    description: Name of OAM network
-  Cricket_OCS_direct_net_id:
-    type: string
-    description: Name of Cricket OCS network
-  Cricket_OCS_protected_net_id:
-    type: string
-    description: Name of Cricket OCS network
-  service_instance_name:
-    type: string
-    description: Service instance name
-  service_policy_name:
-    type: string
-    description: Policy Name
-  service_policy_direction:
-    type: string
-    description: Direction of Policy
-  start_src_ports:
-    type: number
-    description: Start of src port
-  end_src_ports:
-    type: number
-    description: End of src port
-  start_dst_ports:
-    type: number
-    description: Start of dst port
-  end_dst_ports:
-    type: number
-    description: End of dst port
-  st_name:
-    type: string
-    description: Name of service template
-  st_mode:
-    type: string
-    description: service mode
-  st_type:
-    type: string
-    description: service type
-  st_image:
-    type: string
-    description: Name of the image
-  st_flavor:
-    type: string
-    description: Flavor
-  st_service_interface_type_list:
-    type: string
-    description: List of interface types
-  st_shared_ip_list:
-    type: string
-    description: List of shared ip enabled-disabled
-  st_static_routes_list:
-    type: string
-    description: List of static routes enabled-disabled
-  st_scaling:
-    type: string
-    description: Indicates whether service scaling is enabled
-  max_num_fw_instances:
-    type: number
-    description: maximum number of firewall instances for scaling
-  availability_zone_1:
-    type: string
-    description: availability zone
-  network_param:
-    type: string
-
-resources:
-
-  hsl_direct_net:
-    type: OS::Contrail::VirtualNetwork
-    properties:
-      name: { get_param: HSL_direct_net_id }
-
-  hsl_ip_subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      network_id: { get_resource: hsl_direct_net }
-      cidr: { get_param: HSL_direct_net_cidr }
-      gateway_ip: { get_param: HSL_direct_net_gateway }
-
-  service_template:
-    type: OS::Contrail::ServiceTemplate
-    properties:
-      name: { get_param: st_name }
-      service_mode: { get_param: st_mode }
-      service_type: { get_param: st_type }
-      image_name: { get_param: st_image }
-      flavor: { get_param: st_flavor }
-      service_interface_type_list: { "Fn::Split" : [ ",", Ref: st_service_interface_type_list ] }
-      shared_ip_list: { "Fn::Split" : [ ",", Ref: st_shared_ip_list ] }
-      static_routes_list: { "Fn::Split" : [ ",", Ref: st_static_routes_list ] }
-      service_scaling: { get_param: st_scaling }
-
-  service_instance:
-    type: OS::Contrail::ServiceInstance
-    depends_on: [ hsl_ip_subnet]
-    properties:
-      name: { get_param: service_instance_name }
-      availability_zone: { get_param: availability_zone_1 }
-      service_template: { get_resource: service_template }
-      scale_out:
-        max_instances: {get_param: max_num_fw_instances}
-      interface_list: [
-          {
-              virtual_network: { get_param: network_param }
-          }
-          ]
-
-  service_policy:
-    type: OS::Contrail::NetworkPolicy
-    depends_on: [ service_instance ]
-    properties:
-      name: { get_param: service_policy_name }
-      entries:
-        policy_rule: [
-          {
-            "direction": { get_param: service_policy_direction },
-            "protocol": "any",
-            "src_ports": [{"start_port": {get_param: start_src_ports}, "end_port": {get_param: end_src_ports}}],
-            "dst_ports": [{"start_port": {get_param: start_dst_ports}, "end_port": {get_param: end_dst_ports}}],
-            "dst_addresses": [{ "virtual_network": { get_param: Cricket_OCS_direct_net_id }}],
-            "action_list": { "apply_service": [{ get_resource: service_instance }]},
-            "src_addresses": [{ "virtual_network": { get_param: Cricket_OCS_protected_net_id }}],
-          },
-          ]
-
-  service_policy_attach_direct_net:
-    type: OS::Contrail::AttachPolicy
-    depends_on: [ service_policy ]
-    properties:
-      network: { get_param: Cricket_OCS_direct_net_id }
-      policy: { get_attr: [service_policy, fq_name] }
-
-  service_policy_attach_protected_net:
-    type: OS::Contrail::AttachPolicy
-    depends_on: [ service_policy ]
-    properties:
-      network: { get_param: Cricket_OCS_protected_net_id }
-      policy: { get_attr: [service_policy, fq_name] }
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkNested/inputfiles/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkNested/inputfiles/main.yml
deleted file mode 100644
index a1f7dc932d..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkNested/inputfiles/main.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: ASC External Networks Template
-
-parameters:
-  Internal1_net_name:
-    type: string
-  Internal2_net_name:
-    type: string
-  Internal1_forwarding_mode:
-    type: string
-  Internal2_forwarding_mode:
-    type: string
-  Internal1_shared:
-    type: string
-  Internal2_shared:
-    type: string
-
-resources:
-  Internal1-net:
-    type: OS::Contrail::VirtualNetwork
-    properties:
-      name: { get_param: Internal1_net_name }
-      forwarding_mode: { get_param: Internal1_forwarding_mode }
-      shared: { get_param: Internal1_shared }
-
-  test_nested:
-    type: OCS-fw.yml
-    properties:
-      network_param: { get_resource: Internal1-net}
\ No newline at end of file