From ca5b7107f23562bf81267292a47d7fb2f30ebaf9 Mon Sep 17 00:00:00 2001 From: EricMoore Date: Thu, 31 Oct 2019 13:34:09 +0000 Subject: SW UP building block and workflow This commit creates two bpmn 1. PNFSoftwareUpgrade.bpmn 2. PNFSWUPDownload.bpmn Respective Testcases are also written for both bpmns. Issue-ID: SO-2514 Issue-ID: SO-2515 Change-Id: Icb1706f1974341182f13b9125e09418b61571c52 Signed-off-by: EricMoore --- .../java/org/onap/so/client/cds/AbstractCDSProcessingBBUtils.java | 2 +- .../test/java/org/onap/so/client/cds/GeneratePayloadForCdsTest.java | 2 +- .../test/java/org/onap/so/client/cds/PnfCDSRequestProviderTest.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'bpmn/MSOCommonBPMN/src') diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/cds/AbstractCDSProcessingBBUtils.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/cds/AbstractCDSProcessingBBUtils.java index ebced8e933..51b1a218c8 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/cds/AbstractCDSProcessingBBUtils.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/cds/AbstractCDSProcessingBBUtils.java @@ -58,7 +58,7 @@ public class AbstractCDSProcessingBBUtils { private static final String FAILED = "Failed"; private static final String PROCESSING = "Processing"; private static final String RESPONSE_PAYLOAD = "CDSResponsePayload"; - private static final String CDS_STATUS = "CDSStatus"; + private static final String CDS_STATUS = "ControllerStatus"; private static final String EXEC_INPUT = "executionServiceInput"; private static final String EXECUTION_OBJECT = "executionObject"; private static final String EXCEPTION = "Exception"; diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/cds/GeneratePayloadForCdsTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/cds/GeneratePayloadForCdsTest.java index 24962a0c14..998976589c 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/cds/GeneratePayloadForCdsTest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/cds/GeneratePayloadForCdsTest.java @@ -55,7 +55,7 @@ public class GeneratePayloadForCdsTest { private static final String VF_SCOPE = "vfModule"; private static final String ASSIGN_ACTION = "configAssign"; private static final String DEPLOY_ACTION = "configDeploy"; - private static final String DOWNLOAD_ACTION = "downloadNeSw"; + private static final String DOWNLOAD_ACTION = "downloadNESw"; private static final String MSO_REQUEST_ID = "1234"; private static final String BUILDING_BLOCK = "buildingBlock"; private static final String PUBLIC_NET_ID = "public-net-id"; diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/cds/PnfCDSRequestProviderTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/cds/PnfCDSRequestProviderTest.java index e5cbc9a369..88559280b6 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/cds/PnfCDSRequestProviderTest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/cds/PnfCDSRequestProviderTest.java @@ -40,8 +40,8 @@ public class PnfCDSRequestProviderTest { @InjectMocks private PnfCDSRequestProvider pnfCDSRequestProvider; - private static final String DOWNLOAD_ACTION = "downloadNeSw"; - private static final String ACTIVATE_ACTION = "activateNeSw"; + private static final String DOWNLOAD_ACTION = "downloadNESw"; + private static final String ACTIVATE_ACTION = "activateNESw"; private static final String TEST_MODEL_UUID = "6bc0b04d-1873-4721-b53d-6615225b2a28"; private static final String TEST_SERVICE_INSTANCE_ID = "test_service_id"; private static final String TEST_PROCESS_KEY = "processKey1"; -- cgit 1.2.3-korg