From a5ba8803b56e3b0ad80638b2233b887b2eee93cd Mon Sep 17 00:00:00 2001 From: Elena Kuleshov Date: Thu, 31 May 2018 16:12:56 -0400 Subject: Set controllerType to uppercase for LCM Change-Id: If229caa7abfad85f10e5ee7b8f5f6eccfb6600ac Issue-ID: SO-602 Signed-off-by: Elena Kuleshov --- .../org/openecomp/mso/client/appc/ApplicationControllerClient.java | 5 +++-- .../openecomp/mso/client/appc/ApplicationControllerClientTest.java | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java index 5182a75a79..c9e2e880e7 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java @@ -51,7 +51,7 @@ import com.att.eelf.configuration.EELFManager; public class ApplicationControllerClient { - public static final String DEFAULT_CONTROLLER_TYPE = "appc"; + public static final String DEFAULT_CONTROLLER_TYPE = "SDNC"; private static final String CLIENT_NAME = "MSO"; @@ -89,7 +89,7 @@ public class ApplicationControllerClient { if (controllerType == null) { controllerType = DEFAULT_CONTROLLER_TYPE; } - this.controllerType = controllerType; + this.controllerType = controllerType.toUpperCase(); appCSupport = new ApplicationControllerSupport(); } @@ -115,6 +115,7 @@ public class ApplicationControllerClient { if (controllerType == null) { controllerType = DEFAULT_CONTROLLER_TYPE; } + controllerType = controllerType.toUpperCase(); return AppcClientServiceFactoryProvider.getFactory(AppcLifeCycleManagerServiceFactory.class) .createLifeCycleManagerStateful(new ApplicationContext(), getLCMProperties(controllerType)); } catch (AppcClientException e) { diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerClientTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerClientTest.java index 6c2b23b926..59be8235fe 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerClientTest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerClientTest.java @@ -44,13 +44,13 @@ public class ApplicationControllerClientTest { @Test public void testClientCreation() { ApplicationControllerClient client = new ApplicationControllerClient("appc"); - assertEquals(client.getControllerType(), "appc"); + assertEquals(client.getControllerType(), "APPC"); assertNotNull(client.getAppCClient()); } @Test public void createRequest_CheckLock_RequestBuilt() { - ApplicationControllerClient client = new ApplicationControllerClient("appc"); + ApplicationControllerClient client = new ApplicationControllerClient("APPC"); ActionIdentifiers actionIdentifiers = new ActionIdentifiers(); actionIdentifiers.setVnfId("vnfId"); CheckLockInput checkLockInput = (CheckLockInput) client.createRequest(Action.CheckLock, actionIdentifiers, null, @@ -95,7 +95,7 @@ public class ApplicationControllerClientTest { @Test public void test_getLCMPropertiesHelper() { - ApplicationControllerClient client = new ApplicationControllerClient("appc"); + ApplicationControllerClient client = new ApplicationControllerClient(); Properties properties = client.getLCMProperties(); assertEquals(properties.get("topic.read"), "APPC-TEST-AMDOCS2"); assertEquals(properties.get("topic.write"), "APPC-TEST-AMDOCS1-DEV3"); -- cgit 1.2.3-korg