VLAN tagging - Pattern 1A, 1C1

1. Implementation for supporting VLAN
   tagging in Pattern 1A and 1C1 heats
2. Updated code for switch case refactor with
   command design pattern
3. Added unit tests and bug fixes

Change-Id: I54938ffd6673f865b4506a890ec8e7b9c54597b1
Issue-ID: SDC-1036
Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>

1 files changed, 600 insertions, 0 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml
new file mode 100644
index 0000000000..90cdb208c7
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml
@@ -0,0 +1,600 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0

+metadata:

+  template_name: Main

+imports:

+- openecomp_heat_index:

+    file: openecomp-heat/_index.yml

+- GlobalSubstitutionTypes:

+    file: GlobalSubstitutionTypesServiceTemplate.yaml

+topology_template:

+  inputs:

+    vf_module_id:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: vf_module_id

+      type: string

+      description: Unique ID for this VF module inst

+    fabric_int_net_rpf:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: fabric_int_net_rpf

+      type: string

+      description: Reverse Path Filtering enable or disable for the fabric virtual network

+    control_int_net_rpf:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: control_int_net_rpf

+      type: string

+      description: Reverse Path Filtering enable or disable for the control virtual network

+    control_int_net_forwarding_mode:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: control_int_net_forwarding_mode

+      type: string

+      description: forwarding mode of the control virtual network

+    vnf_name:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: vnf_name

+      type: string

+      description: Unique name for this VF instance

+    vdbe_untrusted_ip_1:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: vdbe_untrusted_ip_1

+      type: string

+      description: IPV4 address of the secondary vDBE VM on the VAN untrusted network

+    vdbe_aap_untrusted_ip_prefix_len:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: vdbe_aap_untrusted_ip_prefix_len

+      type: string

+      description: ip prefix length for the primary vDBE VM on the VAN untrusted network

+    aap_address_mode:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: aap_address_mode

+      type: string

+      description: Address mode for the vDBE cluster IP

+    control_int_net_shared:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: control_int_net_shared

+      type: boolean

+      description: control virtual network shared

+    vdbe_untrusted_v6_ip_1:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: vdbe_untrusted_v6_ip_1

+      type: string

+      description: IPV6 address of the secondary vDBE VM on the VAN untrusted network

+    vdbe_untrusted_vmac_address:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: vdbe_untrusted_vmac_address

+      type: string

+      description: Virtual MAC of the primary vDBE VM on the VAN untrusted network

+    control_int_net_flood_unknown_unicast:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: control_int_net_flood_unknown_unicast

+      type: boolean

+      description: forwarding mode of the control virtual network

+    vdbe_aap_sec_untrusted_ip_prefix:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: vdbe_aap_sec_untrusted_ip_prefix

+      type: string

+      description: ip prefix for secondary vDBE VM aap on the VAN untrusted network

+    vnf_id:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: vnf_id

+      type: string

+      description: Unique ID for this VF inst

+    vdbe_name_1:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: vdbe_name_1

+      type: string

+      description: VM Name for this vdbe node 1

+    availability_zone_1:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: availability_zone_1

+      type: string

+      description: The availability zone of secondary node1 vDBE vm in the local HA pair.

+    untrusted_vn_networks:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: untrusted_vn_networks

+      type: list

+      description: List of subinterface virtual networks

+      entry_schema:

+        type: string

+    vdbe_image_name:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: vdbe_image_name

+      type: string

+      description: Image to use for vDBE

+    oam_net_name:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: oam_net_name

+      type: string

+      description: Name of NSDNet network from which the management IP addresses will be allocated

+    vdbe_aap_sec_untrusted_ip_prefix_len:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: vdbe_aap_sec_untrusted_ip_prefix_len

+      type: string

+      description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network

+    vdbe_aap_untrusted_v6_ip_prefix:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: vdbe_aap_untrusted_v6_ip_prefix

+      type: string

+      description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network

+    vdbe_aap_untrusted_v6_ip_prefix_len:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: vdbe_aap_untrusted_v6_ip_prefix_len

+      type: string

+      description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network

+    fabric_int_net_flood_unknown_unicast:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: fabric_int_net_flood_unknown_unicast

+      type: boolean

+      description: forwarding mode of the fabric virtual network

+    untrusted_vlan_tags:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: untrusted_vlan_tags

+      type: list

+      description: List of subinterface vlan tags

+      entry_schema:

+        type: string

+    vdbe_flavor_name:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: vdbe_flavor_name

+      type: string

+      description: Flavor to use for vDBE

+    counter:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: counter

+      type: float

+      description: Counter.

+    fabric_int_net_forwarding_mode:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: fabric_int_net_forwarding_mode

+      type: string

+      description: forwarding mode of the fabric virtual network

+    fabric_int_net_shared:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: fabric_int_net_shared

+      description: fabric virtual network shared

+    vdbe_hw_untr_mac_1:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: vdbe_hw_untr_mac_1

+      type: string

+      description: Secondary MAC address of the secondary vDBE VM on the VAN untrusted network

+    untrusted_net_name:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: untrusted_net_name

+      type: string

+      description: Name of public untrusted network into which this vDBE HA cluster is deployed

+    vdbe_device_name:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: vdbe_device_name

+      type: string

+      description: VDBE device Name for this vdbe VNF

+    vdbe_aap_untrusted_ip_prefix:

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - main

+            source_type: HEAT

+            param_name: vdbe_aap_untrusted_ip_prefix

+      type: string

+      description: ip prefix for primary vDBE VM on the VAN untrusted network

+  node_templates:

+    fabric_int_net:

+      type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork

+      properties:

+        network_name:

+          str_replace:

+            template: template-fabric-int

+            params:

+              VNF_NAME:

+                get_input: vnf_name

+    control_int_net:

+      type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork

+      properties:

+        network_name:

+          str_replace:

+            template: VNF_NAME_control_net

+            params:

+              VNF_NAME:

+                get_input: vnf_name

+    abstract_vdbe:

+      type: org.openecomp.resource.abstract.nodes.vdbe

+      directives:

+      - substitutable

+      properties:

+        subinterface_vlan1_aap_untrusted_v6_ip_prefix:

+        - get_input: vdbe_aap_untrusted_v6_ip_prefix

+        - get_input: vdbe_aap_untrusted_v6_ip_prefix

+        subinterface_vlan1_aap_sec_untrusted_ip_prefix:

+        - get_input: vdbe_aap_sec_untrusted_ip_prefix

+        - get_input: vdbe_aap_sec_untrusted_ip_prefix

+        subinterface_vlan1_vmac_address:

+        - get_input: vdbe_untrusted_vmac_address

+        - get_input: vdbe_untrusted_vmac_address

+        compute_vdbe_availability_zone:

+        - get_input: availability_zone_1

+        - get_input: availability_zone_1

+        port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses:

+        - - get_input: vdbe_hw_untr_mac_1

+        - - get_input: vdbe_hw_untr_mac_1

+        vm_flavor_name:

+          get_input: vdbe_flavor_name

+        subinterface_vlan1_counter:

+        - get_input: counter

+        - get_input: counter

+        vm_image_name:

+          get_input: vdbe_image_name

+        compute_vdbe_metadata:

+        - vf_module_id:

+            get_input: vf_module_id

+          vnf_id:

+            get_input: vnf_id

+          vnf_name:

+            get_input: vnf_name

+        - vf_module_id:

+            get_input: vf_module_id

+          vnf_id:

+            get_input: vnf_id

+          vnf_name:

+            get_input: vnf_name

+        subinterface_vlan1_aap_untrusted_v6_ip_prefix_len:

+        - get_input: vdbe_aap_untrusted_v6_ip_prefix_len

+        - get_input: vdbe_aap_untrusted_v6_ip_prefix_len

+        subinterface_vlan1_mac_address:

+        - get_input: vdbe_hw_untr_mac_1

+        - get_input: vdbe_hw_untr_mac_1

+        subinterface_vlan1_aap_untrusted_ip_prefix_len:

+        - get_input: vdbe_aap_untrusted_ip_prefix_len

+        - get_input: vdbe_aap_untrusted_ip_prefix_len

+        subinterface_vlan1_ip_address:

+        - get_input: vdbe_untrusted_ip_1

+        - get_input: vdbe_untrusted_ip_1

+        compute_vdbe_name:

+        - get_input: vdbe_name_1

+        - get_input: vdbe_name_1

+        subinterface_vlan1_ip_v6_address:

+        - get_input: vdbe_untrusted_v6_ip_1

+        - get_input: vdbe_untrusted_v6_ip_1

+        subinterface_vlan1_aap_untrusted_ip_prefix:

+        - get_input: vdbe_aap_untrusted_ip_prefix

+        - get_input: vdbe_aap_untrusted_ip_prefix

+        port_vdbe_untr_2_port_virtual_network_refs:

+        - - fabric_int_net

+        - - fabric_int_net

+        subinterface_vlan1_subinterfaces_name_prefix:

+        - str_replace:

+            template: VM_NAMEDBE001p1n004

+            params:

+              DBE:

+                get_input: vdbe_device_name

+              VM_NAME:

+                get_input: vdbe_name_1

+        - str_replace:

+            template: VM_NAMEDBE001p1n004

+            params:

+              DBE:

+                get_input: vdbe_device_name

+              VM_NAME:

+                get_input: vdbe_name_1

+        port_vdbe_untr_2_port_name:

+        - Port_2

+        - Port_4

+        port_vdbe_untr_1_port_virtual_network_refs:

+        - - control_int_net

+        - - control_int_net

+        subinterface_vlan1_vn_network_list:

+        - get_input: untrusted_vn_networks

+        - get_input: untrusted_vn_networks

+        subinterface_vlan1_parent_interface:

+        - vdbe_untr_1_port_1

+        - vdbe_untr_1_port_2

+        subinterface_vlan1_aap_address_mode:

+        - get_input: aap_address_mode

+        - get_input: aap_address_mode

+        subinterface_vlan1_optional_property_1:

+        - OPTIONAL_VALUE_SUBPORT_1

+        - null

+        port_vdbe_untr_1_port_name:

+        - str_replace:

+            template: VM_NAMEDBE001p1n004

+            params:

+              DBE:

+                get_input: vdbe_device_name

+              VM_NAME:

+                get_input: vdbe_name_1

+        - str_replace:

+            template: Port 3

+            params:

+              DBE:

+                get_input: vdbe_device_name

+              VM_NAME:

+                get_input: vdbe_name_1

+        subinterface_vlan1_optional_property_2:

+        - null

+        - OPTIONAL_VALUE_SUBPORT_2

+        subinterface_vlan1_aap_sec_untrusted_ip_prefix_len:

+        - get_input: vdbe_aap_sec_untrusted_ip_prefix_len

+        - get_input: vdbe_aap_sec_untrusted_ip_prefix_len

+        port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:

+        - - get_input: vdbe_hw_untr_mac_1

+        - - get_input: vdbe_hw_untr_mac_1

+        subinterface_vlan1_vlan_tag_list:

+        - get_input: untrusted_vlan_tags

+        - get_input: untrusted_vlan_tags

+        service_template_filter:

+          substitute_service_template: Nested_vdbeServiceTemplate.yaml

+          count: 2

+        index_value:

+          get_property:

+          - SELF

+          - service_template_filter

+          - index_value

+      requirements:

+      - link_vdbe_vdbe_untr_1_port:

+          capability: tosca.capabilities.network.Linkable

+          node: control_int_net

+          relationship: tosca.relationships.network.LinksTo

+      - link_vdbe_vdbe_untr_2_port:

+          capability: tosca.capabilities.network.Linkable

+          node: fabric_int_net

+          relationship: tosca.relationships.network.LinksTo

+  groups:

+    main_group:

+      type: org.openecomp.groups.heat.HeatStack

+      properties:

+        heat_file: ../Artifacts/main.yml

+        description: |

+          Version 2.0 02-09-2016 (Authors: John Doe, user PROD)

+      members:

+      - fabric_int_net

+      - control_int_net

+      - abstract_vdbe
\ No newline at end of file