diff options
| author |   Boslet, Cory <cory.boslet@att.com> | 2019-07-31 11:23:30 -0400 |
|---|---|---|
| committer |   Benjamin, Max (mb388a) <mb388a@att.com> | 2019-07-31 11:23:31 -0400 |
| commit | 420d53a2d0339397eb1fd0e070c86591c9addb2b (patch) | |
| tree | 6664daf11700325982c27541ec27d34db37efa5f /bpmn/MSOCommonBPMN | |
| parent | 47fb69ff7908ae75777a4f0c7e28c198f0e117ae (diff) | |
Changed to set source service as model info
Changed to set source service as model info for service proxy per sniro.
Updated junit test to account for source service change.
Issue-ID: SO-2179
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I43161f0109b62a895d5122a7b0aca0eea8694b16
Diffstat (limited to 'bpmn/MSOCommonBPMN')
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"); |