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>

3 files changed, 369 insertions, 0 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/inputfiles/MANIFEST.json
new file mode 100644
index 0000000000..aca75b5055
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/inputfiles/MANIFEST.json
@@ -0,0 +1,17 @@
+{
+  "name": "vMME_Small",
+  "description": "HOT template to create 2 cinder volume attachment",
+  "version": "2013-05-23",
+  "data": [
+    {
+      "file": "main.yml",
+      "type": "HEAT",
+      "isBase": "true"
+    },
+    {
+      "file": "nested.yml",
+      "type": "HEAT",
+      "isBase": "false"
+    }
+  ]
+}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/inputfiles/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/inputfiles/main.yml
new file mode 100644
index 0000000000..45ff90d13f
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/inputfiles/main.yml
@@ -0,0 +1,238 @@
+heat_template_version: 2013-05-23

+

+description: >

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

+

+parameters:

+  aap_address_mode:

+    description: "Address mode for the vDBE cluster IP"

+    type: string

+  control_int_net_forwarding_mode:

+    description: "forwarding mode of the control virtual network"

+    type: string

+  control_int_net_rpf:

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

+    type: string

+  control_int_net_shared:

+    description: "control virtual network shared"

+    type: boolean

+  control_int_net_flood_unknown_unicast:

+    description: "forwarding mode of the control virtual network"

+    type: boolean

+  oam_net_name:

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

+    type: string

+  untrusted_net_name:

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

+    type: string

+  untrusted_num_vn:

+    constraints:

+      -

+        range:

+          max: 77

+          min: 1

+    description: "Number of vDBE subinterface virtual Networks"

+    type: number

+  untrusted_vlan_tags:

+    description: "List of subinterface vlan tags"

+    type: comma_delimited_list

+  untrusted_vn_networks:

+    description: "List of subinterface virtual networks"

+    type: comma_delimited_list

+  vdbe_aap_sec_untrusted_ip_prefix:

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

+    type: string

+  vdbe_aap_sec_untrusted_ip_prefix_len:

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

+    type: string

+  vdbe_aap_untrusted_ip_prefix:

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

+    type: string

+  vdbe_aap_untrusted_ip_prefix_len:

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

+    type: string

+  vdbe_aap_untrusted_v6_ip_prefix:

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

+    type: string

+  vdbe_aap_untrusted_v6_ip_prefix_len:

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

+    type: string

+  vdbe_device_name:

+    description: "VDBE device Name for this vdbe VNF"

+    type: string

+  vdbe_hw_untr_mac_1:

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

+    type: string

+  vdbe_name_1:

+    description: "VM Name for this vdbe node 1"

+    type: string

+  vdbe_untrusted_ip_1:

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

+    type: string

+  vdbe_untrusted_v6_ip_1:

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

+    type: string

+  vdbe_untrusted_vmac_address:

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

+    type: string

+  vdbe_flavor_name:

+    description: "Flavor to use for vDBE"

+    type: string

+  vdbe_image_name:

+    description: "Image to use for vDBE"

+    type: string

+  vnf_id:

+    description: "Unique ID for this VF inst"

+    type: string

+  vnf_name:

+    description: "Unique name for this VF instance"

+    type: string

+  vf_module_id:

+    description: "Unique ID for this VF module inst"

+    type: string

+  availability_zone_1:

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

+    type: string

+resources:

+  vdbe_node_1:

+    type: OS::Nova::Server

+    properties:

+      availability_zone:

+        get_param: availability_zone_1

+      flavor:

+        get_param: vdbe_flavor_name

+      image:

+        get_param: vdbe_image_name

+      metadata:

+        vf_module_id:

+          get_param: vf_module_id

+        vnf_id:

+          get_param: vnf_id

+        vnf_name:

+          get_param: vnf_name

+      name:

+        get_param: vdbe_name_1

+      networks:

+        - port: {get_resource: vdbe_untr_1_port}

+  vdbe_untr_1_subports:

+    type: OS::Heat::ResourceGroup

+    depends_on: control_int_net

+    properties:

+      count:

+        get_param: untrusted_num_vn

+      resource_def:

+        type: nested.yml

+        properties:

+          attr_test: { get_attr: [ vdbe_untr_1_port, name ] }

+          aap_address_mode:

+            get_param: aap_address_mode

+          aap_sec_untrusted_ip_prefix:

+            get_param: vdbe_aap_sec_untrusted_ip_prefix

+          aap_sec_untrusted_ip_prefix_len:

+            get_param: vdbe_aap_sec_untrusted_ip_prefix_len

+          aap_untrusted_ip_prefix:

+            get_param: vdbe_aap_untrusted_ip_prefix

+          aap_untrusted_ip_prefix_len:

+            get_param: vdbe_aap_untrusted_ip_prefix_len

+          aap_untrusted_v6_ip_prefix:

+            get_param: vdbe_aap_untrusted_v6_ip_prefix

+          aap_untrusted_v6_ip_prefix_len:

+            get_param: vdbe_aap_untrusted_v6_ip_prefix_len

+          counter:

+            get_param: vnf_id

+          ip_address:

+            get_param: vdbe_untrusted_ip_1

+          ip_v6_address:

+            get_param: vdbe_untrusted_v6_ip_1

+          mac_address:

+            get_param: vdbe_hw_untr_mac_1

+          parent_interface:

+            get_resource: vdbe_untr_1_port

+          subinterfaces_name_prefix:

+            str_replace:

+              params:

+                DBE:

+                  get_param: vdbe_device_name

+                VM_NAME:

+                  get_param: vdbe_name_1

+              template: VM_NAMEDBE001p1n004

+          vlan_tag_list:

+            get_param: untrusted_vlan_tags

+          vmac_address:

+            get_param: vdbe_untrusted_vmac_address

+          vdbe_subport_network:

+            get_resource: control_int_net

+  vdbe_untr_1_port:

+    properties:

+      name:

+        str_replace:

+          params:

+            DBE:

+              get_param: vdbe_device_name

+            VM_NAME:

+              get_param: vdbe_name_1

+          template: VM_NAMEDBE001p1n004

+      virtual_machine_interface_allowed_address_pairs:

+        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:

+          -

+            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:

+              get_param: aap_address_mode

+            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:

+              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:

+                get_param: vdbe_aap_untrusted_ip_prefix

+              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:

+                get_param: vdbe_aap_untrusted_ip_prefix_len

+            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:

+              get_param: vdbe_untrusted_vmac_address

+          -

+            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:

+              get_param: aap_address_mode

+            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:

+              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:

+                get_param: vdbe_aap_sec_untrusted_ip_prefix

+              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:

+                get_param: vdbe_aap_sec_untrusted_ip_prefix_len

+            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:

+              get_param: vdbe_hw_untr_mac_1

+          -

+            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:

+              get_param: aap_address_mode

+            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:

+              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:

+                get_param: vdbe_aap_untrusted_v6_ip_prefix

+              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:

+                get_param: vdbe_aap_untrusted_v6_ip_prefix_len

+            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:

+              get_param: vdbe_untrusted_vmac_address

+      virtual_machine_interface_mac_addresses:

+        virtual_machine_interface_mac_addresses_mac_address:

+          -

+            get_param: vdbe_hw_untr_mac_1

+      virtual_network_refs:

+        -

+          get_param: untrusted_net_name

+    type: OS::ContrailV2::VirtualMachineInterface

+  control_int_net:

+    type: OS::ContrailV2::VirtualNetwork

+    depends_on: vdbe_untr_1_subports

+    properties:

+      network_ipam_refs: { get_attr: [ vdbe_untr_1_subports, count ] }

+      flood_unknown_unicast:

+        get_param: control_int_net_flood_unknown_unicast

+      is_shared:

+        get_param: control_int_net_shared

+      name:

+        str_replace:

+          params:

+            VNF_NAME:

+              get_param: vnf_name

+          template: VNF_NAME_control_net

+      virtual_network_properties:

+        virtual_network_properties_forwarding_mode:

+          get_param: control_int_net_forwarding_mode

+        virtual_network_properties_rpf:

+          get_param: control_int_net_rpf

+outputs:

+  out1:

+      description: output_test

+      value: {get_attr: [vdbe_untr_1_subports, 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/subInterfaceToInterfaceConnection/inoutattr/inputfiles/nested.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/inputfiles/nested.yml
new file mode 100644
index 0000000000..eeaf3b68c3
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/inputfiles/nested.yml
@@ -0,0 +1,114 @@
+heat_template_version: 2013-05-23

+

+description: cmaui server template for vMMSC

+

+parameters:

+  aap_address_mode:

+    description: "Address mode for the vDBE cluster IP"

+    type: string

+  aap_sec_untrusted_ip_prefix:

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

+    type: string

+  aap_sec_untrusted_ip_prefix_len:

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

+    type: string

+  aap_untrusted_ip_prefix:

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

+    type: string

+  aap_untrusted_ip_prefix_len:

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

+    type: string

+  aap_untrusted_v6_ip_prefix:

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

+    type: string

+  aap_untrusted_v6_ip_prefix_len:

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

+    type: string

+  counter:

+    description: "Index of instance among multiple instances.  Use to retrieve correct parameter for this instance when passed all parameters for all instances."

+    type: number

+  mac_address:

+    description: "HW MAC address to use for subinterface"

+    type: string

+  parent_interface:

+    description: "Parent Contrail interface"

+    type: string

+  subinterfaces_name_prefix:

+    description: "Combined with subinterface_instance_index, this is used as the name of the subinterface resource"

+    type: string

+  vlan_tag_list:

+    description: "List of VLAN IDs to use for subinterfaces"

+    type: comma_delimited_list

+  vmac_address:

+    description: "virtual MAC address to use for subinterface"

+    type: string

+  vdbe_subport_network:

+    description: "List of Contrail VLAN networks to use for the subinterfaces.   The order and number of these must match the VLAN ID list"

+    type: string

+  ip_address:

+    description: "IPv4 address associated with subinterfaces"

+    type: string

+  ip_v6_address:

+    description: "IPv6 address associated with subinterfaces"

+    type: string

+resources:

+  vdbe_untr_vmi_subport:

+    type: OS::ContrailV2::VirtualMachineInterface

+    properties:

+      name:

+        str_replace:

+          params:

+            $INDEX:

+              get_param:

+                - vlan_tag_list

+                -

+                  get_param: counter

+            $NAME:

+              get_param: subinterfaces_name_prefix

+          template: $NAME_$INDEX

+      virtual_machine_interface_allowed_address_pairs:

+        virtual_machine_interface_allowed_address_pairs_allowed_address_pair:

+          -

+            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:

+              get_param: aap_address_mode

+            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:

+              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:

+                get_param: aap_untrusted_ip_prefix

+              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:

+                get_param: aap_untrusted_ip_prefix_len

+            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:

+              get_param: vmac_address

+          -

+            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:

+              get_param: aap_address_mode

+            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:

+              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:

+                get_param: aap_sec_untrusted_ip_prefix

+              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:

+                get_param: aap_sec_untrusted_ip_prefix_len

+            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:

+              get_param: mac_address

+          -

+            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode:

+              get_param: aap_address_mode

+            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip:

+              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix:

+                get_param: aap_untrusted_v6_ip_prefix

+              virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len:

+                get_param: aap_untrusted_v6_ip_prefix_len

+            virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac:

+              get_param: vmac_address

+      virtual_machine_interface_mac_addresses:

+        virtual_machine_interface_mac_addresses_mac_address:

+          -

+            get_param: mac_address

+      virtual_machine_interface_properties:

+        virtual_machine_interface_properties_sub_interface_vlan_tag:

+          get_param:

+            - vlan_tag_list

+            -

+              get_param: counter

+      virtual_machine_interface_refs:

+          [{get_param: parent_interface}]

+      virtual_network_refs:

+          [{get_param: vdbe_subport_network}]
\ No newline at end of file