From 46964ab900060a560b9b41f7d34ab0e26ac7fd61 Mon Sep 17 00:00:00 2001 From: "saul.gill" Date: Fri, 13 Jan 2023 17:24:23 +0000 Subject: Add supported ac elements to participants Added new supported elements table Added supported element names and versions to participant application.yaml files Issue-ID: POLICY-4512 Change-Id: I97d7f571f2906846514ac0804b4827f0601177d7 Signed-off-by: saul.gill --- .../src/test/resources/application-test.yaml | 9 ++++++++- .../src/main/resources/config/application.yaml | 7 +++++++ .../src/test/resources/application-test.yaml | 5 +++++ .../src/main/resources/config/application.yaml | 11 +++++++++-- .../acm/participant/kubernetes/parameters/CommonTestData.java | 4 +++- .../src/test/resources/application-test.yaml | 7 +++++++ .../src/main/resources/META-INF/persistence.xml | 11 +++++------ .../src/main/resources/config/application.yaml | 8 ++++++++ .../participant/policy/main/parameters/CommonTestData.java | 4 +++- .../src/test/resources/application-test.yaml | 7 +++++++ .../intermediary/comm/ParticipantMessagePublisher.java | 6 +++--- .../participant/intermediary/handler/ParticipantHandler.java | 6 ++++++ .../parameters/ParticipantIntermediaryParameters.java | 9 ++++++++- .../intermediary/main/parameters/CommonTestData.java | 5 ++++- 14 files changed, 83 insertions(+), 16 deletions(-) (limited to 'participant') diff --git a/participant/participant-impl/participant-impl-a1pms/src/test/resources/application-test.yaml b/participant/participant-impl/participant-impl-a1pms/src/test/resources/application-test.yaml index be33b5249..867357e93 100755 --- a/participant/participant-impl/participant-impl-a1pms/src/test/resources/application-test.yaml +++ b/participant/participant-impl/participant-impl-a1pms/src/test/resources/application-test.yaml @@ -21,4 +21,11 @@ participant: topicCommInfrastructure: dmaap servers: - localhost - topic: POLICY-ACRUNTIME-PARTICIPANT \ No newline at end of file + topic: POLICY-ACRUNTIME-PARTICIPANT + participantSupportedElementTypes: + - + typeName: org.onap.policy.clamp.acm.HttpAutomationCompositionElement + typeVersion: 1.0.0 + - + typeName: org.onap.policy.clamp.acm.AutomationCompositionElement + typeVersion: 1.0.0 diff --git a/participant/participant-impl/participant-impl-http/src/main/resources/config/application.yaml b/participant/participant-impl/participant-impl-http/src/main/resources/config/application.yaml index 44cdf95a6..1f60ffc97 100644 --- a/participant/participant-impl/participant-impl-http/src/main/resources/config/application.yaml +++ b/participant/participant-impl/participant-impl-http/src/main/resources/config/application.yaml @@ -34,6 +34,13 @@ participant: servers: - ${topicServer:localhost} topicCommInfrastructure: dmaap + participantSupportedElementTypes: + - + typeName: org.onap.policy.clamp.acm.HttpAutomationCompositionElement + typeVersion: 1.0.0 + - + typeName: org.onap.policy.clamp.acm.AutomationCompositionElement + typeVersion: 1.0.0 management: endpoints: web: diff --git a/participant/participant-impl/participant-impl-http/src/test/resources/application-test.yaml b/participant/participant-impl/participant-impl-http/src/test/resources/application-test.yaml index 535508e2a..1effd4e4c 100644 --- a/participant/participant-impl/participant-impl-http/src/test/resources/application-test.yaml +++ b/participant/participant-impl/participant-impl-http/src/test/resources/application-test.yaml @@ -22,3 +22,8 @@ participant: servers: - localhost topic: POLICY-ACRUNTIME-PARTICIPANT + participantSupportedElementTypes: + - typeName: org.onap.policy.clamp.acm.HttpAutomationCompositionElement + typeVersion: 1.0.0 + - typeName: org.onap.policy.clamp.acm.AutomationCompositionElement + typeVersion: 1.0.0 diff --git a/participant/participant-impl/participant-impl-kubernetes/src/main/resources/config/application.yaml b/participant/participant-impl/participant-impl-kubernetes/src/main/resources/config/application.yaml index 0158c2c63..a906cb6fa 100644 --- a/participant/participant-impl/participant-impl-kubernetes/src/main/resources/config/application.yaml +++ b/participant/participant-impl/participant-impl-kubernetes/src/main/resources/config/application.yaml @@ -30,15 +30,22 @@ participant: - topic: POLICY-ACRUNTIME-PARTICIPANT servers: - - ${topicServer:localhost} + - ${topicServer:localhost:30227} topicCommInfrastructure: dmaap fetchTimeout: 15000 topicSinks: - topic: POLICY-ACRUNTIME-PARTICIPANT servers: - - ${topicServer:localhost} + - ${topicServer:localhost:30227} topicCommInfrastructure: dmaap + participantSupportedElementTypes: + - + typeName: org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement + typeVersion: 1.0.0 + - + typeName: org.onap.policy.clamp.acm.AutomationCompositionElement + typeVersion: 1.0.0 management: endpoints: diff --git a/participant/participant-impl/participant-impl-kubernetes/src/test/java/org/onap/policy/clamp/acm/participant/kubernetes/parameters/CommonTestData.java b/participant/participant-impl/participant-impl-kubernetes/src/test/java/org/onap/policy/clamp/acm/participant/kubernetes/parameters/CommonTestData.java index 97d2fbbd2..8a9619dce 100644 --- a/participant/participant-impl/participant-impl-kubernetes/src/test/java/org/onap/policy/clamp/acm/participant/kubernetes/parameters/CommonTestData.java +++ b/participant/participant-impl/participant-impl-kubernetes/src/test/java/org/onap/policy/clamp/acm/participant/kubernetes/parameters/CommonTestData.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2021-2022 Nordix Foundation. + * Copyright (C) 2021-2023 Nordix Foundation. * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -21,6 +21,7 @@ package org.onap.policy.clamp.acm.participant.kubernetes.parameters; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.TreeMap; @@ -105,6 +106,7 @@ public class CommonTestData { map.put("participantId", getParticipantId()); map.put("participantType", getParticipantId()); map.put("clampAutomationCompositionTopics", getTopicParametersMap(false)); + map.put("participantSupportedElementTypes", new ArrayList<>()); } return map; diff --git a/participant/participant-impl/participant-impl-kubernetes/src/test/resources/application-test.yaml b/participant/participant-impl/participant-impl-kubernetes/src/test/resources/application-test.yaml index cd36f61e7..7fc792878 100644 --- a/participant/participant-impl/participant-impl-kubernetes/src/test/resources/application-test.yaml +++ b/participant/participant-impl/participant-impl-kubernetes/src/test/resources/application-test.yaml @@ -29,3 +29,10 @@ participant: - localhost topicCommInfrastructure: dmaap name: AutomationComposition Topics + participantSupportedElementTypes: + - + typeName: org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement + typeVersion: 1.0.0 + - + typeName: org.onap.policy.clamp.acm.AutomationCompositionElement + typeVersion: 1.0.0 diff --git a/participant/participant-impl/participant-impl-policy/src/main/resources/META-INF/persistence.xml b/participant/participant-impl/participant-impl-policy/src/main/resources/META-INF/persistence.xml index 383bc7418..d5eae7390 100644 --- a/participant/participant-impl/participant-impl-policy/src/main/resources/META-INF/persistence.xml +++ b/participant/participant-impl/participant-impl-policy/src/main/resources/META-INF/persistence.xml @@ -1,7 +1,7 @@