From e4c07d4c7eb3105bc6a20eee00fdca592f0cf59b Mon Sep 17 00:00:00 2001 From: yongqiangliu312 Date: Mon, 27 Jan 2020 10:40:41 +0800 Subject: add new action ConfigScaleIn Change-Id: Iae4bb797c4e86f66e5e3101fc6715fc2c2be470f Issue-ID: APPC-1760 Signed-off-by: Taka Cho Signed-off-by: Patrick Brady --- .../appc/artifact/handler/node/ArtifactHandlerNode.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'appc-inbound') diff --git a/appc-inbound/appc-artifact-handler/provider/src/main/java/org/onap/appc/artifact/handler/node/ArtifactHandlerNode.java b/appc-inbound/appc-artifact-handler/provider/src/main/java/org/onap/appc/artifact/handler/node/ArtifactHandlerNode.java index 48dd67f02..5f26f512e 100644 --- a/appc-inbound/appc-artifact-handler/provider/src/main/java/org/onap/appc/artifact/handler/node/ArtifactHandlerNode.java +++ b/appc-inbound/appc-artifact-handler/provider/src/main/java/org/onap/appc/artifact/handler/node/ArtifactHandlerNode.java @@ -126,7 +126,8 @@ public class ArtifactHandlerNode implements SvcLogicJavaPlugin { private static final String PRE_REBUILD = "PreRebuild"; private static final String POST_REBUILD = "PostRebuild"; private static final String STOP_TRAFFIC = "StopTraffic"; - + private static final String CONFIG_SCALE_IN_PARAM = "ConfigScaleIn"; + public void processArtifact(Map inParams, SvcLogicContext ctx) throws ArtifactProcessorException { if (inParams == null || inParams.isEmpty()) { @@ -626,6 +627,7 @@ public class ArtifactHandlerNode implements SvcLogicJavaPlugin { if (contentsActionEquals(content, CONFIGURE_PARAM) || contentsActionEquals(content, CONFIG_MODIFY_PARAM) || contentsActionEquals(content, CONFIG_SCALE_OUT_PARAM) + || contentsActionEquals(content, CONFIG_SCALE_IN_PARAM) || contentsActionEquals(content, GET_CONFIG) || contentsActionEquals(content, POST_EVACUATE) || contentsActionEquals(content, PRE_EVACUATE) @@ -659,10 +661,11 @@ public class ArtifactHandlerNode implements SvcLogicJavaPlugin { private void tryProcessInterfaceProtocol(JSONObject content, DBService dbservice, SvcLogicContext context) throws SvcLogicException, SQLException, ConfigurationException, DBException { - if (contentsActionEquals(content, CONFIGURE_PARAM) || contentsActionEquals(content, CONFIG_SCALE_OUT_PARAM)) { + if (contentsActionEquals(content, CONFIGURE_PARAM) || contentsActionEquals(content, CONFIG_SCALE_OUT_PARAM) + || contentsActionEquals(content, CONFIG_SCALE_IN_PARAM)) { boolean isUpdateRequired = dbservice.isArtifactUpdateRequired(context, DB_DEVICE_INTERFACE_PROTOCOL); - if (contentsActionEquals(content, CONFIGURE_PARAM) - || (contentsActionEquals(content, CONFIG_SCALE_OUT_PARAM) + if (contentsActionEquals(content, CONFIGURE_PARAM) || (contentsActionEquals(content, CONFIG_SCALE_OUT_PARAM) + || contentsActionEquals(content, CONFIG_SCALE_IN_PARAM) && !isUpdateRequired)) { dbservice.processDeviceInterfaceProtocol(context, isUpdateRequired); @@ -711,7 +714,8 @@ public class ArtifactHandlerNode implements SvcLogicJavaPlugin { private void tryProcessVnfcReference(JSONObject content, SvcLogicContext context, DBService dbservice) throws SvcLogicException { if (content.getString(ACTION).equals(CONFIGURE_PARAM) - || content.getString(ACTION).equals(CONFIG_SCALE_OUT_PARAM)) { + || content.getString(ACTION).equals(CONFIG_SCALE_OUT_PARAM) + || content.getString(ACTION).equals(CONFIG_SCALE_IN_PARAM)) { dbservice.processVnfcReference(context, false); } -- cgit 1.2.3-korg