From f84a61a944d6561550d96880a54c410ca03deabe Mon Sep 17 00:00:00 2001 From: FrancescoFioraEst Date: Wed, 29 Sep 2021 12:16:06 +0100 Subject: Handle ParticipantRegister Send ParticipantUpdate to participant after registration if commissioning has already been created Issue-ID: POLICY-3689 Change-Id: Iccc4fc1c0b95e1f270b6810c5b5f130726f24650 Signed-off-by: FrancescoFioraEst --- .../commissioning/CommissioningProviderTest.java | 29 +++++++++++----------- .../ControlLoopInstantiationProviderTest.java | 4 ++- .../supervision/SupervisionHandlerTest.java | 8 +++--- 3 files changed, 22 insertions(+), 19 deletions(-) (limited to 'runtime-controlloop/src/test') diff --git a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/commissioning/CommissioningProviderTest.java b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/commissioning/CommissioningProviderTest.java index b0ea00913..3fd74f22e 100644 --- a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/commissioning/CommissioningProviderTest.java +++ b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/commissioning/CommissioningProviderTest.java @@ -35,6 +35,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.onap.policy.clamp.controlloop.models.controlloop.persistence.provider.ControlLoopProvider; import org.onap.policy.clamp.controlloop.models.controlloop.persistence.provider.ParticipantProvider; +import org.onap.policy.clamp.controlloop.models.controlloop.persistence.provider.ServiceTemplateProvider; import org.onap.policy.clamp.controlloop.runtime.instantiation.InstantiationUtils; import org.onap.policy.clamp.controlloop.runtime.main.parameters.ClRuntimeParameterGroup; import org.onap.policy.clamp.controlloop.runtime.util.CommonTestData; @@ -90,8 +91,8 @@ class CommissioningProviderTest { clProvider = new ControlLoopProvider(clRuntimeParameterGroup.getDatabaseProviderParameters()); participantProvider = new ParticipantProvider(clRuntimeParameterGroup.getDatabaseProviderParameters()); - CommissioningProvider provider = - new CommissioningProvider(modelsProvider, clProvider, null, participantProvider); + CommissioningProvider provider = new CommissioningProvider(new ServiceTemplateProvider(modelsProvider), + clProvider, null, participantProvider); ToscaServiceTemplate serviceTemplate = InstantiationUtils.getToscaServiceTemplate(TOSCA_SERVICE_TEMPLATE_YAML); List listOfTemplates = provider.getControlLoopDefinitions(null, null); @@ -128,8 +129,8 @@ class CommissioningProviderTest { clProvider = new ControlLoopProvider(clRuntimeParameterGroup.getDatabaseProviderParameters()); participantProvider = new ParticipantProvider(clRuntimeParameterGroup.getDatabaseProviderParameters()); - CommissioningProvider provider = - new CommissioningProvider(modelsProvider, clProvider, null, participantProvider); + CommissioningProvider provider = new CommissioningProvider(new ServiceTemplateProvider(modelsProvider), + clProvider, null, participantProvider); // Test Service template is null assertThatThrownBy(() -> provider.createControlLoopDefinitions(null)).hasMessageMatching(TEMPLATE_IS_NULL); List listOfTemplates = provider.getControlLoopDefinitions(null, null); @@ -158,8 +159,8 @@ class CommissioningProviderTest { clProvider = new ControlLoopProvider(clRuntimeParameterGroup.getDatabaseProviderParameters()); participantProvider = new ParticipantProvider(clRuntimeParameterGroup.getDatabaseProviderParameters()); - CommissioningProvider provider = - new CommissioningProvider(modelsProvider, clProvider, null, participantProvider); + CommissioningProvider provider = new CommissioningProvider(new ServiceTemplateProvider(modelsProvider), + clProvider, null, participantProvider); ToscaServiceTemplate serviceTemplate = InstantiationUtils.getToscaServiceTemplate(COMMON_TOSCA_SERVICE_TEMPLATE_YAML); @@ -187,8 +188,8 @@ class CommissioningProviderTest { clProvider = new ControlLoopProvider(clRuntimeParameterGroup.getDatabaseProviderParameters()); participantProvider = new ParticipantProvider(clRuntimeParameterGroup.getDatabaseProviderParameters()); - CommissioningProvider provider = - new CommissioningProvider(modelsProvider, clProvider, null, participantProvider); + CommissioningProvider provider = new CommissioningProvider(new ServiceTemplateProvider(modelsProvider), + clProvider, null, participantProvider); ToscaServiceTemplate serviceTemplate = InstantiationUtils.getToscaServiceTemplate(COMMON_TOSCA_SERVICE_TEMPLATE_YAML); @@ -216,8 +217,8 @@ class CommissioningProviderTest { clProvider = new ControlLoopProvider(clRuntimeParameterGroup.getDatabaseProviderParameters()); participantProvider = new ParticipantProvider(clRuntimeParameterGroup.getDatabaseProviderParameters()); - CommissioningProvider provider = - new CommissioningProvider(modelsProvider, clProvider, null, participantProvider); + CommissioningProvider provider = new CommissioningProvider(new ServiceTemplateProvider(modelsProvider), + clProvider, null, participantProvider); ToscaServiceTemplate serviceTemplate = InstantiationUtils.getToscaServiceTemplate(COMMON_TOSCA_SERVICE_TEMPLATE_YAML); @@ -262,8 +263,8 @@ class CommissioningProviderTest { clProvider = new ControlLoopProvider(clRuntimeParameterGroup.getDatabaseProviderParameters()); participantProvider = new ParticipantProvider(clRuntimeParameterGroup.getDatabaseProviderParameters()); - CommissioningProvider provider = - new CommissioningProvider(modelsProvider, clProvider, null, participantProvider); + CommissioningProvider provider = new CommissioningProvider(new ServiceTemplateProvider(modelsProvider), + clProvider, null, participantProvider); ToscaServiceTemplate serviceTemplate = InstantiationUtils.getToscaServiceTemplate(TOSCA_SERVICE_TEMPLATE_YAML); List listOfTemplates = provider.getControlLoopDefinitions(null, null); @@ -291,8 +292,8 @@ class CommissioningProviderTest { clProvider = new ControlLoopProvider(clRuntimeParameterGroup.getDatabaseProviderParameters()); participantProvider = new ParticipantProvider(clRuntimeParameterGroup.getDatabaseProviderParameters()); - CommissioningProvider provider = - new CommissioningProvider(modelsProvider, clProvider, null, participantProvider); + CommissioningProvider provider = new CommissioningProvider(new ServiceTemplateProvider(modelsProvider), + clProvider, null, participantProvider); ToscaServiceTemplate serviceTemplate = InstantiationUtils.getToscaServiceTemplate(TOSCA_SERVICE_TEMPLATE_YAML); provider.getControlLoopDefinitions(null, null); diff --git a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/instantiation/ControlLoopInstantiationProviderTest.java b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/instantiation/ControlLoopInstantiationProviderTest.java index abf0cfc3e..82f7e66d5 100644 --- a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/instantiation/ControlLoopInstantiationProviderTest.java +++ b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/instantiation/ControlLoopInstantiationProviderTest.java @@ -40,6 +40,7 @@ import org.onap.policy.clamp.controlloop.models.controlloop.persistence.provider import org.onap.policy.clamp.controlloop.models.controlloop.persistence.provider.ControlLoopProvider; import org.onap.policy.clamp.controlloop.models.controlloop.persistence.provider.ParticipantProvider; import org.onap.policy.clamp.controlloop.models.controlloop.persistence.provider.ParticipantStatisticsProvider; +import org.onap.policy.clamp.controlloop.models.controlloop.persistence.provider.ServiceTemplateProvider; import org.onap.policy.clamp.controlloop.models.messages.rest.instantiation.InstantiationCommand; import org.onap.policy.clamp.controlloop.models.messages.rest.instantiation.InstantiationResponse; import org.onap.policy.clamp.controlloop.runtime.commissioning.CommissioningProvider; @@ -122,7 +123,8 @@ class ControlLoopInstantiationProviderTest { new ParticipantStatisticsProvider(controlLoopParameters.getDatabaseProviderParameters()); var clElementStatisticsProvider = new ClElementStatisticsProvider(controlLoopParameters.getDatabaseProviderParameters()); - commissioningProvider = new CommissioningProvider(modelsProvider, clProvider, null, participantProvider); + commissioningProvider = new CommissioningProvider(new ServiceTemplateProvider(modelsProvider), clProvider, null, + participantProvider); var monitoringProvider = new MonitoringProvider(participantStatisticsProvider, clElementStatisticsProvider, clProvider); var participantProvider = new ParticipantProvider(controlLoopParameters.getDatabaseProviderParameters()); diff --git a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionHandlerTest.java b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionHandlerTest.java index 25ce61122..0ad8aad43 100644 --- a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionHandlerTest.java +++ b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/SupervisionHandlerTest.java @@ -23,7 +23,6 @@ package org.onap.policy.clamp.controlloop.runtime.supervision; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyList; -import static org.mockito.ArgumentMatchers.anyMap; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -230,9 +229,10 @@ class SupervisionHandlerTest { mock(MonitoringProvider.class), mock(ParticipantRegisterAckPublisher.class), mock(ParticipantDeregisterAckPublisher.class), mock(ControlLoopUpdatePublisher.class), participantUpdatePublisher); - handler.handleSendCommissionMessage(Map.of()); + handler.handleSendCommissionMessage(participantId.getName(), participantId.getVersion()); - verify(participantUpdatePublisher).send(anyMap(), eq(true)); + verify(participantUpdatePublisher).sendComissioningBroadcast(eq(participantId.getName()), + eq(participantId.getVersion())); } @Test @@ -244,7 +244,7 @@ class SupervisionHandlerTest { participantUpdatePublisher); handler.handleSendDeCommissionMessage(); - verify(participantUpdatePublisher).send(anyMap(), eq(false)); + verify(participantUpdatePublisher).sendDecomisioning(); } private SupervisionHandler createSupervisionHandler(ControlLoopProvider controlLoopProvider, -- cgit 1.2.3-korg