From: subhash kumar singh <subhash.kumar.singh@huawei.com>
Date: Mon, 27 May 2019 06:17:50 +0000 (+0530)
Subject: Fix request body for SDNC req
X-Git-Tag: 1.5.2~327^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2a11892f6d98c285fb08c9d8edf7c71e0487a677;p=so.git

Fix request body for SDNC req

Fix request body for SDNC req.

Issue-ID: SO-1393
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
Change-Id: Ia8112b81fa29f886e282445b3c0dc068d487cadd
---

diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/ActivateSDNCNetworkResource.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/ActivateSDNCNetworkResource.groovy
index 5ed815b0ab..0338647ce7 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/ActivateSDNCNetworkResource.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/ActivateSDNCNetworkResource.groovy
@@ -317,6 +317,7 @@ public class ActivateSDNCNetworkResource extends AbstractServiceTaskProcessor {
                                      </vnf-information>
                                      <vf-module-information>
                                         <from-preload>false</from-preload>
+                                        <vf-module-id>${msoUtils.xmlEscape(resourceInstanceId)}</vf-module-id>
                                         <onap-model-information>
                                             <model-invariant-uuid>${msoUtils.xmlEscape(modelInvariantUuid)}</model-invariant-uuid>
                                              <model-customization-uuid>${msoUtils.xmlEscape(modelCustomizationUuid)}</model-customization-uuid>
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateSDNCNetworkResource.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateSDNCNetworkResource.groovy
index 421fd062fe..23c11ca4dc 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateSDNCNetworkResource.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateSDNCNetworkResource.groovy
@@ -397,7 +397,6 @@ public class CreateSDNCNetworkResource extends AbstractServiceTaskProcessor {
                                         <subscriber-name>${msoUtils.xmlEscape(globalCustomerId)}</subscriber-name>
                                      </service-information>
                                      <vnf-information>
-                                        <vnf-id>${msoUtils.xmlEscape(vnfid)}</vnf-id>
                                         <vnf-type></vnf-type>
                                         <onap-model-information>
                                              <model-invariant-uuid>${msoUtils.xmlEscape(modelInvariantUuid)}</model-invariant-uuid>