X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=bpmn%2Fso-bpmn-tasks%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fso%2Fclient%2Fsdnc%2Fmapper%2FNetworkTopologyOperationRequestMapperTest.java;h=1bfa78ad6d98d2a99ac577cda5c812b1d64f1ffb;hb=8a0c54a2e9c873771fd30e9e13749567916e2099;hp=6a14f8b56779d5e540ac13e4cb7a8c1828cd7402;hpb=10df20909da905f93b4e1cda286fbbc7e6c77c84;p=so.git

diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/NetworkTopologyOperationRequestMapperTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/NetworkTopologyOperationRequestMapperTest.java
index 6a14f8b567..1bfa78ad6d 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/NetworkTopologyOperationRequestMapperTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/mapper/NetworkTopologyOperationRequestMapperTest.java
@@ -23,6 +23,7 @@ package org.onap.so.client.sdnc.mapper;
 import static com.shazam.shazamcrest.MatcherAssert.assertThat;
 import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
 import java.io.IOException;
@@ -109,6 +110,7 @@ public class NetworkTopologyOperationRequestMapperTest {
 		userParams.put("key1", "value1");
 		requestContext.setUserParams(userParams);
 		requestContext.setProductFamilyId("productFamilyId");
+		requestContext.setMsoRequestId("MsoRequestId");
 
 		network = new L3Network();
 		network.setNetworkId("TEST_NETWORK_ID");
@@ -138,8 +140,24 @@ public class NetworkTopologyOperationRequestMapperTest {
 
 		assertThat(networkSDNCrequest, sameBeanAs(reqMapper1).ignoring("sdncRequestHeader.svcRequestId")
 				.ignoring("requestInformation.requestId"));
+		assertEquals("MsoRequestId", networkSDNCrequest.getRequestInformation().getRequestId());
 	}
+	
+	@Test
+	public void createGenericResourceApiNetworkOperationInformationReqContextNullTest() throws Exception {
 
+		RequestContext rc = new RequestContext();
+		rc.setMsoRequestId(null);
+		GenericResourceApiNetworkOperationInformation networkSDNCrequest = mapper.reqMapper(
+				SDNCSvcOperation.NETWORK_TOPOLOGY_OPERATION, SDNCSvcAction.ASSIGN, GenericResourceApiRequestActionEnumeration.CREATENETWORKINSTANCE, network, serviceInstance, customer,
+				rc, cloudRegion);
+		assertNotNull(networkSDNCrequest.getRequestInformation().getRequestId());
+		GenericResourceApiNetworkOperationInformation networkSDNCrequest2 = mapper.reqMapper(
+				SDNCSvcOperation.NETWORK_TOPOLOGY_OPERATION, SDNCSvcAction.ASSIGN, GenericResourceApiRequestActionEnumeration.CREATENETWORKINSTANCE, network, serviceInstance, customer,
+				null, cloudRegion);
+		assertNotNull(networkSDNCrequest2.getRequestInformation().getRequestId());
+	}
+	
 	@Test
 	public void reqMapperTest() throws Exception {
 
@@ -175,7 +193,8 @@ public class NetworkTopologyOperationRequestMapperTest {
 
 		assertThat(reqMapperUnassign, sameBeanAs(networkSDNCrequestUnassign).ignoring("sdncRequestHeader.svcRequestId")
 				.ignoring("requestInformation.requestId"));
-
+		assertEquals("MsoRequestId", networkSDNCrequestUnassign.getRequestInformation().getRequestId());
+		
  	}
 	
 	@Test