Fix the bug in the deploy flow for multi blueprint cases.
Issue-ID: CLAMP-571
Change-Id: I368cefafcba34a8ba3bd6be1eb22064995364d23
Signed-off-by: xuegao <xg353y@intl.att.com>
* Return the deploy payload for DCAE.
*
* @param loop The loop object
* Return the deploy payload for DCAE.
*
* @param loop The loop object
- * @param microServiceName The micro service name
+ * @param microServicePolicy The micro service policy
* @return The payload used to send deploy closed loop request
*/
* @return The payload used to send deploy closed loop request
*/
- public static String getDeployPayload(Loop loop, String microServiceName) {
+ public static String getDeployPayload(Loop loop, MicroServicePolicy microServicePolicy) {
JsonObject globalProp = loop.getGlobalPropertiesJson();
JsonObject globalProp = loop.getGlobalPropertiesJson();
- JsonObject deploymentProp = globalProp.getAsJsonObject(DEPLOYMENT_PARAMETER).getAsJsonObject(microServiceName);
+ JsonObject deploymentProp = globalProp.getAsJsonObject(DEPLOYMENT_PARAMETER).getAsJsonObject(microServicePolicy.getName());
- String serviceTypeId = loop.getLoopTemplate().getDcaeBlueprintId();
+ String serviceTypeId = microServicePolicy.getDcaeBlueprintId();
JsonObject rootObject = new JsonObject();
rootObject.addProperty(DCAE_SERVICETYPE_ID, serviceTypeId);
JsonObject rootObject = new JsonObject();
rootObject.addProperty(DCAE_SERVICETYPE_ID, serviceTypeId);
</setProperty>
<setBody>
<method ref="org.onap.clamp.loop.components.external.DcaeComponent"
</setProperty>
<setBody>
<method ref="org.onap.clamp.loop.components.external.DcaeComponent"
- method="getDeployPayload(${exchangeProperty[loopObject]},${exchangeProperty[microServicePolicy].getName()})" />
+ method="getDeployPayload(${exchangeProperty[loopObject]},${exchangeProperty[microServicePolicy]})" />
</setBody>
<setProperty propertyName="dcaeDeploymentId">
<method ref="org.onap.clamp.loop.components.external.DcaeComponent"
</setBody>
<setProperty propertyName="dcaeDeploymentId">
<method ref="org.onap.clamp.loop.components.external.DcaeComponent"
</setProperty>
<setBody>
<method ref="org.onap.clamp.loop.components.external.DcaeComponent"
</setProperty>
<setBody>
<method ref="org.onap.clamp.loop.components.external.DcaeComponent"
- method="getDeployPayload(${exchangeProperty[loopObject]},${exchangeProperty[microServicePolicy].getName()})" />
+ method="getDeployPayload(${exchangeProperty[loopObject]},${exchangeProperty[microServicePolicy]})" />
</setBody>
<setProperty propertyName="dcaeDeploymentId">
<method ref="org.onap.clamp.loop.components.external.DcaeComponent"
</setBody>
<setProperty propertyName="dcaeDeploymentId">
<method ref="org.onap.clamp.loop.components.external.DcaeComponent"