summaryrefslogtreecommitdiffstats
path: root/csit
diff options
context:
space:
mode:
authorJosephKeenan <joseph.keenan@est.tech>2021-12-08 18:16:44 +0000
committerJosephKeenan <joseph.keenan@est.tech>2021-12-14 16:13:40 +0000
commit82ebf531110deba98086f8f7cb9c745519bbc4f4 (patch)
tree6a64017dc6986dc4d2e042ea33e09e1ffdcd495f /csit
parent4207fab422760b17187d37776ebc1867b995bba1 (diff)
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
Diffstat (limited to 'csit')
-rwxr-xr-xcsit/plans/cps/teardown.sh6
-rw-r--r--csit/tests/ncmp-passthrough/ncmp-passthrough.robot2
2 files changed, 7 insertions, 1 deletions
diff --git a/csit/plans/cps/teardown.sh b/csit/plans/cps/teardown.sh
index 75f0af41fc..f1939cf4b3 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 51eabc87e9..1673baa601 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