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, 1 insertions, 121 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/listNet/inputfiles/hot_template.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/listNet/inputfiles/hot_template.yml
index 46e80667ab..7b626ed8a4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/listNet/inputfiles/hot_template.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/listNet/inputfiles/hot_template.yml
@@ -36,7 +36,7 @@ resources:
         {
           virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam },
         }
-      virtual_network_refs: [{ get_resource: jsa_net1 },{ get_resource: jsa_net5 }]
+      virtual_network_refs: [{ get_resource: jsa_net1 },{ get_resource: jsa_net1 }]
       port_tuple_refs: [{ get_param: template_PortTuple_LB1 }]
       security_group_refs: [{ get_param: oam_sec_group_name}]
 
@@ -54,124 +54,4 @@ resources:
                    get_param: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2
                  network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len:
                    get_param: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2
-     type: "OS::ContrailV2::VirtualNetwork"
-
-  template_VMInt_OAM_lb_2:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_machine_interface_properties:
-        {
-          virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam },
-        }
-      virtual_network_refs: [ { list_join: [':', { get_attr: [ jsa_net2, fq_name ] } ] },{ list_join: [':', { get_attr: [ jsa_net5, fq_name ] } ] }]
-      port_tuple_refs: [{ get_param: template_PortTuple_LB1 }]
-      security_group_refs: [{ get_param: oam_sec_group_name}]
-
-  jsa_net2:
-     properties:
-       name: aaa
-       network_ipam_refs_data:
-         -
-           network_ipam_refs_data_ipam_subnets:
-             -
-               network_ipam_refs_data_ipam_subnets_addr_from_start:
-                 get_param: network_ipam_refs_data_ipam_subnets_addr_from_start_true
-               network_ipam_refs_data_ipam_subnets_subnet:
-                 network_ipam_refs_data_ipam_subnets_subnet_ip_prefix:
-                   get_param: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2
-                 network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len:
-                   get_param: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2
-     type: "OS::ContrailV2::VirtualNetwork"
-
-  template_VMInt_OAM_lb_3:
-    type: OS::ContrailV2::VirtualMachineInterface
-    properties:
-      virtual_machine_interface_properties:
-        {
-          virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam },
-        }
-      virtual_network_refs: [{ get_attr: [ jsa_net3, fq_name ] } ,{ get_attr: [ jsa_net5, fq_name ] }]
-      port_tuple_refs: [{ get_param: template_PortTuple_LB1 }]
-      security_group_refs: [{ get_param: oam_sec_group_name}]
-
-  jsa_net3:
-     properties:
-       name: aaa
-       network_ipam_refs_data:
-         -
-           network_ipam_refs_data_ipam_subnets:
-             -
-               network_ipam_refs_data_ipam_subnets_addr_from_start:
-                 get_param: network_ipam_refs_data_ipam_subnets_addr_from_start_true
-               network_ipam_refs_data_ipam_subnets_subnet:
-                 network_ipam_refs_data_ipam_subnets_subnet_ip_prefix:
-                   get_param: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2
-                 network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len:
-                   get_param: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2
-     type: "OS::ContrailV2::VirtualNetwork"
-
-  template_VMInt_OAM_lb_4:
-     type: OS::ContrailV2::VirtualMachineInterface
-     properties:
-       virtual_machine_interface_properties:
-         {
-           virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam },
-         }
-       virtual_network_refs: [{ get_attr: [ jsa_net4, fq_name ] } ] # should not connect to contrail network
-       port_tuple_refs: [{ get_param: template_PortTuple_LB1 }]
-       security_group_refs: [{ get_param: oam_sec_group_name}]
-
-  template_VMInt_OAM_lb_5:
-     type: OS::ContrailV2::VirtualMachineInterface
-     properties:
-       virtual_machine_interface_properties:
-         {
-           virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam },
-         }
-       virtual_network_refs: []
-       port_tuple_refs: [{ get_param: template_PortTuple_LB1 }]
-       security_group_refs: [{ get_param: oam_sec_group_name}]
-
-  template_VMInt_OAM_lb_6:
-     type: OS::ContrailV2::VirtualMachineInterface
-     properties:
-       virtual_machine_interface_properties:
-         {
-           virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam },
-         }
-       virtual_network_refs: { get_attr: [ jsa_net3, fq_name ] }
-       port_tuple_refs: [{ get_param: template_PortTuple_LB1 }]
-       security_group_refs: [{ get_param: oam_sec_group_name}]
-
-
-
-  template_VMInt_OAM_lb_7:
-     type: OS::ContrailV2::VirtualMachineInterface
-     properties:
-       virtual_machine_interface_properties:
-         {
-           virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam },
-         }
-       port_tuple_refs: [{ get_param: template_PortTuple_LB1 }]
-       security_group_refs: [{ get_param: oam_sec_group_name}]
-
-  jsa_net4:
-      type: OS::Contrail::VirtualNetwork
-      properties:
-        name: {get_param: nems_traffic_name}
-
-  jsa_net5:
-     properties:
-       name: aaa
-       network_ipam_refs_data:
-         -
-           network_ipam_refs_data_ipam_subnets:
-             -
-               network_ipam_refs_data_ipam_subnets_addr_from_start:
-                 get_param: network_ipam_refs_data_ipam_subnets_addr_from_start_true
-               network_ipam_refs_data_ipam_subnets_subnet:
-                 network_ipam_refs_data_ipam_subnets_subnet_ip_prefix:
-                   get_param: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2
-                 network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len:
-                   get_param: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2
      type: "OS::ContrailV2::VirtualNetwork"
\ No newline at end of file