Enable encryption in CSIT

Issue-ID: POLICY-5308
Signed-off-by: rameshiyer27 <ramesh.murugan.iyer@est.tech>
Change-Id: If645744177d13d7d21406564064bcacebd2a4ab3

diff --git a/compose/config/clamp/AcRuntimeParameters.yaml b/compose/config/clamp/AcRuntimeParameters.yaml
index a5be78e..b129765 100644 (file)
--- 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 8585faf..c8f1a83 100644 (file)
--- 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 f11b174..707e692 100644 (file)
--- 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 179fe11..45d76eb 100644 (file)
--- 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 b727a68..84fd944 100644 (file)
--- 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 644d86a..ac5a0c0 100644 (file)
--- 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