nullpointer in vnfadaptervfmoduleobjectmapper

Added code block to throw exception when we get a 'Name' wthout a
'Value' tag in the SDNC vf-module-topology. Right now we are seeing
oam0_net_id is missing a value tag. Added Unit test to test this code
change.

Change-Id: I765d5a4eb9d351b7613d4c3561a2a5dbe37e4781
Issue-ID: SO-2031
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

1 files changed, 35 insertions, 0 deletions

diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterVfModuleObjectMapperPayloadTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterVfModuleObjectMapperPayloadTest.java
index 5a8e57135a..44a08139d6 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterVfModuleObjectMapperPayloadTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterVfModuleObjectMapperPayloadTest.java
@@ -29,7 +29,9 @@ import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiVmNetworkData;
 import org.onap.so.adapters.vnfrest.CreateVfModuleRequest;
 import org.onap.so.adapters.vnfrest.DeleteVfModuleRequest;
@@ -43,6 +45,8 @@ import org.onap.so.bpmn.servicedecomposition.generalobjects.RequestContext;
 import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoGenericVnf;
 import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoServiceInstance;
 import org.onap.so.bpmn.servicedecomposition.modelinfo.ModelInfoVfModule;
+import org.onap.so.openstack.utils.MsoMulticloudUtils;
+import org.onap.so.client.adapter.vnf.mapper.exceptions.MissingValueTagException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class VnfAdapterVfModuleObjectMapperPayloadTest {
@@ -52,6 +56,9 @@ public class VnfAdapterVfModuleObjectMapperPayloadTest {
     private VnfAdapterVfModuleObjectMapper vfModuleObjectMapper = new VnfAdapterVfModuleObjectMapper();
     private ObjectMapper omapper = new ObjectMapper();
 
+    @Rule
+    public ExpectedException expectedException = ExpectedException.none();
+
     @Before
     public void setUp() {
         vfModuleObjectMapper.vnfAdapterObjectMapperUtils = new VnfAdapterObjectMapperUtils();
@@ -362,6 +369,34 @@ public class VnfAdapterVfModuleObjectMapperPayloadTest {
     }
 
     @Test
+    public void buildDirectivesParamFromMapNoValueTagTest() throws Exception {
+
+        Map<String, Object> paramsMap = new HashMap<>();
+        Map<String, Object> srcMap = new HashMap<>();
+        srcMap.put("key1", "value1");
+        srcMap.put("key2", "value2");
+        srcMap.put("key3", null);
+
+        expectedException.expect(MissingValueTagException.class);
+        vfModuleObjectMapper.buildDirectivesParamFromMap(paramsMap, MsoMulticloudUtils.SDNC_DIRECTIVES, srcMap);
+    }
+
+    @Test
+    public void buildDirectivesParamFromMapSunnyDayTest() throws Exception {
+
+        Map<String, Object> paramsMap = new HashMap<>();
+        Map<String, Object> srcMap = new HashMap<>();
+        srcMap.put("key1", "value1");
+        srcMap.put("key2", "value2");
+        String expectedResult =
+                "[{ \"attributes\": [ {\"attribute_name\": \"key1\", \"attribute_value\": \"value1\"}, {\"attribute_name\": \"key2\", \"attribute_value\": \"value2\"}] }]";
+
+        vfModuleObjectMapper.buildDirectivesParamFromMap(paramsMap, MsoMulticloudUtils.SDNC_DIRECTIVES, srcMap);
+
+        assertEquals(expectedResult, paramsMap.values().toString());
+    }
+
+    @Test
     public void createVfModuleWithVolumeGroupRequestMapperTest() throws Exception {
 
         // prepare and set service instance