Port Mirroring: Incorrect Interfaces list(2)

Defect 427115 - Port Mirroring: Incorrect Interfaces list - not correct Port Type

Change-Id: I5a58f5a0acf9df455d294d2dbc0b84cb2c1e03e2
Issue-ID: SDC-1107
Signed-off-by: eleonorali <eleonoral@amdocs.com>

6 files changed, 58 insertions, 58 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/in/MainServiceTemplate.yaml
index 304799b589..d15b80d448 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/in/MainServiceTemplate.yaml
@@ -67,7 +67,7 @@ topology_template:
       type: string
       description: prop
   node_templates:
-    FSB2_Internal2:
+    FSB2_Internal_2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_address:
@@ -78,7 +78,7 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: FSB1_template
           relationship: tosca.relationships.network.BindsTo
-    FSB1_Internal1:
+    FSB1_Internal_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_address:
@@ -115,7 +115,7 @@ topology_template:
         shared: true
         network_name:
          get_attribute:
-          - FSB1_Internal1
+          - FSB1_Internal_1
           - network_id
         dhcp_agent_ids:
          get_attribute:
@@ -123,11 +123,11 @@ topology_template:
           - addresses
         tenant_id:
          get_attribute:
-          - FSB2_Internal2
+          - FSB2_Internal_2
           - network_id
         qos_policy:
          get_attribute:
-          - FSB2_Internal2
+          - FSB2_Internal_2
           - network_id
     FSB1_template:
       type: org.openecomp.resource.vfc.nodes.heat.FSB
@@ -181,7 +181,7 @@ topology_template:
         description: |
           Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
       members:
-      - FSB2_Internal2
-      - FSB1_Internal1
+      - FSB2_Internal_2
+      - FSB1_Internal_1
       - FSB1_OAM
       - FSB1_template
\ 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/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml
index 7912c41037..62e3c5574a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml
@@ -68,7 +68,7 @@ topology_template:
       type: string
       description: prop
   node_templates:
-    FSB2_Internal2:
+    FSB2_Internal_2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_address:
@@ -79,7 +79,7 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: FSB1_template
           relationship: tosca.relationships.network.BindsTo
-    FSB1_Internal1:
+    FSB1_Internal_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_address:
@@ -116,7 +116,7 @@ topology_template:
         shared: true
         network_name:
           get_attribute:
-          - FSB1_Internal1
+          - FSB1_Internal_1
           - network_id
         dhcp_agent_ids:
           get_attribute:
@@ -124,11 +124,11 @@ topology_template:
           - addresses
         tenant_id:
           get_attribute:
-          - FSB2_Internal2
+          - FSB2_Internal_2
           - network_id
         qos_policy:
           get_attribute:
-          - FSB2_Internal2
+          - FSB2_Internal_2
           - network_id
     FSB1_template:
       type: org.openecomp.resource.vfc.nodes.heat.FSB
@@ -222,7 +222,7 @@ topology_template:
         description: |
           Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
       members:
-      - FSB2_Internal2
-      - FSB1_Internal1
+      - FSB2_Internal_2
+      - FSB1_Internal_1
       - FSB1_OAM
       - FSB1_template
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/in/MainServiceTemplate.yaml
index d08dd91968..af1fd69d98 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/in/MainServiceTemplate.yaml
@@ -61,7 +61,7 @@ topology_template:
       type: string
       description: prop
   node_templates:
-    FSB1_Internal2:
+    FSB1_Internal_2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_address:
@@ -72,7 +72,7 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: FSB1_template
           relationship: tosca.relationships.network.BindsTo
-    FSB1_Internal1:
+    FSB1_Internal_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_address:
@@ -93,7 +93,7 @@ topology_template:
         shared: true
         network_name:
          get_attribute:
-          - FSB1_Internal1
+          - FSB1_Internal_1
           - network_id
         dhcp_agent_ids:
          get_attribute:
@@ -101,11 +101,11 @@ topology_template:
           - addresses
         tenant_id:
          get_attribute:
-          - FSB1_Internal2
+          - FSB1_Internal_2
           - network_id
         qos_policy:
          get_attribute:
-          - FSB1_Internal2
+          - FSB1_Internal_2
           - network_id
     FSB1_template:
       type: org.openecomp.resource.vfc.nodes.heat.FSB
@@ -159,6 +159,6 @@ topology_template:
         description: |
           Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
       members:
-      - FSB1_Internal2
-      - FSB1_Internal1
+      - FSB1_Internal_2
+      - FSB1_Internal_1
       - FSB1_template
\ 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/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml
index 55e4754bb4..9fa9796f84 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml
@@ -63,7 +63,7 @@ topology_template:
       type: string
       description: prop
   node_templates:
-    FSB1_Internal2:
+    FSB1_Internal_2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_address:
@@ -74,7 +74,7 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: FSB1_template
           relationship: tosca.relationships.network.BindsTo
-    FSB1_Internal1:
+    FSB1_Internal_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_address:
@@ -95,7 +95,7 @@ topology_template:
         shared: true
         network_name:
           get_attribute:
-          - FSB1_Internal1
+          - FSB1_Internal_1
           - network_id
         dhcp_agent_ids:
           get_attribute:
@@ -103,11 +103,11 @@ topology_template:
           - addresses
         tenant_id:
           get_attribute:
-          - FSB1_Internal2
+          - FSB1_Internal_2
           - network_id
         qos_policy:
           get_attribute:
-          - FSB1_Internal2
+          - FSB1_Internal_2
           - network_id
     FSB1_template:
       type: org.openecomp.resource.vfc.nodes.heat.FSB
@@ -158,20 +158,20 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_FSB1_Internal1_mac_address:
-          get_input: fsb1-Internal1-mac
-        port_FSB1_Internal2_network:
-        - Internal2-net
-        port_FSB1_Internal1_network:
-        - Internal1-net
         vm_flavor_name:
           get_input: fsb-flavor
-        port_FSB1_Internal2_mac_address:
-          get_input: fsb1-Internal1-mac
         vm_image_name:
           get_input: fsb-image
         compute_FSB_admin_pass:
         - STATIC-DATA-FSB1
+        port_FSB1_Internal_1_mac_address:
+          get_input: fsb1-Internal1-mac
+        port_FSB1_Internal_1_network:
+        - Internal1-net
+        port_FSB1_Internal_2_mac_address:
+          get_input: fsb1-Internal1-mac
+        port_FSB1_Internal_2_network:
+        - Internal2-net
         compute_FSB_metadata:
         - write_files:
           - path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0
@@ -196,6 +196,6 @@ topology_template:
         description: |
           Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
       members:
-      - FSB1_Internal2
-      - FSB1_Internal1
+      - FSB1_Internal_2
+      - FSB1_Internal_1
       - FSB1_template
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/in/MainServiceTemplate.yaml
index 21715db6f6..646d5e4091 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/in/MainServiceTemplate.yaml
@@ -87,7 +87,7 @@ topology_template:
       type: string
       description: prop
   node_templates:
-    FSB2_Internal2:
+    FSB2_Internal_2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_address:
@@ -98,7 +98,7 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: FSB2_template
           relationship: tosca.relationships.network.BindsTo
-    FSB2_Internal1:
+    FSB2_Internal_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_address:
@@ -109,7 +109,7 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: FSB1_template
           relationship: tosca.relationships.network.BindsTo
-    FSB1_Internal2:
+    FSB1_Internal_2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_address:
@@ -124,7 +124,7 @@ topology_template:
           capability: tosca.capabilities.network.Linkable
           node: jsa_net1
           relationship: tosca.relationships.network.LinksTo
-    FSB1_Internal1:
+    FSB1_Internal_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_address:
@@ -145,7 +145,7 @@ topology_template:
         shared: true
         network_name:
          get_attribute:
-          - FSB1_Internal1
+          - FSB1_Internal_1
           - network_id
         dhcp_agent_ids:
          get_attribute:
@@ -153,11 +153,11 @@ topology_template:
           - addresses
         tenant_id:
          get_attribute:
-          - FSB2_Internal2
+          - FSB2_Internal_2
           - network_id
         qos_policy:
          get_attribute:
-          - FSB2_Internal2
+          - FSB2_Internal_2
           - network_id
     FSB1_template:
       type: org.openecomp.resource.vfc.nodes.heat.FSB
@@ -242,9 +242,9 @@ topology_template:
         description: |
           Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
       members:
-      - FSB1_Internal1
-      - FSB1_Internal2
-      - FSB2_Internal1
-      - FSB2_Internal2
+      - FSB1_Internal_1
+      - FSB1_Internal_2
+      - FSB2_Internal_1
+      - FSB2_Internal_2
       - FSB1_template
       - FSB2_template
\ 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/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml
index 0a226df009..ca75560607 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml
@@ -88,7 +88,7 @@ topology_template:
       type: string
       description: prop
   node_templates:
-    FSB2_Internal2:
+    FSB2_Internal_2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_address:
@@ -99,7 +99,7 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: FSB2_template
           relationship: tosca.relationships.network.BindsTo
-    FSB2_Internal1:
+    FSB2_Internal_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_address:
@@ -110,7 +110,7 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: FSB1_template
           relationship: tosca.relationships.network.BindsTo
-    FSB1_Internal2:
+    FSB1_Internal_2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_address:
@@ -125,7 +125,7 @@ topology_template:
           capability: tosca.capabilities.network.Linkable
           node: jsa_net1
           relationship: tosca.relationships.network.LinksTo
-    FSB1_Internal1:
+    FSB1_Internal_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         mac_address:
@@ -146,7 +146,7 @@ topology_template:
         shared: true
         network_name:
           get_attribute:
-          - FSB1_Internal1
+          - FSB1_Internal_1
           - network_id
         dhcp_agent_ids:
           get_attribute:
@@ -154,11 +154,11 @@ topology_template:
           - addresses
         tenant_id:
           get_attribute:
-          - FSB2_Internal2
+          - FSB2_Internal_2
           - network_id
         qos_policy:
           get_attribute:
-          - FSB2_Internal2
+          - FSB2_Internal_2
           - network_id
     FSB1_template:
       type: org.openecomp.resource.vfc.nodes.heat.FSB
@@ -289,9 +289,9 @@ topology_template:
         description: |
           Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
       members:
-      - FSB1_Internal1
-      - FSB1_Internal2
-      - FSB2_Internal1
-      - FSB2_Internal2
+      - FSB1_Internal_1
+      - FSB1_Internal_2
+      - FSB2_Internal_1
+      - FSB2_Internal_2
       - FSB1_template
       - FSB2_template