Code change to support new global type

Code change to support new global type for VMI port

Change-Id: I30427a8ec784c8d314c3df0e34178587dda0351c
Issue-ID: SDC-1070
Signed-off-by: siddharth0905 <siddharth.singh4@amdocs.com>

11 files changed, 146 insertions, 148 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_serverServiceTemplate.yaml
index 1cee498cd2..796b811eb4 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_serverServiceTemplate.yaml
@@ -6,8 +6,6 @@ imports:
     file: openecomp-heat/_index.yml
 - GlobalSubstitutionTypes:
     file: GlobalSubstitutionTypesServiceTemplate.yaml
-- openecomp_index:
-    file: openecomp/_index.yml
 node_types:
   org.openecomp.resource.vfc.nodes.heat.pd_server:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
@@ -95,24 +93,24 @@ topology_template:
           - compute_pd_server_user_data_format
           - index_value
     pd_server_pd02_port:
-      type: org.openecomp.resource.cp.v2.extNeutronCP
+      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        ip_requirements:
-          get_input: port_pd02_port_ip_requirements
-        network_role:
-          get_input: port_pd02_port_network_role
-        subnetpoolid:
-          get_input: port_pd02_port_subnetpoolid
-        mac_requirements:
-          get_input: port_pd02_port_mac_requirements
         exCP_naming:
           get_input: port_pd02_port_exCP_naming
         vlan_requirements:
           get_input: port_pd02_port_vlan_requirements
+        ip_requirements:
+          get_input: port_pd02_port_ip_requirements
         network_role_tag:
           get_input: port_pd02_port_network_role_tag
+        mac_requirements:
+          get_input: port_pd02_port_mac_requirements
         order:
           get_input: port_pd02_port_order
+        network_role:
+          get_input: port_pd02_port_network_role
+        subnetpoolid:
+          get_input: port_pd02_port_subnetpoolid
         network:
           get_input:
           - port_pd02_port_network
@@ -122,15 +120,6 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: pd_server
           relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        port_mirroring:
-          properties:
-            connection_point:
-              nf_type: ''
-              nfc_type: pd_server
-              network_role:
-                get_input: port_pd02_port_network_role
-              pps_capacity: ''
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.pd_server
     capabilities:
@@ -290,9 +279,6 @@ topology_template:
       network.incoming.bytes_pd_server_pd02_port:
       - pd_server_pd02_port
       - network.incoming.bytes
-      port_mirroring_pd_server_pd02_port:
-      - pd_server_pd02_port
-      - port_mirroring
     requirements:
       local_storage_pd_server:
       - pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_1ServiceTemplate.yaml
index 9722ffec88..a6d8533b57 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -6,8 +6,6 @@ imports:
     file: openecomp-heat/_index.yml
 - GlobalSubstitutionTypes:
     file: GlobalSubstitutionTypesServiceTemplate.yaml
-- openecomp_index:
-    file: openecomp/_index.yml
 node_types:
   org.openecomp.resource.vfc.nodes.heat.pd_server:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
@@ -95,24 +93,24 @@ topology_template:
           - compute_pd_server_user_data_format
           - index_value
     pd_server_pd01_port:
-      type: org.openecomp.resource.cp.v2.extNeutronCP
+      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        ip_requirements:
-          get_input: port_pd01_port_ip_requirements
-        network_role:
-          get_input: port_pd01_port_network_role
-        subnetpoolid:
-          get_input: port_pd01_port_subnetpoolid
-        mac_requirements:
-          get_input: port_pd01_port_mac_requirements
         exCP_naming:
           get_input: port_pd01_port_exCP_naming
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
+        ip_requirements:
+          get_input: port_pd01_port_ip_requirements
         network_role_tag:
           get_input: port_pd01_port_network_role_tag
+        mac_requirements:
+          get_input: port_pd01_port_mac_requirements
         order:
           get_input: port_pd01_port_order
+        network_role:
+          get_input: port_pd01_port_network_role
+        subnetpoolid:
+          get_input: port_pd01_port_subnetpoolid
         network:
           get_input:
           - port_pd01_port_network
@@ -122,15 +120,6 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: pd_server
           relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        port_mirroring:
-          properties:
-            connection_point:
-              nf_type: ''
-              nfc_type: pd_server
-              network_role:
-                get_input: port_pd01_port_network_role
-              pps_capacity: ''
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.pd_server_1
     capabilities:
@@ -290,9 +279,6 @@ topology_template:
       disk.device.iops_pd_server:
       - pd_server
       - disk.device.iops
-      port_mirroring_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - port_mirroring
     requirements:
       local_storage_pd_server:
       - pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_3ServiceTemplate.yaml
index 4d98183c51..9f140e097e 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_3ServiceTemplate.yaml
@@ -6,8 +6,6 @@ imports:
     file: openecomp-heat/_index.yml
 - GlobalSubstitutionTypes:
     file: GlobalSubstitutionTypesServiceTemplate.yaml
-- openecomp_index:
-    file: openecomp/_index.yml
 node_types:
   org.openecomp.resource.vfc.nodes.heat.pd_server:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
@@ -95,24 +93,24 @@ topology_template:
           - compute_pd_server_user_data_format
           - index_value
     pd_server_pd01_port:
-      type: org.openecomp.resource.cp.v2.extNeutronCP
+      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        ip_requirements:
-          get_input: port_pd01_port_ip_requirements
-        network_role:
-          get_input: port_pd01_port_network_role
-        subnetpoolid:
-          get_input: port_pd01_port_subnetpoolid
-        mac_requirements:
-          get_input: port_pd01_port_mac_requirements
         exCP_naming:
           get_input: port_pd01_port_exCP_naming
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
+        ip_requirements:
+          get_input: port_pd01_port_ip_requirements
         network_role_tag:
           get_input: port_pd01_port_network_role_tag
+        mac_requirements:
+          get_input: port_pd01_port_mac_requirements
         order:
           get_input: port_pd01_port_order
+        network_role:
+          get_input: port_pd01_port_network_role
+        subnetpoolid:
+          get_input: port_pd01_port_subnetpoolid
         network:
           get_input:
           - port_pd01_port_network
@@ -122,15 +120,6 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: pd_server
           relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        port_mirroring:
-          properties:
-            connection_point:
-              nf_type: ''
-              nfc_type: pd_server
-              network_role:
-                get_input: port_pd01_port_network_role
-              pps_capacity: ''
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.pd_server_3
     capabilities:
@@ -290,9 +279,6 @@ topology_template:
       disk.device.iops_pd_server:
       - pd_server
       - disk.device.iops
-      port_mirroring_pd_server_pd01_port:
-      - pd_server_pd01_port
-      - port_mirroring
     requirements:
       local_storage_pd_server:
       - pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_4ServiceTemplate.yaml
index 44f068ba31..0022b21c24 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_4ServiceTemplate.yaml
@@ -6,8 +6,6 @@ imports:
     file: openecomp-heat/_index.yml
 - GlobalSubstitutionTypes:
     file: GlobalSubstitutionTypesServiceTemplate.yaml
-- openecomp_index:
-    file: openecomp/_index.yml
 node_types:
   org.openecomp.resource.vfc.nodes.heat.pd_server:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
@@ -95,24 +93,24 @@ topology_template:
           - compute_pd_server_user_data_format
           - index_value
     pd_server_ps02_port:
-      type: org.openecomp.resource.cp.v2.extNeutronCP
+      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        ip_requirements:
-          get_input: port_ps02_port_ip_requirements
-        network_role:
-          get_input: port_ps02_port_network_role
-        subnetpoolid:
-          get_input: port_ps02_port_subnetpoolid
-        mac_requirements:
-          get_input: port_ps02_port_mac_requirements
         exCP_naming:
           get_input: port_ps02_port_exCP_naming
         vlan_requirements:
           get_input: port_ps02_port_vlan_requirements
+        ip_requirements:
+          get_input: port_ps02_port_ip_requirements
         network_role_tag:
           get_input: port_ps02_port_network_role_tag
+        mac_requirements:
+          get_input: port_ps02_port_mac_requirements
         order:
           get_input: port_ps02_port_order
+        network_role:
+          get_input: port_ps02_port_network_role
+        subnetpoolid:
+          get_input: port_ps02_port_subnetpoolid
         network:
           get_input:
           - port_ps02_port_network
@@ -122,15 +120,6 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: pd_server
           relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        port_mirroring:
-          properties:
-            connection_point:
-              nf_type: ''
-              nfc_type: pd_server
-              network_role:
-                get_input: port_ps02_port_network_role
-              pps_capacity: ''
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.pd_server_4
     capabilities:
@@ -290,9 +279,6 @@ topology_template:
       disk.device.iops_pd_server:
       - pd_server
       - disk.device.iops
-      port_mirroring_pd_server_ps02_port:
-      - pd_server_ps02_port
-      - port_mirroring
     requirements:
       local_storage_pd_server:
       - pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_6ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_6ServiceTemplate.yaml
index 4750ccc1f2..653d1b6454 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_6ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_6ServiceTemplate.yaml
@@ -6,8 +6,6 @@ imports:
     file: openecomp-heat/_index.yml
 - GlobalSubstitutionTypes:
     file: GlobalSubstitutionTypesServiceTemplate.yaml
-- openecomp_index:
-    file: openecomp/_index.yml
 node_types:
   org.openecomp.resource.vfc.nodes.heat.pd_server:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
@@ -95,24 +93,24 @@ topology_template:
           - compute_pd_server_user_data_format
           - index_value
     pd_server_pd02_port:
-      type: org.openecomp.resource.cp.v2.extNeutronCP
+      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        ip_requirements:
-          get_input: port_pd02_port_ip_requirements
-        network_role:
-          get_input: port_pd02_port_network_role
-        subnetpoolid:
-          get_input: port_pd02_port_subnetpoolid
-        mac_requirements:
-          get_input: port_pd02_port_mac_requirements
         exCP_naming:
           get_input: port_pd02_port_exCP_naming
         vlan_requirements:
           get_input: port_pd02_port_vlan_requirements
+        ip_requirements:
+          get_input: port_pd02_port_ip_requirements
         network_role_tag:
           get_input: port_pd02_port_network_role_tag
+        mac_requirements:
+          get_input: port_pd02_port_mac_requirements
         order:
           get_input: port_pd02_port_order
+        network_role:
+          get_input: port_pd02_port_network_role
+        subnetpoolid:
+          get_input: port_pd02_port_subnetpoolid
         network:
           get_input:
           - port_pd02_port_network
@@ -122,15 +120,6 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: pd_server
           relationship: tosca.relationships.network.BindsTo
-      capabilities:
-        port_mirroring:
-          properties:
-            connection_point:
-              nf_type: ''
-              nfc_type: pd_server
-              network_role:
-                get_input: port_pd02_port_network_role
-              pps_capacity: ''
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.pd_server_6
     capabilities:
@@ -290,9 +279,6 @@ topology_template:
       network.incoming.bytes_pd_server_pd02_port:
       - pd_server_pd02_port
       - network.incoming.bytes
-      port_mirroring_pd_server_pd02_port:
-      - pd_server_pd02_port
-      - port_mirroring
     requirements:
       local_storage_pd_server:
       - pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/Nested_computeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/Nested_computeServiceTemplate.yaml
index 7a9311c041..65e0231a73 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/Nested_computeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/Nested_computeServiceTemplate.yaml
@@ -6,6 +6,8 @@ imports:
     file: openecomp-heat/_index.yml
 - GlobalSubstitutionTypes:
     file: GlobalSubstitutionTypesServiceTemplate.yaml
+- openecomp_index:
+    file: openecomp/_index.yml
 node_types:
   org.openecomp.resource.vfc.nodes.heat.compute:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
@@ -111,7 +113,7 @@ topology_template:
           - compute_compute_user_data_format
           - index_value
     compute_compute_port:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+      type: org.openecomp.resource.cp.v2.extNeutronCP
       properties:
         exCP_naming:
           get_input: port_compute_port_exCP_naming
@@ -138,6 +140,15 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: compute
           relationship: tosca.relationships.network.BindsTo
+      capabilities:
+        port_mirroring:
+          properties:
+            connection_point:
+              nf_type: ''
+              nfc_type: compute
+              network_role:
+                get_input: port_compute_port_network_role
+              pps_capacity: ''
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.compute
     capabilities:
@@ -297,6 +308,9 @@ topology_template:
       disk.device.allocation_compute:
       - compute
       - disk.device.allocation
+      port_mirroring_compute_compute_port:
+      - compute_compute_port
+      - port_mirroring
     requirements:
       local_storage_compute:
       - compute
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/scalingInstance/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/scalingInstance/out/Nested_pd_serverServiceTemplate.yaml
index 0f80630051..b0a2f1668d 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/scalingInstance/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/scalingInstance/out/Nested_pd_serverServiceTemplate.yaml
@@ -167,26 +167,26 @@ topology_template:
     pd_server_pd02_port:
       type: org.openecomp.resource.cp.v2.extNeutronCP
       properties:
+        exCP_naming:
+          get_input: port_pd02_port_exCP_naming
         replacement_policy:
           get_input:
           - port_pd02_port_replacement_policy
           - index_value
-        ip_requirements:
-          get_input: port_pd02_port_ip_requirements
-        network_role:
-          get_input: port_pd02_port_network_role
-        subnetpoolid:
-          get_input: port_pd02_port_subnetpoolid
-        mac_requirements:
-          get_input: port_pd02_port_mac_requirements
-        exCP_naming:
-          get_input: port_pd02_port_exCP_naming
         vlan_requirements:
           get_input: port_pd02_port_vlan_requirements
+        ip_requirements:
+          get_input: port_pd02_port_ip_requirements
         network_role_tag:
           get_input: port_pd02_port_network_role_tag
+        mac_requirements:
+          get_input: port_pd02_port_mac_requirements
         order:
           get_input: port_pd02_port_order
+        network_role:
+          get_input: port_pd02_port_network_role
+        subnetpoolid:
+          get_input: port_pd02_port_subnetpoolid
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/diffPortType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/diffPortType/out/MainServiceTemplate.yaml
index 8fd8b17b55..dea55c7b77 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/diffPortType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/diffPortType/out/MainServiceTemplate.yaml
@@ -285,7 +285,34 @@ topology_template:
               network_role: ''
               pps_capacity: ''
     template_VMInt_OAM_lb_external_VMI:
-      type: org.openecomp.resource.cp.v2.extContrailCP
+      type: org.openecomp.resource.cp.v2.extVirtualMachineInterfaceCP
+      properties:
+        name: template_VMInt_OAM_lb_NAME
+        security_group_refs:
+        - get_input: oam_sec_group_name
+        virtual_machine_interface_properties:
+          service_interface_type:
+            get_input: lb_st_interface_type_oam
+        port_tuple_refs:
+        - get_input: template_PortTuple_LB1
+        virtual_machine_interface_allowed_address_pairs:
+          allowed_address_pair:
+          - address_mode: active-standby
+            ip:
+              ip_prefix:
+                get_input: virtual_ip_address
+              ip_prefix_len: 32
+            mac:
+              get_input: mac_address
+          - address_mode: active-standby
+            ip:
+              ip_prefix:
+                get_input: virtual_ipv6_address
+              ip_prefix_len: 128
+            mac:
+              get_input: mac_address
+        virtual_machine_interface_mac_addresses:
+        - get_input: mac_address
       capabilities:
         port_mirroring:
           properties:
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/diffPortType/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/diffPortType/out/Nested_pd_serverServiceTemplate.yaml
index 1c327d212e..f80a037197 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/diffPortType/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/diffPortType/out/Nested_pd_serverServiceTemplate.yaml
@@ -357,26 +357,26 @@ topology_template:
     pd_server_pd03_port:
       type: org.openecomp.resource.cp.v2.extNeutronCP
       properties:
+        exCP_naming:
+          get_input: port_pd03_port_exCP_naming
         replacement_policy:
           get_input:
           - port_pd03_port_replacement_policy
           - index_value
-        ip_requirements:
-          get_input: port_pd03_port_ip_requirements
-        network_role:
-          get_input: port_pd03_port_network_role
-        subnetpoolid:
-          get_input: port_pd03_port_subnetpoolid
-        mac_requirements:
-          get_input: port_pd03_port_mac_requirements
-        exCP_naming:
-          get_input: port_pd03_port_exCP_naming
         vlan_requirements:
           get_input: port_pd03_port_vlan_requirements
+        ip_requirements:
+          get_input: port_pd03_port_ip_requirements
         network_role_tag:
           get_input: port_pd03_port_network_role_tag
+        mac_requirements:
+          get_input: port_pd03_port_mac_requirements
         order:
           get_input: port_pd03_port_order
+        network_role:
+          get_input: port_pd03_port_network_role
+        subnetpoolid:
+          get_input: port_pd03_port_subnetpoolid
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/samePortType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/samePortType/out/MainServiceTemplate.yaml
index 8a030f4628..3a697467c9 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/samePortType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/samePortType/out/MainServiceTemplate.yaml
@@ -264,7 +264,34 @@ topology_template:
           node: pd01_volume
           relationship: pd01_volume_attachment
     template_VMInt_OAM_lb_external_VMI:
-      type: org.openecomp.resource.cp.v2.extContrailCP
+      type: org.openecomp.resource.cp.v2.extVirtualMachineInterfaceCP
+      properties:
+        name: template_VMInt_OAM_lb_NAME
+        security_group_refs:
+        - get_input: oam_sec_group_name
+        virtual_machine_interface_properties:
+          service_interface_type:
+            get_input: lb_st_interface_type_oam
+        port_tuple_refs:
+        - get_input: template_PortTuple_LB1
+        virtual_machine_interface_allowed_address_pairs:
+          allowed_address_pair:
+          - address_mode: active-standby
+            ip:
+              ip_prefix:
+                get_input: virtual_ip_address
+              ip_prefix_len: 32
+            mac:
+              get_input: mac_address
+          - address_mode: active-standby
+            ip:
+              ip_prefix:
+                get_input: virtual_ipv6_address
+              ip_prefix_len: 128
+            mac:
+              get_input: mac_address
+        virtual_machine_interface_mac_addresses:
+        - get_input: mac_address
       capabilities:
         port_mirroring:
           properties:
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/samePortType/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/samePortType/out/Nested_pd_serverServiceTemplate.yaml
index 4cd5cd0894..567b020dd4 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/samePortType/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/samePortType/out/Nested_pd_serverServiceTemplate.yaml
@@ -241,26 +241,26 @@ topology_template:
     pd_server_pd01_port_2:
       type: org.openecomp.resource.cp.v2.extNeutronCP
       properties:
+        exCP_naming:
+          get_input: port_pd01_port_2_exCP_naming
         replacement_policy:
           get_input:
           - port_pd01_port_2_replacement_policy
           - index_value
-        ip_requirements:
-          get_input: port_pd01_port_2_ip_requirements
-        network_role:
-          get_input: port_pd01_port_2_network_role
-        subnetpoolid:
-          get_input: port_pd01_port_2_subnetpoolid
-        mac_requirements:
-          get_input: port_pd01_port_2_mac_requirements
-        exCP_naming:
-          get_input: port_pd01_port_2_exCP_naming
         vlan_requirements:
           get_input: port_pd01_port_2_vlan_requirements
+        ip_requirements:
+          get_input: port_pd01_port_2_ip_requirements
         network_role_tag:
           get_input: port_pd01_port_2_network_role_tag
+        mac_requirements:
+          get_input: port_pd01_port_2_mac_requirements
         order:
           get_input: port_pd01_port_2_order
+        network_role:
+          get_input: port_pd01_port_2_network_role
+        subnetpoolid:
+          get_input: port_pd01_port_2_subnetpoolid
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable