From 2485a585be7d2506432aedbd786b2ea9e187f8b5 Mon Sep 17 00:00:00 2001 From: rameshiyer27 Date: Wed, 12 Mar 2025 21:55:49 +0000 Subject: [PATCH] Enable encryption in CSIT Issue-ID: POLICY-5308 Signed-off-by: rameshiyer27 Change-Id: If645744177d13d7d21406564064bcacebd2a4ab3 --- compose/config/clamp/AcRuntimeParameters.yaml | 1 + csit/resources/tests/data/AcK8s.json | 9 ++++++--- csit/resources/tests/data/ac-definition-migration-from.yaml | 2 ++ csit/resources/tests/data/ac-definition-migration-to.yaml | 2 ++ csit/resources/tests/data/acelement-usecase.yaml | 6 ++++++ .../resources/config/acRuntimeParameters.yaml | 1 + 6 files changed, 18 insertions(+), 3 deletions(-) diff --git a/compose/config/clamp/AcRuntimeParameters.yaml b/compose/config/clamp/AcRuntimeParameters.yaml index a5be78e7..b1297650 100644 --- a/compose/config/clamp/AcRuntimeParameters.yaml +++ b/compose/config/clamp/AcRuntimeParameters.yaml @@ -77,6 +77,7 @@ runtime: acmParameters: toscaElementName: org.onap.policy.clamp.acm.AutomationCompositionElement toscaCompositionName: org.onap.policy.clamp.acm.AutomationComposition + enableEncryption: true management: tracing: diff --git a/csit/resources/tests/data/AcK8s.json b/csit/resources/tests/data/AcK8s.json index 8585faf5..c8f1a838 100644 --- a/csit/resources/tests/data/AcK8s.json +++ b/csit/resources/tests/data/AcK8s.json @@ -1201,7 +1201,8 @@ "body": "{ \"receiverId\": { \"name\": \"onap.policy.clamp.ac.startertobridge\", \"version\": \"1.0.0\" }, \"timerMs\": 20000, \"elementType\": \"STARTER\", \"topicParameterGroup\": { \"server\": \"kafka:9092\", \"listenerTopic\": \"policy_update_msg\", \"publisherTopic\": \"ac_element_msg\", \"fetchTimeout\": 15000, \"topicCommInfrastructure\": \"kafka\" } }", "expectedResponse": 201 } - ] + ], + "password": "dummyPasswordStringForEncryption" } ] } @@ -1236,7 +1237,8 @@ "body": "{ \"receiverId\": { \"name\": \"onap.policy.clamp.ac.bridgetosink\", \"version\": \"1.0.0\" }, \"timerMs\": 20000, \"elementType\": \"BRIDGE\", \"topicParameterGroup\": { \"server\": \"kafka:9092\", \"listenerTopic\": \"policy_update_msg\", \"publisherTopic\": \"ac_element_msg\", \"fetchTimeout\": 15000, \"topicCommInfrastructure\": \"kafka\" } }", "expectedResponse": 201 } - ] + ], + "password": "dummyPasswordStringForEncryption" } ] } @@ -1271,7 +1273,8 @@ "body": "{ \"receiverId\": { \"name\": \"onap.policy.clamp.ac.sink\", \"version\": \"1.0.0\" }, \"timerMs\": 20000, \"elementType\": \"SINK\", \"topicParameterGroup\": { \"server\": \"kafka:9092\", \"listenerTopic\": \"policy_update_msg\", \"publisherTopic\": \"ac_element_msg\", \"fetchTimeout\": 15000, \"topicCommInfrastructure\": \"kafka\" } }", "expectedResponse": 201 } - ] + ], + "password": "dummyPasswordStringForEncryption" } ] } diff --git a/csit/resources/tests/data/ac-definition-migration-from.yaml b/csit/resources/tests/data/ac-definition-migration-from.yaml index f11b174c..707e692c 100644 --- a/csit/resources/tests/data/ac-definition-migration-from.yaml +++ b/csit/resources/tests/data/ac-definition-migration-from.yaml @@ -90,6 +90,8 @@ node_types: type: string required: true description: The base URL to be prepended to each path, identifies the host for the REST endpoints. + metadata: + sensitive: true httpHeaders: type: map required: false diff --git a/csit/resources/tests/data/ac-definition-migration-to.yaml b/csit/resources/tests/data/ac-definition-migration-to.yaml index 179fe11c..45d76eb1 100644 --- a/csit/resources/tests/data/ac-definition-migration-to.yaml +++ b/csit/resources/tests/data/ac-definition-migration-to.yaml @@ -90,6 +90,8 @@ node_types: type: string required: true description: The base URL to be prepended to each path, identifies the host for the REST endpoints. + metadata: + sensitive: true httpHeaders: type: map required: false diff --git a/csit/resources/tests/data/acelement-usecase.yaml b/csit/resources/tests/data/acelement-usecase.yaml index b727a68f..84fd944c 100644 --- a/csit/resources/tests/data/acelement-usecase.yaml +++ b/csit/resources/tests/data/acelement-usecase.yaml @@ -73,6 +73,10 @@ data_types: type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest type_version: 1.0.0 description: A sequence of REST commands to send to the REST endpoint + password: + type: string + metadata: + sensitive: true node_types: org.onap.policy.clamp.acm.Participant: @@ -195,6 +199,8 @@ node_types: type: string required: true description: The base URL to be prepended to each path, identifies the host for the REST endpoints. + metadata: + sensitive: true httpHeaders: type: map required: false diff --git a/helm/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml b/helm/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml index 644d86a7..ac5a0c0f 100644 --- a/helm/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml +++ b/helm/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml @@ -99,6 +99,7 @@ runtime: acmParameters: toscaElementName: {{ .Values.customNaming.toscaElementName }} toscaCompositionName: {{ .Values.customNaming.toscaCompositionName }} + enableEncryption: true -- 2.16.6