diff options
| author |   Seshu Kumar M <seshu.kumar.m@huawei.com> | 2018-04-13 07:16:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-13 07:16:07 +0000 |
| commit | 11d8e0833720ed251da06068f0810bf26e381d2a (patch) | |
| tree | 8e43c5e3a172daf94c78699383823e5dc54154e1 | |
| parent | c98ae16cb08cb09e9f5740d432a3e8fa31722ef5 (diff) | |
| parent | 504a6bc9a9104cc4c2fa5cb2f2496c0d97f43f50 (diff) | |
Merge "Fix input for sdnc adapter"
| -rw-r--r-- | bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateSDNCNetworkResource.groovy | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateSDNCNetworkResource.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateSDNCNetworkResource.groovy index a4f95254dd..81266148ca 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateSDNCNetworkResource.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateSDNCNetworkResource.groovy @@ -157,8 +157,7 @@ public class CreateSDNCNetworkResource extends AbstractServiceTaskProcessor { //here convert json string to xml string
String netowrkInputParameters = jsonUtil.json2xml(netowrkInputParametersJson)
// 1. prepare assign topology via SDNC Adapter SUBFLOW call
- String sndcTopologyCreateRequest = sdncAdapterUtils.sdncTopologyRequestRsrc(execution, createNetworkInput, serviceInstanceId, sdncCallback, sdnc_svcAction, sdnc_requestAction, null, null, null)
- String content =
+ String sndcTopologyCreateRequest =
"""<aetgt:SDNCAdapterWorkflowRequest xmlns:aetgt="http://org.openecomp/mso/workflow/schema/v1"
xmlns:sdncadapter="http://org.openecomp.mso/workflow/sdnc/adapter/schema/v1"
xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1">
@@ -208,8 +207,8 @@ public class CreateSDNCNetworkResource extends AbstractServiceTaskProcessor { String sndcTopologyCreateRequesAsString = utils.formatXml(sndcTopologyCreateRequest)
utils.logAudit(sndcTopologyCreateRequesAsString)
- execution.setVariable(Prefix + "createSDNCRequest", sndcTopologyCreateRequesAsString)
- utils.log("DEBUG", Prefix + "createSDNCRequest - " + "\n" + sndcTopologyCreateRequesAsString, isDebugEnabled)
+ execution.setVariable("sdncAdapterWorkflowRequest", sndcTopologyCreateRequesAsString)
+ utils.log("DEBUG","sdncAdapterWorkflowRequest - " + "\n" + sndcTopologyCreateRequesAsString, isDebugEnabled)
} catch (Exception ex) {
String exceptionMessage = " Bpmn error encountered in CreateSDNCCNetworkResource flow. prepareSDNCRequest() - " + ex.getMessage()
|