diff options
Diffstat (limited to 'participant')
7 files changed, 54 insertions, 14 deletions
diff --git a/participant/participant-impl/participant-impl-policy/src/main/resources/config/application.yaml b/participant/participant-impl/participant-impl-policy/src/main/resources/config/application.yaml index 5839aae66..2aa33c1c4 100644 --- a/participant/participant-impl/participant-impl-policy/src/main/resources/config/application.yaml +++ b/participant/participant-impl/participant-impl-policy/src/main/resources/config/application.yaml @@ -11,7 +11,7 @@ participant: clientName: api hostname: policy-api port: 6969 - userName: healthcheck + userName: policyadmin password: zb!XztG34 useHttps: true allowSelfSignedCerts: true @@ -19,7 +19,7 @@ participant: clientName: pap hostname: policy-pap port: 6969 - userName: healthcheck + userName: policyadmin password: zb!XztG34 useHttps: true allowSelfSignedCerts: true diff --git a/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/CommonTestData.java b/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/CommonTestData.java index 41af8a6ec..e965370cc 100644 --- a/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/CommonTestData.java +++ b/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/CommonTestData.java @@ -84,7 +84,7 @@ public class CommonTestData { map.put("clientName", "pap"); map.put("hostname", "localhost"); map.put("port", 6968); - map.put("userName", "healthcheck"); + map.put("userName", "policyadmin"); map.put("password", "zb!XztG34"); map.put("https", false); map.put("allowSelfSignedCerts", true); @@ -101,7 +101,7 @@ public class CommonTestData { map.put("clientName", "api"); map.put("hostname", "localhost"); map.put("port", 6969); - map.put("userName", "healthcheck"); + map.put("userName", "policyadmin"); map.put("password", "zb!XztG34"); map.put("https", false); map.put("allowSelfSignedCerts", true); diff --git a/participant/participant-impl/participant-impl-policy/src/test/resources/application_test.properties b/participant/participant-impl/participant-impl-policy/src/test/resources/application_test.properties index f857704d3..49781407d 100644 --- a/participant/participant-impl/participant-impl-policy/src/test/resources/application_test.properties +++ b/participant/participant-impl/participant-impl-policy/src/test/resources/application_test.properties @@ -7,7 +7,7 @@ server.http-port=8085 participant.policyApiParameters.clientName=api participant.policyApiParameters.hostname=localhost participant.policyApiParameters.port=6969 -participant.policyApiParameters.userName=healthcheck +participant.policyApiParameters.userName=policyadmin participant.policyApiParameters.password=zb!XztG34 participant.policyApiParameters.https=false participant.policyApiParameters.allowSelfSignedCerts=true diff --git a/participant/participant-impl/participant-impl-simulator/src/main/resources/config/application.yaml b/participant/participant-impl/participant-impl-simulator/src/main/resources/config/application.yaml index 320b53805..d750d46d2 100644 --- a/participant/participant-impl/participant-impl-simulator/src/main/resources/config/application.yaml +++ b/participant/participant-impl/participant-impl-simulator/src/main/resources/config/application.yaml @@ -1,7 +1,7 @@ spring: security: user: - name: healthcheck + name: runtimeUser password: zb!XztG34 server: diff --git a/participant/participant-impl/participant-impl-simulator/src/test/resources/application_test.properties b/participant/participant-impl/participant-impl-simulator/src/test/resources/application_test.properties index f162367f8..a4a1f99e5 100644 --- a/participant/participant-impl/participant-impl-simulator/src/test/resources/application_test.properties +++ b/participant/participant-impl/participant-impl-simulator/src/test/resources/application_test.properties @@ -1,4 +1,4 @@ -spring.security.user.name=healthcheck +spring.security.user.name=runtimeUser spring.security.user.password=zb!XztG34 server.servlet.context-path=/onap/participantsim @@ -6,7 +6,7 @@ server.error.path=/error participant.restServerParameters.host=0.0.0.0 participant.restServerParameters.port=6969 -participant.restServerParameters.userName=healthcheck +participant.restServerParameters.userName=runtimeUser participant.restServerParameters.password=zb!XztG34 participant.restServerParameters.https=false participant.restServerParameters.aaf=false diff --git a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ControlLoopHandlerTest.java b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ControlLoopHandlerTest.java index 5f24db7b2..43b43e3bf 100644 --- a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ControlLoopHandlerTest.java +++ b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/ControlLoopHandlerTest.java @@ -29,7 +29,6 @@ import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.mockito.Mockito.mock; import java.time.Instant; -import java.util.ArrayList; import java.util.List; import java.util.UUID; import org.junit.jupiter.api.Test; @@ -39,12 +38,14 @@ import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoop import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopElementDefinition; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopOrderedState; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopState; +import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ParticipantUpdates; import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ControlLoopStateChange; import org.onap.policy.clamp.controlloop.models.messages.dmaap.participant.ControlLoopUpdate; import org.onap.policy.clamp.controlloop.participant.intermediary.api.ControlLoopElementListener; import org.onap.policy.clamp.controlloop.participant.intermediary.main.parameters.CommonTestData; import org.onap.policy.common.utils.coder.CoderException; import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; +import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate; import org.springframework.test.context.junit.jupiter.SpringExtension; @ExtendWith(SpringExtension.class) @@ -108,6 +109,11 @@ class ControlLoopHandlerTest { ControlLoopState.PASSIVE); assertEquals(ControlLoopState.PASSIVE, value.getState()); + clh.getControlLoopMap().values().iterator().next().getElements().putIfAbsent(key, value); + clh.updateControlLoopElementState(id, key, ControlLoopOrderedState.PASSIVE, + ControlLoopState.RUNNING); + assertEquals(ControlLoopState.RUNNING, value.getState()); + var clElementStatistics = new ClElementStatistics(); clElementStatistics.setParticipantId(id); clElementStatistics.setControlLoopState(ControlLoopState.RUNNING); @@ -116,35 +122,63 @@ class ControlLoopHandlerTest { assertNotEquals(uuid, value.getClElementStatistics().getId()); clh.updateControlLoopElementStatistics(uuid, clElementStatistics); assertEquals(uuid, value.getClElementStatistics().getId()); + + clh.getElementsOnThisParticipant().remove(key, value); + clh.getControlLoopMap().values().iterator().next().getElements().clear(); + assertNull(clh.updateControlLoopElementState(id, key, ControlLoopOrderedState.PASSIVE, + ControlLoopState.RUNNING)); + } @Test void handleControlLoopUpdateExceptionTest() throws CoderException { var uuid = UUID.randomUUID(); var id = CommonTestData.getParticipantId(); - var stateChange = getStateChange(id, uuid, ControlLoopOrderedState.RUNNING); - var clh = commonTestData.setTestControlLoopHandler(id, uuid); + assertDoesNotThrow(() -> clh.handleControlLoopStateChange(mock(ControlLoopStateChange.class), List.of())); + clh.handleControlLoopStateChange(stateChange, List.of()); var newid = new ToscaConceptIdentifier("id", "1.2.3"); stateChange.setControlLoopId(newid); stateChange.setParticipantId(newid); assertDoesNotThrow(() -> clh.handleControlLoopStateChange(stateChange, List.of())); - List<ControlLoopElementDefinition> clElementDefinitions = new ArrayList<>(); var cld = new ControlLoopElementDefinition(); cld.setClElementDefinitionId(id); - clElementDefinitions.add(cld); var updateMsg = new ControlLoopUpdate(); updateMsg.setControlLoopId(id); updateMsg.setMessageId(uuid); updateMsg.setParticipantId(id); updateMsg.setStartPhase(0); + var clElementDefinitions = List.of(cld); assertDoesNotThrow(() -> clh.handleControlLoopUpdate(updateMsg, clElementDefinitions)); updateMsg.setStartPhase(1); assertDoesNotThrow(() -> clh.handleControlLoopUpdate(updateMsg, clElementDefinitions)); assertThat(clh.getClElementInstanceProperties(uuid)).isEmpty(); + + clh.getControlLoopMap().clear(); + updateMsg.setStartPhase(0); + assertDoesNotThrow(() -> clh.handleControlLoopUpdate(updateMsg, clElementDefinitions)); + + updateMsg.setControlLoopId(new ToscaConceptIdentifier("new", "0.0.1")); + updateMsg.setParticipantUpdatesList(List.of(mock(ParticipantUpdates.class))); + assertDoesNotThrow(() -> clh.handleControlLoopUpdate(updateMsg, clElementDefinitions)); + + updateMsg.setStartPhase(1); + var participantUpdate = new ParticipantUpdates(); + participantUpdate.setParticipantId(id); + var element = new ControlLoopElement(); + element.setParticipantType(id); + element.setDefinition(id); + participantUpdate.setControlLoopElementList(List.of(element)); + updateMsg.setParticipantUpdatesList(List.of(participantUpdate)); + + var cld2 = new ControlLoopElementDefinition(); + cld2.setClElementDefinitionId(id); + cld2.setControlLoopElementToscaNodeTemplate(mock(ToscaNodeTemplate.class)); + assertDoesNotThrow(() -> clh.handleControlLoopUpdate(updateMsg, List.of(cld2))); + } @Test diff --git a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/IntermediaryActivatorTest.java b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/IntermediaryActivatorTest.java index bbe0412ed..8c400c12f 100644 --- a/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/IntermediaryActivatorTest.java +++ b/participant/participant-intermediary/src/test/java/org/onap/policy/clamp/controlloop/participant/intermediary/handler/IntermediaryActivatorTest.java @@ -21,6 +21,7 @@ package org.onap.policy.clamp.controlloop.participant.intermediary.handler; import static org.assertj.core.api.Assertions.assertThatIllegalStateException; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; @@ -40,6 +41,8 @@ import org.onap.policy.clamp.controlloop.participant.intermediary.parameters.Par import org.onap.policy.common.utils.coder.Coder; import org.onap.policy.common.utils.coder.StandardCoder; import org.onap.policy.common.utils.coder.StandardCoderObject; +import org.springframework.context.event.ContextClosedEvent; +import org.springframework.context.event.ContextRefreshedEvent; class IntermediaryActivatorTest { private static final Coder CODER = new StandardCoder(); @@ -86,12 +89,15 @@ class IntermediaryActivatorTest { activator.getMsgDispatcher().onTopicEvent(null, "msg", sco); verify(listenerSecond, times(1)).onTopicEvent(any(), any(), any()); - activator.stop(); + activator.close(); assertFalse(activator.isAlive()); // repeat stop - should throw an exception assertThatIllegalStateException().isThrownBy(() -> activator.stop()); assertFalse(activator.isAlive()); + + assertDoesNotThrow(() -> activator.handleContextRefreshEvent(mock(ContextRefreshedEvent.class))); + assertDoesNotThrow(() -> activator.handleContextClosedEvent(mock(ContextClosedEvent.class))); } } } |