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, 133 insertions, 128 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml
index 69830feadc..4ec6fb66a8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml
@@ -1,128 +1,133 @@
-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:
-    pd_flavor_name:
-      label: PD flavor name
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - hot-mog-0108-bs1271
-            source_type: HEAT
-            param_name: pd_flavor_name
-      type: string
-      description: flavor name of PD instance
-      default: m3.xlarge
-    availabilityzone_name:
-      label: availabilityzone name
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - hot-mog-0108-bs1271
-            source_type: HEAT
-            param_name: availabilityzone_name
-      type: string
-      description: availabilityzone name
-      default: nova
-    pd_image_name:
-      label: image name
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - hot-mog-0108-bs1271
-            source_type: HEAT
-            param_name: pd_image_name
-      type: string
-      description: PD image name
-      default: MOG_BASE_8.0
-    pd_server_names:
-      label: PD server names
-      hidden: false
-      immutable: false
-      annotations:
-        source:
-          type: org.openecomp.annotations.Source
-          properties:
-            vf_module_label:
-            - hot-mog-0108-bs1271
-            source_type: HEAT
-            param_name: pd_server_names
-      type: list
-      description: name of the PD instance
-      default:
-      - ZRDM1MOGX01MPD001
-      - ZRDM1MOGX01MPD002
-      entry_schema:
-        type: string
-  node_templates:
-    abstract_pd_server:
-      type: org.openecomp.resource.abstract.nodes.pd_server
-      directives:
-      - substitutable
-      properties:
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 1
-        - get_input:
-          - pd_server_names
-          - 0
-        port_pd01_port_replacement_policy:
-        - AUTO_PORT_1
-        - AUTO_PORT_0
-        vm_flavor_name:
-          get_input: pd_flavor_name
-        port_pd01_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        vm_image_name:
-          get_input: pd_image_name
-        port_pd01_port_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
-            is_required: false
-        port_pd01_port_network:
-        - Network-1
-        - Network-0
-        compute_pd_server_user_data_format:
-        - RAW_SERVER_PD_2
-        - RAW_SERVER_PD_1
-        service_template_filter:
-          substitute_service_template: Nested_pd_serverServiceTemplate.yaml
-          count: 2
-        index_value:
-          get_property:
-          - SELF
-          - service_template_filter
-          - index_value
-  groups:
-    hot-mog-0108-bs1271_group:
-      type: org.openecomp.groups.heat.HeatStack
-      properties:
-        heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
-        description: heat template that creates MOG stack
-      members:
-      - abstract_pd_server
+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:

+    pd_flavor_name:

+      label: PD flavor name

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - hot-mog-0108-bs1271

+            source_type: HEAT

+            param_name: pd_flavor_name

+      type: string

+      description: flavor name of PD instance

+      default: m3.xlarge

+    availabilityzone_name:

+      label: availabilityzone name

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - hot-mog-0108-bs1271

+            source_type: HEAT

+            param_name: availabilityzone_name

+      type: string

+      description: availabilityzone name

+      default: nova

+    pd_image_name:

+      label: image name

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - hot-mog-0108-bs1271

+            source_type: HEAT

+            param_name: pd_image_name

+      type: string

+      description: PD image name

+      default: MOG_BASE_8.0

+    pd_server_names:

+      label: PD server names

+      hidden: false

+      immutable: false

+      annotations:

+        source:

+          type: org.openecomp.annotations.Source

+          properties:

+            vf_module_label:

+            - hot-mog-0108-bs1271

+            source_type: HEAT

+            param_name: pd_server_names

+      type: list

+      description: name of the PD instance

+      default:

+      - ZRDM1MOGX01MPD001

+      - ZRDM1MOGX01MPD002

+      entry_schema:

+        type: string

+  node_templates:

+    abstract_pd_server:

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

+      directives:

+      - substitutable

+      properties:

+        compute_pd_server_availability_zone:

+        - get_input: availabilityzone_name

+        - get_input: availabilityzone_name

+        compute_pd_server_name:

+        - get_input:

+          - pd_server_names

+          - 1

+        - get_input:

+          - pd_server_names

+          - 0

+        port_pd01_port_replacement_policy:

+        - AUTO_PORT_1

+        - AUTO_PORT_0

+        vm_flavor_name:

+          get_input: pd_flavor_name

+        port_pd01_port_mac_requirements:

+          mac_count_required:

+            is_required: false

+        vm_image_name:

+          get_input: pd_image_name

+        port_pd01_port_ip_requirements:

+        - - ip_version: 4

+            ip_count_required:

+              is_required: false

+            floating_ip_count_required:

+              is_required: false

+        - - ip_version: 4

+            ip_count_required:

+              is_required: false

+            floating_ip_count_required:

+              is_required: false

+        port_pd01_port_network:

+        - Network-1

+        - Network-0

+        compute_pd_server_user_data_format:

+        - RAW_SERVER_PD_2

+        - RAW_SERVER_PD_1

+        service_template_filter:

+          substitute_service_template: Nested_pd_serverServiceTemplate.yaml

+          count: 2

+        index_value:

+          get_property:

+          - SELF

+          - service_template_filter

+          - index_value

+  groups:

+    hot-mog-0108-bs1271_group:

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

+      properties:

+        heat_file: ../Artifacts/hot-mog-0108-bs1271.yml

+        description: heat template that creates MOG stack

+      members:

+      - abstract_pd_server
\ No newline at end of file