summaryrefslogtreecommitdiffstats
path: root/bpmn
diff options
context:
space:
mode:
authorSeshu Kumar M <seshu.kumar.m@huawei.com>2019-05-30 11:30:51 +0000
committerGerrit Code Review <gerrit@onap.org>2019-05-30 11:30:51 +0000
commit76d8898d21680b986e409f0618fc7bd1896bca20 (patch)
tree996fce3935c3f6cc8d66c79ac5060de295fbff64 /bpmn
parent6e1ca6b979b4fb4f9c540adef717bd23512a2469 (diff)
parentf8ef6b32ba67831c485330f6349ea773be566183 (diff)
Merge "Remove oof_directives from user_directives" into dublin
Diffstat (limited to 'bpmn')
-rw-r--r--bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VfModuleBase.groovy12
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()