summaryrefslogtreecommitdiffstats
path: root/components/slice-analysis-ms/src/main/java/org/onap/slice
diff options
context:
space:
mode:
Diffstat (limited to 'components/slice-analysis-ms/src/main/java/org/onap/slice')
-rw-r--r--components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/AAI.java96
-rw-r--r--components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/PolicyService.java7
2 files changed, 69 insertions, 34 deletions
diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/AAI.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/AAI.java
index 9083ff40..3d0caa57 100644
--- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/AAI.java
+++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/policy/AAI.java
@@ -3,6 +3,7 @@
* slice-analysis-ms
* ================================================================================
* Copyright (C) 2020 Wipro Limited.
+ * Copyright (C) 2022 Huawei Canada Limited.
* ==============================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,41 +22,72 @@
package org.onap.slice.analysis.ms.models.policy;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
-/**
+/**
* Model class for the AAI Object
*/
+@JsonInclude(JsonInclude.Include.NON_NULL)
public class AAI {
- @JsonProperty("vserver.is-closed-loop-disabled")
- private String vserverIsClosedLoopDisabled;
- @JsonProperty("vserver.prov-status")
- private String vserverProvStatus;
- @JsonProperty("generic-vnf.vnf-id")
- private String vServerVNFId;
-
- public String getVserverIsClosedLoopDisabled() {
- return vserverIsClosedLoopDisabled;
- }
-
- public void setVserverIsClosedLoopDisabled(String vserverIsClosedLoopDisabled) {
- this.vserverIsClosedLoopDisabled = vserverIsClosedLoopDisabled;
- }
-
- public String getVserverProvStatus() {
- return vserverProvStatus;
- }
-
- public void setVserverProvStatus(String vserverProvStatus) {
- this.vserverProvStatus = vserverProvStatus;
- }
-
- public String getvServerVNFId() {
- return vServerVNFId;
- }
-
- public void setvServerVNFId(String vServerVNFId) {
- this.vServerVNFId = vServerVNFId;
- }
-
+ @JsonProperty("vserver.is-closed-loop-disabled")
+ private String vserverIsClosedLoopDisabled;
+ @JsonProperty("vserver.prov-status")
+ private String vserverProvStatus;
+ @JsonProperty("generic-vnf.vnf-id")
+ private String genericVnfVNFId;
+ @JsonProperty("generic-vnf.is-closed-loop-disabled")
+ private String genericVnfIsClosedLoopDisabled;
+ @JsonProperty("generic-vnf.prov-status")
+ private String genericVnfProvStatus;
+ @JsonProperty("generic-vnf.vnf-name")
+ private String genericVnfVnfName;
+
+ public String getVserverIsClosedLoopDisabled() {
+ return vserverIsClosedLoopDisabled;
+ }
+
+ public void setVserverIsClosedLoopDisabled(String vserverIsClosedLoopDisabled) {
+ this.vserverIsClosedLoopDisabled = vserverIsClosedLoopDisabled;
+ }
+
+ public String getVserverProvStatus() {
+ return vserverProvStatus;
+ }
+
+ public void setVserverProvStatus(String vserverProvStatus) {
+ this.vserverProvStatus = vserverProvStatus;
+ }
+
+ public String getGenericVnfVNFId() {
+ return genericVnfVNFId;
+ }
+
+ public void setGenericVnfVNFId(String genericVnfVNFId) {
+ this.genericVnfVNFId = genericVnfVNFId;
+ }
+
+ public String getGenericVnfProvStatus() {
+ return genericVnfProvStatus;
+ }
+
+ public void setGenericVnfProvStatus(String genericVnfProvStatus) {
+ this.genericVnfProvStatus = genericVnfProvStatus;
+ }
+
+ public String getGenericVnfIsClosedLoopDisabled() {
+ return genericVnfIsClosedLoopDisabled;
+ }
+
+ public void setGenericVnfIsClosedLoopDisabled(String genericVnfIsClosedLoopDisabled) {
+ this.genericVnfIsClosedLoopDisabled = genericVnfIsClosedLoopDisabled;
+ }
+
+ public String getGenericVnfVnfName() {
+ return genericVnfVnfName;
+ }
+
+ public void setGenericVnfVnfName(String genericVnfVnfName) {
+ this.genericVnfVnfName = genericVnfVnfName;
+ }
}
diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/PolicyService.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/PolicyService.java
index 01e2886a..729fdc5a 100644
--- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/PolicyService.java
+++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/PolicyService.java
@@ -104,7 +104,7 @@ public class PolicyService {
AAI aai = new AAI();
aai.setVserverIsClosedLoopDisabled("false");
aai.setVserverProvStatus("ACTIVE");
- aai.setvServerVNFId(serviceDetails.get("ranNFNSSIId"));
+ aai.setGenericVnfVNFId(serviceDetails.get("ranNFNSSIId"));
onsetmsg.setAai(aai);
return onsetmsg;
}
@@ -172,7 +172,10 @@ public class PolicyService {
onsetmsg.setFrom("DCAE");
onsetmsg.setVersion("1.0.2");
AAI aai = new AAI();
- aai.setVserverIsClosedLoopDisabled("true");
+ aai.setGenericVnfIsClosedLoopDisabled("false");
+ aai.setGenericVnfProvStatus("ACTIVE");
+ aai.setGenericVnfVNFId("00000000-0000-0000-0000-000000000000");
+ aai.setGenericVnfVnfName("00000");
onsetmsg.setAai(aai);
return onsetmsg;
}