Check for null requestInfo

Check for null requestInfo

Issue-ID: SO-1900
Signed-off-by: Kuleshov, Elena <evn@att.com>
Change-Id: I2a3eb7ddbee396b19bcc71a2f647b9cf90082ed4

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 177c918..b90ae19 100644 (file)
--- 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
@@ -378,7 +378,11 @@ public class BBInputSetupMapperLayer {
 
     protected OrchestrationContext mapOrchestrationContext(RequestDetails requestDetails) {
         OrchestrationContext context = new OrchestrationContext();
-        context.setIsRollbackEnabled(!(requestDetails.getRequestInfo().getSuppressRollback()));
+        if (requestDetails.getRequestInfo() != null) {
+            context.setIsRollbackEnabled(!(requestDetails.getRequestInfo().getSuppressRollback()));
+        } else {
+            context.setIsRollbackEnabled(false);
+        }
         return context;
     }
 

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java
index e7afa9e..39650a2 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayerTest.java
@@ -570,6 +570,19 @@ public class BBInputSetupMapperLayerTest {
         assertThat(actual, sameBeanAs(expected));
     }
 
+    @Test
+    public void testMapOrchestrationContextNoRequestInfo() throws IOException {
+        OrchestrationContext expected = new OrchestrationContext();
+        expected.setIsRollbackEnabled(false);
+
+        RequestDetails requestDetails = mapper.readValue(
+                new File(RESOURCE_PATH + "RequestDetailsInput_mapReqContextNoRequestInfo.json"), RequestDetails.class);
+
+        OrchestrationContext actual = bbInputSetupMapperLayer.mapOrchestrationContext(requestDetails);
+
+        assertThat(actual, sameBeanAs(expected));
+    }
+
     @Test
     public void testMapLocationContext() {
         CloudRegion expected = new CloudRegion();

diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetailsInput_mapReqContextNoRequestInfo.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetailsInput_mapReqContextNoRequestInfo.json
new file mode 100644 (file)
index 0000000..41f0fde
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetailsInput_mapReqContextNoRequestInfo.json
@@ -0,0 +1,29 @@
+{
+       "requestParameters": {
+               "subscriptionServiceType": "subscriptionServiceType",
+               "userParams": [
+               {
+                       "name" : "mns_vfw_protected_route_prefixes",
+                       "value" : [ {
+                               "interface_route_table_routes_route" : "1.1.1.1/32"
+                       }, {
+                       "interface_route_table_routes_route" : "0::1/128"
+               } ]
+        },
+        {
+               "name": "name1",
+                       "value": "value1"
+       },              
+               {
+                       "ignore": "false",
+                       "skip":  "ignore"
+               }]              
+       },
+       "configurationParameters": [ 
+         { 
+            "availability-zone":"$.vnf-topology.vnf-resource-assignments.availability-zones.availability-zone[0]", 
+            "xtz-123":"$.vnf-topology.vnf-resource-assignments.availability-zones.availability-zone[0]" 
+         } 
+     ]
+}
+