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

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 (file)
--- 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\r
     public static final String TCA_VES_RESPONSE_VNF_TARGET_TYPE = "VNF";\r
     public static final String AAI_VNF_KEY_PREFIX = "generic-vnf.";\r
-    public static final String TCA_VES_RESPONSE_VNF_TARGET = AAI_VNF_KEY_PREFIX + "vnf-id";\r
+    public static final String TCA_VES_RESPONSE_VNF_TARGET = AAI_VNF_KEY_PREFIX + "vnf-name";\r
     // VM Constants\r
     public static final String TCA_VES_RESPONSE_VM_TARGET_TYPE = "VM";\r
     public static final String AAI_VSERVER_KEY_PREFIX = "vserver.";\r

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 (file)
--- 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
 \r
     private static final long serialVersionUID = 1L;\r
 \r
-    private String genericVNFId;\r
+    private String genericVNFName;\r
 \r
-    private String genericServerId;\r
+    private String genericServerName;\r
 \r
 }\r

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 (file)
--- 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
  */\r
 public abstract class AAIMixin extends BaseDynamicPropertiesProviderMixin {\r
 \r
-    private String genericVNFId;\r
-    private String genericServerId;\r
+    private String genericVNFName;\r
+    private String genericServerName;\r
 \r
-    @JsonGetter("generic-vnf.vnf-id")\r
-    public String getGenericVNFId() {\r
-        return genericVNFId;\r
+    @JsonGetter("generic-vnf.vnf-name")\r
+    public String getGenericVNFName() {\r
+        return genericVNFName;\r
     }\r
 \r
-    @JsonSetter("generic-vnf.vnf-id")\r
-    public void setGenericVNFId(String genericVNFId) {\r
-        this.genericVNFId = genericVNFId;\r
+    @JsonSetter("generic-vnf.vnf-name")\r
+    public void setGenericVNFName(String genericVNFName) {\r
+        this.genericVNFName = genericVNFName;\r
     }\r
 \r
     @JsonGetter("vserver.vserver-name")\r
-    public String getGenericServerId() {\r
-        return genericServerId;\r
+    public String getGenericServerName() {\r
+        return genericServerName;\r
     }\r
 \r
     @JsonSetter("vserver.vserver-name")\r
-    public void setGenericServerId(String genericServerId) {\r
-        this.genericServerId = genericServerId;\r
+    public void setGenericServerName(String genericServerName) {\r
+        this.genericServerName = genericServerName;\r
     }\r
 }\r

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 (file)
--- 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 {
 \r
     @Test\r
     public void getGenericVNFId() throws Exception {\r
-        aai.setGenericVNFId(GENERIC_VNF_ID);\r
-        assertThat("VNFID must be same", aai.getGenericVNFId(), is(GENERIC_VNF_ID));\r
+        aai.setGenericVNFName(GENERIC_VNF_ID);\r
+        assertThat("VNFID must be same", aai.getGenericVNFName(), is(GENERIC_VNF_ID));\r
     }\r
 \r
     @Test\r
     public void setGenericVNFId() throws Exception {\r
         final String genericVNFId = "testVNFID";\r
-        aai.setGenericVNFId(GENERIC_VNF_ID);\r
-        aai.setGenericVNFId(CHANGED_GENERIC_VNF_ID);\r
-        assertThat("VNFID must be same as changed VNFID", aai.getGenericVNFId(), is(CHANGED_GENERIC_VNF_ID));\r
+        aai.setGenericVNFName(GENERIC_VNF_ID);\r
+        aai.setGenericVNFName(CHANGED_GENERIC_VNF_ID);\r
+        assertThat("VNFID must be same as changed VNFID", aai.getGenericVNFName(), is(CHANGED_GENERIC_VNF_ID));\r
     }\r
 }\r

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 (file)
--- 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);\r
 \r
         assertThat("VES CEF Message Response AAI generics VNF Id must match",\r
-                vesCEFMessageResponse.getAai().getGenericVNFId(), is("vpp-test(?)"));\r
+                vesCEFMessageResponse.getAai().getGenericVNFName(), is("vpp-test(?)"));\r
 \r
         assertThat("VES CEF Message target type must be parsed correctly as VNF",\r
                 vesCEFMessageResponse.getTargetType(), is("VNF"));\r
@@ -56,8 +56,8 @@ public class TCAVESResponseTest extends BaseAnalyticsModelUnitTest {
         assertThat("closedLoopEventClient must be tca.instance00001",\r
                 vesCEFMessageResponse.getClosedLoopEventClient(), is("tca.instance00001"));\r
         assertThat("target_type must be VNF", vesCEFMessageResponse.getTargetType(), is("VNF"));\r
-        assertThat("target must be VNF", vesCEFMessageResponse.getTarget(), is("generic-vnf.vnf-id"));\r
-        assertThat("aai generic vnf id must be vpp-test(?)", vesCEFMessageResponse.getAai().getGenericVNFId(),\r
+        assertThat("target must be VNF", vesCEFMessageResponse.getTarget(), is("generic-vnf.vnf-name"));\r
+        assertThat("aai generic vnf id must be vpp-test(?)", vesCEFMessageResponse.getAai().getGenericVNFName(),\r
                 is("vpp-test(?)"));\r
         assertThat("from must be DCAE", vesCEFMessageResponse.getFrom(), is("DCAE"));\r
         assertThat("policyScope must be resource=vFirewall;type=configuration",\r

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 (file)
--- 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);\r
 \r
         assertThat("VES CEF Message Response AAI generics VNF Id must match",\r
-                vesCEFMessageResponse.getAai().getGenericVNFId(), is("vpp-test(?)"));\r
+                vesCEFMessageResponse.getAai().getGenericVNFName(), is("vpp-test(?)"));\r
 \r
         assertThat("VES CEF Message Response AAI generic Server Id must match",\r
-                vesCEFMessageResponse.getAai().getGenericServerId(), is("dfw1lb01lb01"));\r
+                vesCEFMessageResponse.getAai().getGenericServerName(), is("dfw1lb01lb01"));\r
 \r
         assertThat("VES CEF Message target type must be parsed correctly as VNF",\r
                 vesCEFMessageResponse.getTargetType(), is("VNF"));\r

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 (file)
--- 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"\r
             tcavesResponse.setTarget(AnalyticsConstants.TCA_VES_RESPONSE_VM_TARGET);\r
             // commonEventHeader.sourceName from the received VES message\r
-            aai.setGenericServerId(commonEventHeader.getSourceName());\r
+            aai.setGenericServerName(commonEventHeader.getSourceName());\r
         } else {\r
             // VNF specific settings\r
             // Hard Coded - "VNF"\r
             tcavesResponse.setTargetType(AnalyticsConstants.TCA_VES_RESPONSE_VNF_TARGET_TYPE);\r
-            // Hard Coded - "generic-vnf.vnf-id"\r
+            // Hard Coded - "generic-vnf.vnf-name"\r
             tcavesResponse.setTarget(AnalyticsConstants.TCA_VES_RESPONSE_VNF_TARGET);\r
             // commonEventHeader.sourceName from the received VES message\r
-            aai.setGenericVNFId(commonEventHeader.getSourceName());\r
+            aai.setGenericVNFName(commonEventHeader.getSourceName());\r
         }\r
 \r
         // Hard Coded - "DCAE"\r
@@ -575,7 +575,7 @@ public abstract class TCAUtils extends AnalyticsModelJsonUtils {
      */\r
     public static ControlLoopSchemaType determineControlLoopSchemaType(final TCAVESResponse tcavesResponse) {\r
         final AAI aai = tcavesResponse.getAai();\r
-        if (aai.getGenericServerId() != null) {\r
+        if (aai.getGenericServerName() != null) {\r
             return ControlLoopSchemaType.VM;\r
         } else {\r
             return ControlLoopSchemaType.VNF;\r
@@ -591,10 +591,10 @@ public abstract class TCAUtils extends AnalyticsModelJsonUtils {
      */\r
     public static String determineSourceName(final TCAVESResponse tcavesResponse) {\r
         final AAI aai = tcavesResponse.getAai();\r
-        if (aai.getGenericServerId() != null) {\r
-            return aai.getGenericServerId();\r
+        if (aai.getGenericServerName() != null) {\r
+            return aai.getGenericServerName();\r
         } else {\r
-            return aai.getGenericVNFId();\r
+            return aai.getGenericVNFName();\r
         }\r
     }\r
 \r

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 (file)
--- 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 @@
 \r
 package org.openecomp.dcae.apod.analytics.tca.utils;\r
 \r
-import com.fasterxml.jackson.databind.JsonNode;\r
 import com.google.common.base.Supplier;\r
 import com.google.common.collect.ImmutableSet;\r
 import com.google.common.collect.Table;\r
@@ -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;\r
 import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy;\r
 import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Threshold;\r
-import org.openecomp.dcae.apod.analytics.model.facade.tca.AAI;\r
 import org.openecomp.dcae.apod.analytics.model.facade.tca.TCAVESResponse;\r
 import org.openecomp.dcae.apod.analytics.tca.BaseAnalyticsTCAUnitTest;\r
 import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFProcessorContext;\r
@@ -184,8 +182,8 @@ public class TCAUtilsTest extends BaseAnalyticsTCAUnitTest {
                 is("CL-LBAL-LOW-TRAFFIC-SIG-FB480F95-A453-6F24-B767-FD703241AB1A"));\r
         assertThat(tcaVESResponse.getVersion(), is("Test Version"));\r
         assertThat(tcaVESResponse.getPolicyScope(), is("Test Policy scope"));\r
-        assertNull(tcaVESResponse.getAai().getGenericVNFId());\r
-        assertNotNull(tcaVESResponse.getAai().getGenericServerId());\r
+        assertNull(tcaVESResponse.getAai().getGenericVNFName());\r
+        assertNotNull(tcaVESResponse.getAai().getGenericServerName());\r
     }\r
 \r
     @Test\r
@@ -206,8 +204,9 @@ public class TCAUtilsTest extends BaseAnalyticsTCAUnitTest {
                 is("CL-LBAL-LOW-TRAFFIC-SIG-FB480F95-A453-6F24-B767-FD703241AB1A"));\r
         assertThat(tcaVESResponse.getVersion(), is("Test Version"));\r
         assertThat(tcaVESResponse.getPolicyScope(), is("Test Policy scope"));\r
-        assertNotNull(tcaVESResponse.getAai().getGenericVNFId());\r
-        assertNull(tcaVESResponse.getAai().getGenericServerId());\r
+        assertNotNull(tcaVESResponse.getAai().getGenericVNFName());\r
+        assertNull(tcaVESResponse.getAai().getGenericServerName());\r
+\r
     }\r
 \r
     @Rule\r

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 (file)
--- 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,\r
   "closedLoopEventClient": "tca.instance00001",\r
   "target_type": "VNF",\r
-  "target": "generic-vnf.vnf-id",\r
+  "target": "generic-vnf.vnf-name",\r
   "AAI": {\r
-    "generic-vnf.vnf-id" : "vpp-test(?)",\r
+    "generic-vnf.vnf-name" : "vpp-test(?)",\r
     "vserver.vserver-name": "dfw1lb01lb01"\r
   },\r
   "from": "DCAE",\r