CR Port Mirroring: add new properties

Add new properties nfc_naming_code and nf_naming_code.
Merge from release/1806.

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

17 files changed, 76 insertions, 11 deletions

diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml
index 47d424f407..ef11987f8c 100644
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml
@@ -560,8 +560,14 @@ data_types:
     properties:
       nf_type:
         type: string
+        description: deprecated
       nfc_type:
         type: string
+        description: deprecated
+      nf_naming_code:
+        type: string
+      nfc_naming_code:
+        type: string
       network_role:
         type: string
       pps_capacity:
diff --git a/openecomp-bdd/resources/yaml/Nested_FSB1ServiceTemplate.yaml b/openecomp-bdd/resources/yaml/Nested_FSB1ServiceTemplate.yaml
index 01add1bfaf..fb301b6ab6 100644
--- a/openecomp-bdd/resources/yaml/Nested_FSB1ServiceTemplate.yaml
+++ b/openecomp-bdd/resources/yaml/Nested_FSB1ServiceTemplate.yaml
@@ -110,7 +110,9 @@ topology_template:
           properties:
             connection_point:
               nf_type: ''
-              nfc_type: FSB1
+              nfc_type: ''
+              nf_naming_code: ''
+              nfc_naming_code: FSB1
               network_role:
                 get_input: port_FSB1_OAM_network_role
               pps_capacity: ''
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/PortMirroringEnricher.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/PortMirroringEnricher.java
index c95274d7fe..669fb1c0ee 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/PortMirroringEnricher.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/PortMirroringEnricher.java
@@ -248,7 +248,7 @@ public class PortMirroringEnricher {
         if (requirementAssignment.isPresent()) {
             RequirementAssignment bindingRequirementAssignment = requirementAssignment.get().get(0);
             String node = bindingRequirementAssignment.getNode();
-            connectionPoint.setNfc_type(node);
+            connectionPoint.setNfc_naming_code(node);
         }
     }
 
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/model/PortMirroringConnectionPointDescription.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/model/PortMirroringConnectionPointDescription.java
index c166938d2d..1c54e01743 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/model/PortMirroringConnectionPointDescription.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/model/PortMirroringConnectionPointDescription.java
@@ -6,6 +6,9 @@ import java.util.Objects;
 public class PortMirroringConnectionPointDescription {
   private String nf_type;
   private String nfc_type;
+  private String nf_naming_code;
+  private String nfc_naming_code;
+
   //Keeping below attributes as objects to accomodate for tosca functions for property
   // values like get_input, get_attribute
   private Object network_role;
@@ -15,6 +18,8 @@ public class PortMirroringConnectionPointDescription {
     //Populating empty strings as default values to be populated in tosca
     nf_type = "";
     nfc_type = "";
+    nf_naming_code = "";
+    nfc_naming_code = "";
     network_role = "";
     pps_capacity = "";
   }
@@ -35,6 +40,22 @@ public class PortMirroringConnectionPointDescription {
     this.nfc_type = nfc_type;
   }
 
+  public String getNf_naming_code() {
+    return nf_naming_code;
+  }
+
+  public void setNf_naming_code(String nf_naming_code) {
+    this.nf_naming_code = nf_naming_code;
+  }
+
+  public String getNfc_naming_code() {
+    return nfc_naming_code;
+  }
+
+  public void setNfc_naming_code(String nfc_naming_code) {
+    this.nfc_naming_code = nfc_naming_code;
+  }
+
   public Object getNetwork_role() {
     return network_role;
   }
@@ -54,6 +75,8 @@ public class PortMirroringConnectionPointDescription {
   public boolean isEmpty() {
     return Objects.isNull(nf_type)
         && Objects.isNull(nfc_type)
+        && Objects.isNull(nf_naming_code)
+        && Objects.isNull(nfc_naming_code)
         && Objects.isNull(network_role)
         && Objects.isNull(pps_capacity);
   }
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..c4ff5b33a5 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
@@ -127,7 +127,9 @@ topology_template:
           properties:
             connection_point:
               nf_type: ''
-              nfc_type: pd_server
+              nfc_type: ''
+              nf_naming_code: ''
+              nfc_naming_code: pd_server
               network_role:
                 get_input: port_pd02_port_network_role
               pps_capacity: ''
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..e239d4cb2c 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
@@ -127,7 +127,9 @@ topology_template:
           properties:
             connection_point:
               nf_type: ''
-              nfc_type: pd_server
+              nfc_type: ''
+              nf_naming_code: ''
+              nfc_naming_code: pd_server
               network_role:
                 get_input: port_pd01_port_network_role
               pps_capacity: ''
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..ad711d82ad 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
@@ -127,7 +127,9 @@ topology_template:
           properties:
             connection_point:
               nf_type: ''
-              nfc_type: pd_server
+              nfc_type: ''
+              nf_naming_code: ''
+              nfc_naming_code: pd_server
               network_role:
                 get_input: port_pd01_port_network_role
               pps_capacity: ''
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 23c111c687..a1580dc606 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
@@ -127,7 +127,9 @@ topology_template:
           properties:
             connection_point:
               nf_type: ''
-              nfc_type: pd_server
+              nfc_type: ''
+              nf_naming_code: ''
+              nfc_naming_code: pd_server
               network_role:
                 get_input: port_ps02_port_network_role
               pps_capacity: ''
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..eeffe69377 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
@@ -127,7 +127,9 @@ topology_template:
           properties:
             connection_point:
               nf_type: ''
-              nfc_type: pd_server
+              nfc_type: ''
+              nf_naming_code: ''
+              nfc_naming_code: pd_server
               network_role:
                 get_input: port_pd02_port_network_role
               pps_capacity: ''
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/MainServiceTemplate.yaml
index 8841a6d74b..f7cc2f2d15 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/MainServiceTemplate.yaml
@@ -220,6 +220,8 @@ topology_template:
             connection_point:
               nf_type: ''
               nfc_type: ''
+              nf_naming_code: ''
+              nfc_naming_code: ''
               network_role: ''
               pps_capacity: ''
     compute_port_1:
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/nested-pcm_v0.1ServiceTemplate.yaml
index 5c6f4aee86..b4a9aa1e9c 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -260,6 +260,8 @@ topology_template:
             connection_point:
               nf_type: ''
               nfc_type: ''
+              nf_naming_code: ''
+              nfc_naming_code: ''
               network_role: ''
               pps_capacity: ''
     pcm_2port_2:
@@ -328,7 +330,9 @@ topology_template:
           properties:
             connection_point:
               nf_type: ''
-              nfc_type: server_pcm
+              nfc_type: ''
+              nf_naming_code: ''
+              nfc_naming_code: server_pcm
               network_role:
                 get_input: port_pcm_2port_1_network_role
               pps_capacity: ''
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/scalingInstance/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/scalingInstance/out/MainServiceTemplate.yaml
index 45ebd436d0..3335e0946d 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/scalingInstance/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/scalingInstance/out/MainServiceTemplate.yaml
@@ -140,6 +140,8 @@ topology_template:
             connection_point:
               nf_type: ''
               nfc_type: ''
+              nf_naming_code: ''
+              nfc_naming_code: ''
               network_role: ''
               pps_capacity: ''
     pd04_port_1:
@@ -161,6 +163,8 @@ topology_template:
             connection_point:
               nf_type: ''
               nfc_type: ''
+              nf_naming_code: ''
+              nfc_naming_code: ''
               network_role: ''
               pps_capacity: ''
     pd03_port_1:
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 b0a2f1668d..75693bcfe7 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
@@ -197,7 +197,9 @@ topology_template:
           properties:
             connection_point:
               nf_type: ''
-              nfc_type: pd_server
+              nfc_type: ''
+              nf_naming_code: ''
+              nfc_naming_code: pd_server
               network_role:
                 get_input: port_pd02_port_network_role
               pps_capacity: ''
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 dea55c7b77..4c1b28d784 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
@@ -282,6 +282,8 @@ topology_template:
             connection_point:
               nf_type: ''
               nfc_type: ''
+              nf_naming_code: ''
+              nfc_naming_code: ''
               network_role: ''
               pps_capacity: ''
     template_VMInt_OAM_lb_external_VMI:
@@ -319,6 +321,8 @@ topology_template:
             connection_point:
               nf_type: ''
               nfc_type: ''
+              nf_naming_code: ''
+              nfc_naming_code: ''
               network_role: ''
               pps_capacity: ''
     pd05_port_0:
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 f80a037197..65b720372a 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
@@ -387,7 +387,9 @@ topology_template:
           properties:
             connection_point:
               nf_type: ''
-              nfc_type: pd_server
+              nfc_type: ''
+              nf_naming_code: ''
+              nfc_naming_code: pd_server
               network_role:
                 get_input: port_pd03_port_network_role
               pps_capacity: ''
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 3a697467c9..e439060f19 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
@@ -298,6 +298,8 @@ topology_template:
             connection_point:
               nf_type: ''
               nfc_type: ''
+              nf_naming_code: ''
+              nfc_naming_code: ''
               network_role: ''
               pps_capacity: ''
     pd01_port_4:
@@ -338,6 +340,8 @@ topology_template:
             connection_point:
               nf_type: ''
               nfc_type: ''
+              nf_naming_code: ''
+              nfc_naming_code: ''
               network_role: ''
               pps_capacity: ''
     packet_internal_network:
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 567b020dd4..e9b62d239c 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
@@ -271,7 +271,9 @@ topology_template:
           properties:
             connection_point:
               nf_type: ''
-              nfc_type: pd_server
+              nfc_type: ''
+              nf_naming_code: ''
+              nfc_naming_code: pd_server
               network_role:
                 get_input: port_pd01_port_2_network_role
               pps_capacity: ''