From 82ebf531110deba98086f8f7cb9c745519bbc4f4 Mon Sep 17 00:00:00 2001
From: JosephKeenan <joseph.keenan@est.tech>
Date: Wed, 8 Dec 2021 18:16:44 +0000
Subject: Changing putOperationWithJson to postOperationWithJson

-Modified responseEntity<String> to reesponseEntity<Object>
-Changed behaviour of sync to use new repsonses and removed JSON parsing
-Updated tests to use new responsess
-Tests have been updated and added jira to docs
-Added messageConverters to RestTemplate to support plain text with
ResponseEntity<Object>
-Added docker log output for cps & dmi containers during CSIT teardown
-Moved reponse conversion from service into DMIModelOperations class
-Added response handling test (edgecases)
-Updated response request body for passthrough-running CSIT test to pass

Issue-ID: CPS-777
Signed-off-by: JosephKeenan <joseph.keenan@est.tech>
Change-Id: If2acf83a97b8aad5aa2c342154d807a47cace6a0
---
 csit/plans/cps/teardown.sh                         | 6 ++++++
 csit/tests/ncmp-passthrough/ncmp-passthrough.robot | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'csit')

diff --git a/csit/plans/cps/teardown.sh b/csit/plans/cps/teardown.sh
index 75f0af41f..f1939cf4b 100755
--- a/csit/plans/cps/teardown.sh
+++ b/csit/plans/cps/teardown.sh
@@ -21,6 +21,12 @@
 # Branched from ccsdk/distribution to this repository Feb 23, 2021
 #
 
+echo '================================== CPS-NCMP Logs ========================'
+docker logs cps-and-ncmp
+
+echo '================================== DMI Logs ============================='
+docker logs ncmp-dmi-plugin
+
 echo 'Stopping, Removing all running containers...'
 docker stop $(docker ps -aq) && docker rm $(docker ps -aq)
 
diff --git a/csit/tests/ncmp-passthrough/ncmp-passthrough.robot b/csit/tests/ncmp-passthrough/ncmp-passthrough.robot
index 51eabc87e..1673baa60 100644
--- a/csit/tests/ncmp-passthrough/ncmp-passthrough.robot
+++ b/csit/tests/ncmp-passthrough/ncmp-passthrough.robot
@@ -100,7 +100,7 @@ Verify update to bookstore using passthrough-running did not remove category 02
 Delete Bookstore using passthrough-running for Category 01
     ${uri}=              Set Variable       ${ncmpBasePath}/v1/ch/PNFDemo/data/ds/ncmp-datastore:passthrough-running?resourceIdentifier=stores:bookstore/categories=01
     ${headers}=          Create Dictionary  Content-Type=application/json   Authorization=${auth}
-    ${response}=         DELETE On Session     CPS_URL   ${uri}   headers=${headers}   data=''
+    ${response}=         DELETE On Session  CPS_URL   ${uri}   headers=${headers}   data={}
     Should Be Equal As Strings              ${response.status_code}   204
 
 Verify delete to bookstore using passthrough-running removed only category 01
-- 
cgit 1.2.3-korg