From d8ecbcfb5461ad13f72a6def9224a600d29f1090 Mon Sep 17 00:00:00 2001 From: FrancescoFioraEst Date: Thu, 4 Jan 2024 10:28:13 +0000 Subject: Add OutProperties instance support for restart scenario in acm-model Add support for OutProperties instance, operationalState and useState in restart scenario. Issue-ID: POLICY-4909 Change-Id: I2106bc3bd60ba9ca568acfa64c09a2984ad8a337 Signed-off-by: FrancescoFioraEst --- .../messages/dmaap/participant/ParticipantRestartTest.java | 11 ++++++++++- .../org/onap/policy/clamp/models/acm/utils/AcmUtilsTest.java | 6 +++++- 2 files changed, 15 insertions(+), 2 deletions(-) (limited to 'models/src/test/java/org') diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantRestartTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantRestartTest.java index ba84ac76f..4a2a958d6 100644 --- a/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantRestartTest.java +++ b/models/src/test/java/org/onap/policy/clamp/models/acm/messages/dmaap/participant/ParticipantRestartTest.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2023 Nordix Foundation. + * Copyright (C) 2023-2024 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,9 +27,12 @@ import static org.onap.policy.clamp.models.acm.messages.dmaap.participant.Partic import java.time.Instant; import java.util.List; +import java.util.Map; import java.util.UUID; import org.junit.jupiter.api.Test; import org.onap.policy.clamp.models.acm.concepts.AcElementRestart; +import org.onap.policy.clamp.models.acm.concepts.DeployState; +import org.onap.policy.clamp.models.acm.concepts.LockState; import org.onap.policy.clamp.models.acm.concepts.ParticipantDefinition; import org.onap.policy.clamp.models.acm.concepts.ParticipantRestartAc; import org.onap.policy.clamp.models.acm.utils.CommonTestData; @@ -62,6 +65,12 @@ class ParticipantRestartTest { acElement.setId(UUID.randomUUID()); var id = new ToscaConceptIdentifier("id", "1.2.3"); acElement.setDefinition(id); + acElement.setDeployState(DeployState.DEPLOYED); + acElement.setLockState(LockState.LOCKED); + acElement.setOperationalState("OperationalState"); + acElement.setUseState("UseState"); + acElement.setProperties(Map.of("key", "value")); + acElement.setOutProperties(Map.of("keyOut", "valueOut")); var acRestart = new ParticipantRestartAc(); acRestart.setAcElementList(List.of(acElement)); diff --git a/models/src/test/java/org/onap/policy/clamp/models/acm/utils/AcmUtilsTest.java b/models/src/test/java/org/onap/policy/clamp/models/acm/utils/AcmUtilsTest.java index 8e10e81ad..bc8741e65 100755 --- a/models/src/test/java/org/onap/policy/clamp/models/acm/utils/AcmUtilsTest.java +++ b/models/src/test/java/org/onap/policy/clamp/models/acm/utils/AcmUtilsTest.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2021-2023 Nordix Foundation. + * Copyright (C) 2021-2024 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -226,6 +226,10 @@ class AcmUtilsTest { assertEquals(element.getDefinition(), result.getDefinition()); assertEquals(element.getDeployState(), result.getDeployState()); assertEquals(element.getLockState(), result.getLockState()); + assertEquals(element.getOperationalState(), result.getOperationalState()); + assertEquals(element.getUseState(), result.getUseState()); + assertEquals(element.getProperties(), result.getProperties()); + assertEquals(element.getOutProperties(), result.getOutProperties()); } private AutomationComposition getDummyAutomationComposition() { -- cgit