aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin, Max (mb388a) <mb388a@us.att.com>2019-03-23 10:19:25 -0400
committerBenjamin, Max (mb388a) <mb388a@us.att.com>2019-03-23 10:19:44 -0400
commit76219c97a86150dbe2d9c5dd439e0faa1637e8b1 (patch)
tree2a909ce6897c3e7f2bf084d8ba8e69a496717fc3
parent7c0489bd1585b1a3fb97248397eccd72ee644e82 (diff)
Add support for configuration type for SDNC
ConfigurationType is required in SDNC generic-configuration-topology-operation deactivate and unassign actions. Change-Id: Ib819adb31d3662a0cdcc7aa126459b77befc4712 Issue-ID: SO-1694 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
-rw-r--r--bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/GCTopologyOperationRequestMapper.java1
-rw-r--r--bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/GCTopologyOperationRequestMapperTest.java3
2 files changed, 4 insertions, 0 deletions
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/GCTopologyOperationRequestMapper.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/GCTopologyOperationRequestMapper.java
index e46c456f88..b11e2caafa 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/GCTopologyOperationRequestMapper.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/GCTopologyOperationRequestMapper.java
@@ -85,6 +85,7 @@ public class GCTopologyOperationRequestMapper {
GenericResourceApiConfigurationinformationConfigurationInformation configurationInformation =
new GenericResourceApiConfigurationinformationConfigurationInformation();
configurationInformation.setConfigurationId(vnrConfiguration.getConfigurationId());
+ configurationInformation.setConfigurationType(vnrConfiguration.getConfigurationType());
req.setRequestInformation(requestInformation);
req.setSdncRequestHeader(sdncRequestHeader);
req.setServiceInformation(serviceInformation);
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/GCTopologyOperationRequestMapperTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/GCTopologyOperationRequestMapperTest.java
index f4d442bbc3..0ca80c75f7 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/GCTopologyOperationRequestMapperTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/GCTopologyOperationRequestMapperTest.java
@@ -62,6 +62,7 @@ public class GCTopologyOperationRequestMapperTest extends TestDataSetup {
serviceInstance.setServiceInstanceId("ServiceInstanceId");
Configuration Configuration = new Configuration();
Configuration.setConfigurationId("ConfigurationId");
+ Configuration.setConfigurationType("VLAN-NETWORK-RECEPTOR");
GenericResourceApiGcTopologyOperationInformation genericInfo = genObjMapper.deactivateOrUnassignVnrReqMapper
(SDNCSvcAction.UNASSIGN, serviceInstance, requestContext, Configuration,"uuid",new URI("http://localhost"));
@@ -70,6 +71,8 @@ public class GCTopologyOperationRequestMapperTest extends TestDataSetup {
Assert.assertNotNull(genericInfo.getSdncRequestHeader());
Assert.assertNotNull(genericInfo.getClass());
Assert.assertNotNull(genericInfo.getServiceInformation());
+ Assert.assertEquals("ConfigurationId", genericInfo.getConfigurationInformation().getConfigurationId());
+ Assert.assertEquals("VLAN-NETWORK-RECEPTOR", genericInfo.getConfigurationInformation().getConfigurationType());
Assert.assertEquals("uuid",genericInfo.getSdncRequestHeader().getSvcRequestId());
Assert.assertEquals("http://localhost",genericInfo.getSdncRequestHeader().getSvcNotificationUrl());
}