summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Smokowski <ss835w@att.com>2019-07-31 19:40:09 +0000
committerGerrit Code Review <gerrit@onap.org>2019-07-31 19:40:09 +0000
commit0bf3a7f44ca4f0101c972029c7254606793627ad (patch)
tree4520d7e31b6fcb30833f372310f816224101631e
parent4a2ac263b3a8a0f4116f659f8c02fe255bdc41aa (diff)
parent420d53a2d0339397eb1fd0e070c86591c9addb2b (diff)
Merge "Changed to set source service as model info"
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java2
-rw-r--r--bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java
index 63dd72566b..41cd87e874 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java
@@ -581,6 +581,6 @@ public class BBInputSetupMapperLayer {
protected ModelInfoServiceProxy mapServiceProxyCustomizationToServiceProxy(
ServiceProxyResourceCustomization serviceProxyCustomization) {
- return modelMapper.map(serviceProxyCustomization, ModelInfoServiceProxy.class);
+ return modelMapper.map(serviceProxyCustomization.getSourceService(), ModelInfoServiceProxy.class);
}
}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java
index 787957dc38..bff13f8dbd 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java
@@ -2071,7 +2071,7 @@ public class BBInputSetupTest {
ServiceProxy expected = new ServiceProxy();
expected.setType("TRANSPORT");
expected.setModelInfoServiceProxy(new ModelInfoServiceProxy());
- expected.getModelInfoServiceProxy().setModelCustomizationUuid("modelCustomizationUUID");
+ expected.getModelInfoServiceProxy().setModelUuid("modelUUID");
expected.setServiceInstance(new ServiceInstance());
expected.getServiceInstance().setModelInfoServiceInstance(new ModelInfoServiceInstance());
expected.getServiceInstance().getModelInfoServiceInstance().setModelUuid("modelUUID");