TCA:Changed VNF alert vnf-id to vnf-name

Change-Id: I308ba9b6079a964b7326a0fe5e1a62eff15d710b
Signed-off-by: Singla, Rajiv (rs153v) <rs153v@att.com>
Issue-Id: DCAEGEN2-175

9 files changed, 39 insertions, 40 deletions

diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/AnalyticsConstants.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/AnalyticsConstants.java
index a463089..c362990 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/AnalyticsConstants.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/AnalyticsConstants.java
@@ -106,7 +106,7 @@ public abstract class AnalyticsConstants {
     // VNF Constants

     public static final String TCA_VES_RESPONSE_VNF_TARGET_TYPE = "VNF";

     public static final String AAI_VNF_KEY_PREFIX = "generic-vnf.";

-    public static final String TCA_VES_RESPONSE_VNF_TARGET = AAI_VNF_KEY_PREFIX + "vnf-id";

+    public static final String TCA_VES_RESPONSE_VNF_TARGET = AAI_VNF_KEY_PREFIX + "vnf-name";

     // VM Constants

     public static final String TCA_VES_RESPONSE_VM_TARGET_TYPE = "VM";

     public static final String AAI_VSERVER_KEY_PREFIX = "vserver.";

diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAI.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAI.java
index 5a471a3..91cfdef 100644
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAI.java
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAI.java
@@ -34,8 +34,8 @@ public class AAI extends BaseDynamicPropertiesProvider implements TCAFacadeModel
 

     private static final long serialVersionUID = 1L;

 

-    private String genericVNFId;

+    private String genericVNFName;

 

-    private String genericServerId;

+    private String genericServerName;

 

 }

diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/AAIMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/AAIMixin.java
index 967cf88..b6b2b05 100644
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/AAIMixin.java
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/AAIMixin.java
@@ -30,26 +30,26 @@ import org.openecomp.dcae.apod.analytics.model.util.json.mixin.BaseDynamicProper
  */

 public abstract class AAIMixin extends BaseDynamicPropertiesProviderMixin {

 

-    private String genericVNFId;

-    private String genericServerId;

+    private String genericVNFName;

+    private String genericServerName;

 

-    @JsonGetter("generic-vnf.vnf-id")

-    public String getGenericVNFId() {

-        return genericVNFId;

+    @JsonGetter("generic-vnf.vnf-name")

+    public String getGenericVNFName() {

+        return genericVNFName;

     }

 

-    @JsonSetter("generic-vnf.vnf-id")

-    public void setGenericVNFId(String genericVNFId) {

-        this.genericVNFId = genericVNFId;

+    @JsonSetter("generic-vnf.vnf-name")

+    public void setGenericVNFName(String genericVNFName) {

+        this.genericVNFName = genericVNFName;

     }

 

     @JsonGetter("vserver.vserver-name")

-    public String getGenericServerId() {

-        return genericServerId;

+    public String getGenericServerName() {

+        return genericServerName;

     }

 

     @JsonSetter("vserver.vserver-name")

-    public void setGenericServerId(String genericServerId) {

-        this.genericServerId = genericServerId;

+    public void setGenericServerName(String genericServerName) {

+        this.genericServerName = genericServerName;

     }

 }

diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAITest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAITest.java
index f47b391..689633b 100644
--- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAITest.java
+++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAITest.java
@@ -43,15 +43,15 @@ public class AAITest extends BaseAnalyticsModelUnitTest {
 

     @Test

     public void getGenericVNFId() throws Exception {

-        aai.setGenericVNFId(GENERIC_VNF_ID);

-        assertThat("VNFID must be same", aai.getGenericVNFId(), is(GENERIC_VNF_ID));

+        aai.setGenericVNFName(GENERIC_VNF_ID);

+        assertThat("VNFID must be same", aai.getGenericVNFName(), is(GENERIC_VNF_ID));

     }

 

     @Test

     public void setGenericVNFId() throws Exception {

         final String genericVNFId = "testVNFID";

-        aai.setGenericVNFId(GENERIC_VNF_ID);

-        aai.setGenericVNFId(CHANGED_GENERIC_VNF_ID);

-        assertThat("VNFID must be same as changed VNFID", aai.getGenericVNFId(), is(CHANGED_GENERIC_VNF_ID));

+        aai.setGenericVNFName(GENERIC_VNF_ID);

+        aai.setGenericVNFName(CHANGED_GENERIC_VNF_ID);

+        assertThat("VNFID must be same as changed VNFID", aai.getGenericVNFName(), is(CHANGED_GENERIC_VNF_ID));

     }

 }

diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/facade/tca/TCAVESResponseTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/facade/tca/TCAVESResponseTest.java
index c58abf4..3724c8d 100644
--- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/facade/tca/TCAVESResponseTest.java
+++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/facade/tca/TCAVESResponseTest.java
@@ -40,7 +40,7 @@ public class TCAVESResponseTest extends BaseAnalyticsModelUnitTest {
             assertJsonConversions(TCA_VES_CEF_RESPONSE_JSON_FILE_LOCATION, TCAVESResponse.class);

 

         assertThat("VES CEF Message Response AAI generics VNF Id must match",

-                vesCEFMessageResponse.getAai().getGenericVNFId(), is("vpp-test(?)"));

+                vesCEFMessageResponse.getAai().getGenericVNFName(), is("vpp-test(?)"));

 

         assertThat("VES CEF Message target type must be parsed correctly as VNF",

                 vesCEFMessageResponse.getTargetType(), is("VNF"));

@@ -56,8 +56,8 @@ public class TCAVESResponseTest extends BaseAnalyticsModelUnitTest {
         assertThat("closedLoopEventClient must be tca.instance00001",

                 vesCEFMessageResponse.getClosedLoopEventClient(), is("tca.instance00001"));

         assertThat("target_type must be VNF", vesCEFMessageResponse.getTargetType(), is("VNF"));

-        assertThat("target must be VNF", vesCEFMessageResponse.getTarget(), is("generic-vnf.vnf-id"));

-        assertThat("aai generic vnf id must be vpp-test(?)", vesCEFMessageResponse.getAai().getGenericVNFId(),

+        assertThat("target must be VNF", vesCEFMessageResponse.getTarget(), is("generic-vnf.vnf-name"));

+        assertThat("aai generic vnf id must be vpp-test(?)", vesCEFMessageResponse.getAai().getGenericVNFName(),

                 is("vpp-test(?)"));

         assertThat("from must be DCAE", vesCEFMessageResponse.getFrom(), is("DCAE"));

         assertThat("policyScope must be resource=vFirewall;type=configuration",

diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/TCAVESResponseMixinTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/TCAVESResponseMixinTest.java
index ca9a288..98c52af 100644
--- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/TCAVESResponseMixinTest.java
+++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/TCAVESResponseMixinTest.java
@@ -42,10 +42,10 @@ public class TCAVESResponseMixinTest extends BaseAnalyticsModelUnitTest {
             assertJsonConversions(TCA_VES_CEF_RESPONSE_JSON_FILE_LOCATION, TCAVESResponse.class);

 

         assertThat("VES CEF Message Response AAI generics VNF Id must match",

-                vesCEFMessageResponse.getAai().getGenericVNFId(), is("vpp-test(?)"));

+                vesCEFMessageResponse.getAai().getGenericVNFName(), is("vpp-test(?)"));

 

         assertThat("VES CEF Message Response AAI generic Server Id must match",

-                vesCEFMessageResponse.getAai().getGenericServerId(), is("dfw1lb01lb01"));

+                vesCEFMessageResponse.getAai().getGenericServerName(), is("dfw1lb01lb01"));

 

         assertThat("VES CEF Message target type must be parsed correctly as VNF",

                 vesCEFMessageResponse.getTargetType(), is("VNF"));

diff --git a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/utils/TCAUtils.java b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/utils/TCAUtils.java
index 4011e52..e6e96f1 100644
--- a/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/utils/TCAUtils.java
+++ b/dcae-analytics-tca/src/main/java/org/openecomp/dcae/apod/analytics/tca/utils/TCAUtils.java
@@ -540,15 +540,15 @@ public abstract class TCAUtils extends AnalyticsModelJsonUtils {
             // Hard Coded - "vserver.vserver-name"

             tcavesResponse.setTarget(AnalyticsConstants.TCA_VES_RESPONSE_VM_TARGET);

             // commonEventHeader.sourceName from the received VES message

-            aai.setGenericServerId(commonEventHeader.getSourceName());

+            aai.setGenericServerName(commonEventHeader.getSourceName());

         } else {

             // VNF specific settings

             // Hard Coded - "VNF"

             tcavesResponse.setTargetType(AnalyticsConstants.TCA_VES_RESPONSE_VNF_TARGET_TYPE);

-            // Hard Coded - "generic-vnf.vnf-id"

+            // Hard Coded - "generic-vnf.vnf-name"

             tcavesResponse.setTarget(AnalyticsConstants.TCA_VES_RESPONSE_VNF_TARGET);

             // commonEventHeader.sourceName from the received VES message

-            aai.setGenericVNFId(commonEventHeader.getSourceName());

+            aai.setGenericVNFName(commonEventHeader.getSourceName());

         }

 

         // Hard Coded - "DCAE"

@@ -575,7 +575,7 @@ public abstract class TCAUtils extends AnalyticsModelJsonUtils {
      */

     public static ControlLoopSchemaType determineControlLoopSchemaType(final TCAVESResponse tcavesResponse) {

         final AAI aai = tcavesResponse.getAai();

-        if (aai.getGenericServerId() != null) {

+        if (aai.getGenericServerName() != null) {

             return ControlLoopSchemaType.VM;

         } else {

             return ControlLoopSchemaType.VNF;

@@ -591,10 +591,10 @@ public abstract class TCAUtils extends AnalyticsModelJsonUtils {
      */

     public static String determineSourceName(final TCAVESResponse tcavesResponse) {

         final AAI aai = tcavesResponse.getAai();

-        if (aai.getGenericServerId() != null) {

-            return aai.getGenericServerId();

+        if (aai.getGenericServerName() != null) {

+            return aai.getGenericServerName();

         } else {

-            return aai.getGenericVNFId();

+            return aai.getGenericVNFName();

         }

     }

 

diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/utils/TCAUtilsTest.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/utils/TCAUtilsTest.java
index 426bd1e..c218de6 100644
--- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/utils/TCAUtilsTest.java
+++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/utils/TCAUtilsTest.java
@@ -20,7 +20,6 @@
 

 package org.openecomp.dcae.apod.analytics.tca.utils;

 

-import com.fasterxml.jackson.databind.JsonNode;

 import com.google.common.base.Supplier;

 import com.google.common.collect.ImmutableSet;

 import com.google.common.collect.Table;

@@ -42,7 +41,6 @@ import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Direction;
 import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.MetricsPerEventName;

 import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy;

 import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Threshold;

-import org.openecomp.dcae.apod.analytics.model.facade.tca.AAI;

 import org.openecomp.dcae.apod.analytics.model.facade.tca.TCAVESResponse;

 import org.openecomp.dcae.apod.analytics.tca.BaseAnalyticsTCAUnitTest;

 import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFProcessorContext;

@@ -184,8 +182,8 @@ public class TCAUtilsTest extends BaseAnalyticsTCAUnitTest {
                 is("CL-LBAL-LOW-TRAFFIC-SIG-FB480F95-A453-6F24-B767-FD703241AB1A"));

         assertThat(tcaVESResponse.getVersion(), is("Test Version"));

         assertThat(tcaVESResponse.getPolicyScope(), is("Test Policy scope"));

-        assertNull(tcaVESResponse.getAai().getGenericVNFId());

-        assertNotNull(tcaVESResponse.getAai().getGenericServerId());

+        assertNull(tcaVESResponse.getAai().getGenericVNFName());

+        assertNotNull(tcaVESResponse.getAai().getGenericServerName());

     }

 

     @Test

@@ -206,8 +204,9 @@ public class TCAUtilsTest extends BaseAnalyticsTCAUnitTest {
                 is("CL-LBAL-LOW-TRAFFIC-SIG-FB480F95-A453-6F24-B767-FD703241AB1A"));

         assertThat(tcaVESResponse.getVersion(), is("Test Version"));

         assertThat(tcaVESResponse.getPolicyScope(), is("Test Policy scope"));

-        assertNotNull(tcaVESResponse.getAai().getGenericVNFId());

-        assertNull(tcaVESResponse.getAai().getGenericServerId());

+        assertNotNull(tcaVESResponse.getAai().getGenericVNFName());

+        assertNull(tcaVESResponse.getAai().getGenericServerName());

+

     }

 

     @Rule

diff --git a/dcae-analytics-test/src/main/resources/data/json/facade/tca_ves_cef_response.json b/dcae-analytics-test/src/main/resources/data/json/facade/tca_ves_cef_response.json
index 7058876..fb815ed 100644
--- a/dcae-analytics-test/src/main/resources/data/json/facade/tca_ves_cef_response.json
+++ b/dcae-analytics-test/src/main/resources/data/json/facade/tca_ves_cef_response.json
@@ -5,9 +5,9 @@
   "closedLoopAlarmStart": 1478189220547,

   "closedLoopEventClient": "tca.instance00001",

   "target_type": "VNF",

-  "target": "generic-vnf.vnf-id",

+  "target": "generic-vnf.vnf-name",

   "AAI": {

-    "generic-vnf.vnf-id" : "vpp-test(?)",

+    "generic-vnf.vnf-name" : "vpp-test(?)",

     "vserver.vserver-name": "dfw1lb01lb01"

   },

   "from": "DCAE",