From 4559dcd94d57042de03b67cf8567bc7c0000cdaf Mon Sep 17 00:00:00 2001
From: "adheli.tavares" <adheli.tavares@est.tech>
Date: Wed, 23 Nov 2022 11:01:10 +0000
Subject: Fix CSIT failures

- fix for pap with topic changes
- fix the response code for clamp

Issue-ID: POLICY-4463
Change-Id: Ifd55122863fd93cc90a55dd354b941dcffa160b3
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
---
 csit/clamp/tests/policy-clamp-test.robot |  2 +-
 csit/config/pap/papParameters.yaml       | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/csit/clamp/tests/policy-clamp-test.robot b/csit/clamp/tests/policy-clamp-test.robot
index f819d2d2..8cb292e4 100644
--- a/csit/clamp/tests/policy-clamp-test.robot
+++ b/csit/clamp/tests/policy-clamp-test.robot
@@ -15,7 +15,7 @@ CommissionAutomationCompositionV1
      ${headers}=  Create Dictionary     Accept=application/yaml    Content-Type=application/yaml
      ${resp}=   POST On Session     policy  /onap/policy/clamp/acm/v2/commission   data=${postyaml}  headers=${headers}
      Log    Received response from runtime acm ${resp.text}
-     Should Be Equal As Strings    ${resp.status_code}     200
+     Should Be Equal As Strings    ${resp.status_code}     201
 
 InstantiateAutomationCompositionV1
      [Documentation]  Instantiate automation composition.
diff --git a/csit/config/pap/papParameters.yaml b/csit/config/pap/papParameters.yaml
index 27e793f5..330feee8 100644
--- a/csit/config/pap/papParameters.yaml
+++ b/csit/config/pap/papParameters.yaml
@@ -29,6 +29,10 @@ server:
 pap:
   name: PapGroup
   aaf: false
+  topic:
+    pdp-pap.name: POLICY-PDP-PAP
+    notification.name: POLICY-NOTIFICATION
+    heartbeat.name: POLICY-HEARTBEAT
   pdpParameters:
     heartBeatMs: 120000
     updateParameters:
@@ -40,14 +44,14 @@ pap:
   savePdpStatisticsInDb: true
   topicParameterGroup:
     topicSources:
-    - topic: POLICY-PDP-PAP
+    - topic: ${pap.topic.pdp-pap.name}
       servers:
       - message-router
       topicCommInfrastructure: dmaap
       useHttps: false
       fetchTimeout: 15000
-    - topic: POLICY-HEARTBEAT
-      effectiveTopic: POLICY-PDP-PAP
+    - topic: ${pap.topic.heartbeat.name}
+      effectiveTopic: ${pap.topic.pdp-pap.name}
       consumerGroup: policy-pap
       servers:
       - message-router
@@ -55,12 +59,12 @@ pap:
       useHttps: false
       fetchTimeout: 15000
     topicSinks:
-    - topic: POLICY-PDP-PAP
+    - topic: ${pap.topic.pdp-pap.name}
       servers:
       - message-router
       topicCommInfrastructure: dmaap
       useHttps: false
-    - topic: POLICY-NOTIFICATION
+    - topic: ${pap.topic.notification.name}
       servers:
       - message-router
       topicCommInfrastructure: dmaap
-- 
cgit 1.2.3-korg