From ad5981f8e4969c41724885c830dda2cef304adf9 Mon Sep 17 00:00:00 2001 From: decheng zhang Date: Wed, 23 Mar 2022 20:46:04 -0400 Subject: [SLICEANALYSIS] Bugfix - Add two attributes in policy payload: modelInvariantUuid and modelUuid - Fix MrTopicParams builder bug - Fix aai-subscriber server configuration and AAI-EVENT topic name - Add safeguard for processing network-policy-list - Fix AAI-EVENT entity format changes - Add debug log lines - Turn on scan in logback setting Issue-ID: DCAEGEN2-3141 Signed-off-by: decheng zhang Change-Id: I0885035d85c55a6bff985b13f534c9db99e8fd09 Signed-off-by: decheng zhang --- .../slice/analysis/ms/models/Configuration.java | 2 +- .../slice/analysis/ms/models/policy/Payload.java | 21 ++++++++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) (limited to 'components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models') diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/Configuration.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/Configuration.java index d5aeb7b4..2a509aa1 100644 --- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/Configuration.java +++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/Configuration.java @@ -162,7 +162,7 @@ public class Configuration { aaiNotifTargetAction = jsonObject.get("sliceanalysisms.aaiNotif.targetAction").getAsString(); aaiNotifTargetSource = jsonObject.get("sliceanalysisms.aaiNotif.targetSource").getAsString(); - aaiNotifTargetSource = jsonObject.get("sliceanalysisms.aaiNotif.targetEntity").getAsString(); + aaiNotifTargetEntity = jsonObject.get("sliceanalysisms.aaiNotif.targetEntity").getAsString(); ccvpnEvalInterval = jsonObject.get("sliceanalysisms.ccvpnEvalInterval").getAsInt(); ccvpnEvalThreshold = jsonObject.get("sliceanalysisms.ccvpnEvalThreshold").getAsDouble(); ccvpnEvalPrecision = jsonObject.get("sliceanalysisms.ccvpnEvalPrecision").getAsDouble(); diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/Payload.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/Payload.java index ceaeb730..e0460407 100644 --- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/Payload.java +++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/Payload.java @@ -22,13 +22,11 @@ package org.onap.slice.analysis.ms.models.policy; import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.annotation.JsonProperty; /** * Model class for the Paylaod Object */ -@JsonInclude(Include.NON_NULL) +@JsonInclude(JsonInclude.Include.NON_NULL) public class Payload { private String name; @@ -38,6 +36,8 @@ public class Payload { private String networkType; private AdditionalProperties additionalProperties; private String serviceType; + private String modelInvariantUuid; + private String modelUuid; public String getName() { return name; @@ -95,4 +95,19 @@ public class Payload { this.serviceType = serviceType; } + public String getModelInvariantUuid() { + return modelInvariantUuid; + } + + public void setModelInvariantUuid(String modelInvariantUuid) { + this.modelInvariantUuid = modelInvariantUuid; + } + + public String getModelUuid() { + return modelUuid; + } + + public void setModelUuid(String modelUuid) { + this.modelUuid = modelUuid; + } } -- cgit 1.2.3-korg