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

[dcaegen2/analytics/tca.git] / dcae-analytics-tca / src / main / java / org / openecomp / dcae / apod / analytics / tca / utils / TCAUtils.java

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