diff options
| author |   Rob Daugherty <rd472p@att.com> | 2018-03-28 18:53:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-28 18:53:45 +0000 |
| commit | 66bc7be8daea37a2f99ad76f5e21ef665f980aba (patch) | |
| tree | e6b1497e702ef20ca80aaefebcbffe7678911951 /bpmn/MSOCommonBPMN/src/test/java/org | |
| parent | e098a363a3fd5444f77d7783e18dc00f768ca123 (diff) | |
| parent | 19efd68c8f8babdaf8a2eb7f78b4522940339da2 (diff) | |
Merge "ControllerType update for CM flows"
Diffstat (limited to 'bpmn/MSOCommonBPMN/src/test/java/org')
2 files changed, 8 insertions, 7 deletions
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 7fe32880c6..e737f5da16 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 @@ -43,7 +43,7 @@ public class ApplicationControllerClientTest { @Test
public void createRequest_CheckLock_RequestBuilt() {
- ApplicationControllerClient client = new ApplicationControllerClient();
+ ApplicationControllerClient client = new ApplicationControllerClient("appc");
ActionIdentifiers actionIdentifiers = new ActionIdentifiers();
actionIdentifiers.setVnfId("vnfId");
CheckLockInput checkLockInput = (CheckLockInput) client.createRequest(Action.CheckLock, actionIdentifiers, null,
@@ -54,7 +54,7 @@ public class ApplicationControllerClientTest { @Test
@Ignore // 1802 merge
public void runCommand_liveAppc() {
- ApplicationControllerClient client = new ApplicationControllerClient();
+ ApplicationControllerClient client = new ApplicationControllerClient("appc");
ActionIdentifiers actionIdentifiers = new ActionIdentifiers();
//actionIdentifiers.setVnfId("ca522254-2ba4-4fbd-b15b-0ef0d9cfda5f");
actionIdentifiers.setVnfId("2d2bf10e-81a5-");
@@ -72,7 +72,7 @@ public class ApplicationControllerClientTest { @Test
@Ignore // 1802 merge
public void runCommand_CheckLock_RequestBuilt() {
- ApplicationControllerClient client = new ApplicationControllerClient();
+ ApplicationControllerClient client = new ApplicationControllerClient("appc");
ActionIdentifiers actionIdentifiers = new ActionIdentifiers();
actionIdentifiers.setVnfId("fusion-vpp-vnf-001");
Status status;
@@ -88,14 +88,15 @@ public class ApplicationControllerClientTest { @Test
public void test_getLCMPropertiesHelper() {
- ApplicationControllerClient client = new ApplicationControllerClient();
- Properties properties = client.getLCMProperties();
+ ApplicationControllerClient client = new ApplicationControllerClient("appc");
+ Properties properties = client.getLCMProperties("appc");
assertEquals(properties.get("topic.write"), "APPC-TEST-AMDOCS1-DEV3");
assertEquals(properties.get("topic.read.timeout"), "120000");
assertEquals(properties.get("client.response.timeout"), "120000");
assertEquals(properties.get("topic.read"), "APPC-TEST-AMDOCS2");
assertEquals(properties.get("poolMembers"),
"uebsb93kcdc.it.att.com:3904,uebsb92kcdc.it.att.com:3904,uebsb91kcdc.it.att.com:3904");
+ assertEquals(properties.get("client.controllerType"), "appc");
assertEquals(properties.get("client.key"), "iaEMAfjsVsZnraBP");
assertEquals(properties.get("client.secret"), "wcivUjsjXzmGFBfxMmyJu9dz");
}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerOrchestratorTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerOrchestratorTest.java index bd026d0b6d..d9c5654989 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerOrchestratorTest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerOrchestratorTest.java @@ -46,7 +46,7 @@ public class ApplicationControllerOrchestratorTest { Status status;
try {
status = client.vnfCommand(Action.Lock, UUID.randomUUID().toString(),
- "3ffdee3c-94d2-45fe-904d-fc1efa0f8b59", Optional.of(""));
+ "3ffdee3c-94d2-45fe-904d-fc1efa0f8b59", Optional.of(""), "appc");
} catch (ApplicationControllerOrchestratorException e) {
status = new Status();
status.setCode(e.getAppcCode());
@@ -62,7 +62,7 @@ public class ApplicationControllerOrchestratorTest { Status status;
try {
status = client.vnfCommand(Action.Unlock, UUID.randomUUID().toString(),
- "ca522254-2ba4-4fbd-b15b-0ef0d9cfda5f", Optional.of(""));
+ "ca522254-2ba4-4fbd-b15b-0ef0d9cfda5f", Optional.of(""), "appc");
} catch (ApplicationControllerOrchestratorException e) {
status = new Status();
status.setCode(e.getAppcCode());
|