diff options
| author |   Eric Multanen <eric.w.multanen@intel.com> | 2019-05-30 07:35:13 -0700 |
|---|---|---|
| committer | Eric Multanen <eric.w.multanen@intel.com> | 2019-05-30 10:56:22 -0700 |
| commit | f8ef6b32ba67831c485330f6349ea773be566183 (patch) | |
| tree | 368d507be4813e7f110aee91e80afa35c0191351 /bpmn/MSOCommonBPMN | |
| parent | 4db782068934ebd20caa8405cd8644a2bf922934 (diff) | |
Remove oof_directives from user_directives
Oof_directives - when populated with a json
string, breaks the parsing of the user_directives.
Since it is not needed in the user_directives,
remove it.
Change-Id: I0e2c3deef8266df52ac73b95209843ac31f986ef
Issue-ID: SO-1939
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
Diffstat (limited to 'bpmn/MSOCommonBPMN')
| -rw-r--r-- | bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VfModuleBase.groovy | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VfModuleBase.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VfModuleBase.groovy index 07d8ec9b8e..e261fb9fdd 100644 --- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VfModuleBase.groovy +++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VfModuleBase.groovy @@ -519,12 +519,14 @@ public abstract class VfModuleBase extends AbstractServiceTaskProcessor { String vnfKey = entry.getKey() String vnfValue = entry.getValue() paramsMap.put("$vnfKey", "$vnfValue") - if (pcnt > 0) { - userDirectivesBuilder.append(",") + if (!"oof_directives".equals(vnfKey)) { + if (pcnt > 0) { + userDirectivesBuilder.append(",") + } + pcnt++ + userDirectivesBuilder.append("{\"attribute_name\":\"${vnfKey}\",") + userDirectivesBuilder.append("\"attribute_value\":\"${vnfValue}\"}") } - pcnt++ - userDirectivesBuilder.append("{\"attribute_name\":\"${vnfKey}\",") - userDirectivesBuilder.append("\"attribute_value\":\"${vnfValue}\"}") } if (pcnt > 0) { userDirectives = userDirectivesBuilder.append("]}").toString() |