From 4c2423d5e53a8021cb100eb3862efa2c3e7d713e Mon Sep 17 00:00:00 2001 From: xuegao Date: Thu, 13 Feb 2020 10:35:39 +0100 Subject: Fix deploy flow bug Fix the bug in the deploy flow for multi blueprint cases. Issue-ID: CLAMP-571 Change-Id: I368cefafcba34a8ba3bd6be1eb22064995364d23 Signed-off-by: xuegao --- .../org/onap/clamp/loop/components/external/DcaeComponent.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/java/org') diff --git a/src/main/java/org/onap/clamp/loop/components/external/DcaeComponent.java b/src/main/java/org/onap/clamp/loop/components/external/DcaeComponent.java index 7c0e3ccb..ca26b136 100644 --- a/src/main/java/org/onap/clamp/loop/components/external/DcaeComponent.java +++ b/src/main/java/org/onap/clamp/loop/components/external/DcaeComponent.java @@ -147,14 +147,14 @@ public class DcaeComponent extends ExternalComponent { * 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 */ - public static String getDeployPayload(Loop loop, String microServiceName) { + public static String getDeployPayload(Loop loop, MicroServicePolicy microServicePolicy) { 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); -- cgit 1.2.3-korg