aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Smokowski <ss835w@att.com>2020-11-16 21:33:49 +0000
committerGerrit Code Review <gerrit@onap.org>2020-11-16 21:33:49 +0000
commit203ac2c0061e98463c65914b58edd652bf550df3 (patch)
tree6d8270643f8e5176bc8e7c45188a5e26e250254e
parent240a01b02cc047f8ec7a563e01fc420ead8a622e (diff)
parentb05a619c89d0e520fddc5bb797b4162ddfb13694 (diff)
Merge "Updated bean for homing"
-rw-r--r--bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SniroHomingV1.groovy1
-rw-r--r--bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/Resource.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SniroHomingV1.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SniroHomingV1.groovy
index 146889351a..522aec7931 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SniroHomingV1.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/SniroHomingV1.groovy
@@ -204,6 +204,7 @@ class SniroHomingV1 extends AbstractServiceTaskProcessor{
if(inventoryType.equalsIgnoreCase("service")){
VnfResource vnf = new VnfResource()
vnf.setVnfHostname(assignmentMap.get("vnfHostName"))
+ vnf.setResourceId(assignmentMap.get("vnfId"))
resource.getHomingSolution().setVnf(vnf)
resource.getHomingSolution().setServiceInstanceId(placement.getString("serviceInstanceId"))
}
diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/Resource.java b/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/Resource.java
index 57b8c1387d..2a84fccca0 100644
--- a/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/Resource.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/Resource.java
@@ -81,6 +81,7 @@ public abstract class Resource extends JsonWrapper implements Serializable {
return homingSolution;
}
+ @Deprecated
public void setHomingSolution(HomingSolution homingSolution) {
this.homingSolution = homingSolution;
}