aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiranjana <niranjana.y60@wipro.com>2020-04-24 19:54:02 +0530
committerNiranjana Y <niranjana.y60@wipro.com>2020-04-29 13:44:38 +0000
commit7741546bd7607aad3ad78f01006b5c95a4c0464d (patch)
tree83b73f9a0bf1a13b781a14902aac7c23f8ef7bec
parent66bd1417e86d211da7f0218fb6431bf01a457bd2 (diff)
Change Policy notification in son-handler to align with policy component updates6.0.0-ONAP
Issue-ID: DCAEGEN2-2216 Signed-off-by: Niranjana <niranjana.y60@wipro.com> Change-Id: I6361cc68c20ae601ad89754eab8633985b794244 (cherry picked from commit 9e7b2f1eecf15c6f1f4fa7c42a9ad2aeb08d334d)
-rw-r--r--pom.xml2
-rw-r--r--src/main/java/org/onap/dcaegen2/services/sonhms/model/PolicyNotification.java4
-rw-r--r--src/test/resources/policy_notification.json4
-rw-r--r--version.properties2
4 files changed, 6 insertions, 6 deletions
diff --git a/pom.xml b/pom.xml
index 9430cc0..03694cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<groupId>org.onap.dcaegen2.services.son-handler</groupId>
<artifactId>son-handler</artifactId>
<name>dcaegen2-services-son-handler</name>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2-SNAPSHOT</version>
<!--parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.4.RELEASE</version> </parent -->
diff --git a/src/main/java/org/onap/dcaegen2/services/sonhms/model/PolicyNotification.java b/src/main/java/org/onap/dcaegen2/services/sonhms/model/PolicyNotification.java
index 972b1f4..2cb1335 100644
--- a/src/main/java/org/onap/dcaegen2/services/sonhms/model/PolicyNotification.java
+++ b/src/main/java/org/onap/dcaegen2/services/sonhms/model/PolicyNotification.java
@@ -74,12 +74,12 @@ public class PolicyNotification {
this.from = "PCIMS";
this.version = "1.0.2";
this.action = action;
- this.target = "generic-vnf.vnf-id";
+ this.target = "pnf.pnf-name";
this.targetType = "PNF";
this.aai = new HashMap<>();
aai.put("generic-vnf.is-closed-loop-disabled", "false");
aai.put("generic-vnf.prov-status", "ACTIVE");
- aai.put("generic-vnf.vnf-id", pnfName);
+ aai.put("pnf.pnf-name", pnfName);
}
public long getClosedLoopAlarmStart() {
diff --git a/src/test/resources/policy_notification.json b/src/test/resources/policy_notification.json
index 767c024..289afeb 100644
--- a/src/test/resources/policy_notification.json
+++ b/src/test/resources/policy_notification.json
@@ -4,7 +4,7 @@
"closedLoopEventClient": "microservice.PCI",
"closedLoopEventStatus": "ONSET",
"target_type": "PNF",
- "target": "generic-vnf.vnf-id",
+ "target": "pnf.pnf-name",
"requestID": "a4130fd5-2291-4a83-8992-04e4c9f32731",
"from": "PCIMS",
"version": "1.0.2",
@@ -12,7 +12,7 @@
"AAI": {
"generic-vnf.prov-status": "ACTIVE",
"generic-vnf.is-closed-loop-disabled": "false",
- "generic-vnf.vnf-id": "ncserver23"
+ "pnf.pnf-name": "ncserver23"
},
"Action": "ModifyConfig"
}
diff --git a/version.properties b/version.properties
index 4d7ae66..f6b204e 100644
--- a/version.properties
+++ b/version.properties
@@ -20,7 +20,7 @@
###############################################################################
major=2
minor=0
-patch=1
+patch=2
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT