Remove oof_directives from user_directives BB path

Remove oof_directives from user_directives in the
BB code path (as was done for the groovy code path).

Change-Id: I018c3c85cc4a68ab128a2be869567b44fda08e48
Issue-ID: SO-1939
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterVfModuleObjectMapper.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterVfModuleObjectMapper.java
index 94e9568..b0ba059 100644 (file)
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterVfModuleObjectMapper.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterVfModuleObjectMapper.java
@@ -205,14 +205,22 @@ public class VnfAdapterVfModuleObjectMapper {
     private void buildDirectivesParamFromMap(Map<String, Object> paramsMap, String directive,
             Map<String, Object> srcMap) {
         StringBuilder directives = new StringBuilder();
-        if (srcMap.size() > 0) {
+        int no_directives_size = 0;
+        if (directives.equals(MsoMulticloudUtils.USER_DIRECTIVES)
+                && srcMap.containsKey(MsoMulticloudUtils.OOF_DIRECTIVES)) {
+            no_directives_size = 1;
+        }
+        if (srcMap.size() > no_directives_size) {
             directives.append("{ \"attributes\": [ ");
             int i = 0;
             for (String attributeName : srcMap.keySet()) {
-                directives.append(new AttributeNameValue(attributeName, srcMap.get(attributeName).toString()));
-                if (i < (srcMap.size() - 1))
-                    directives.append(", ");
-                i++;
+                if (!(MsoMulticloudUtils.USER_DIRECTIVES.equals(directives)
+                        && attributeName.equals(MsoMulticloudUtils.OOF_DIRECTIVES))) {
+                    directives.append(new AttributeNameValue(attributeName, srcMap.get(attributeName).toString()));
+                    if (i < (srcMap.size() - 1 + no_directives_size))
+                        directives.append(", ");
+                    i++;
+                }
             }
             directives.append("] }");
         } else {