Merge "Fix sriov test in baremetal deploy"

[multicloud/k8s.git] / kud / tests / plugin_fw.sh

diff --git a/kud/tests/plugin_fw.sh b/kud/tests/plugin_fw.sh
index 9c98177..de9c12e 100755 (executable)
--- a/kud/tests/plugin_fw.sh
+++ b/kud/tests/plugin_fw.sh
@@ -2,6 +2,7 @@
 # SPDX-license-identifier: Apache-2.0
 ##############################################################################
 # Copyright (c) 2018
+# Copyright © 2020 Samsung Electronics
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
@@ -63,7 +64,7 @@ payload="$(cat <<EOF
     "rb-name": "${rb_name}",
     "rb-version": "${rb_version}",
     "profile-name": "${profile_name}",
-    "release-name": "${release_name}",
+    "release-name": "dummy",
     "namespace": "${namespace}"
 }
 EOF
@@ -92,6 +93,7 @@ payload="$(cat <<EOF
     "rb-name": "${rb_name}",
     "rb-version": "${rb_version}",
     "profile-name": "${profile_name}",
+    "release-name": "${release_name}",
     "cloud-region": "${cloud_region_id}",
     "labels": {"testCaseName": "plugin_fw.sh"},
     "override-values": {"global.onapPrivateNetworkName": "onap-private-net-test"}
@@ -115,11 +117,16 @@ print_msg "Not waiting for vFW to fully install as no further checks are impleme
 #sleep 8m
 print_msg "[END] Basic checks for instantiated resource"
 
+print_msg "Retrieving VNF status (this will result with long output)"
+call_api "${base_url}/instance/${vnf_id}/status"
+
 print_msg "Retrieving VNF details"
 response="$(call_api "${base_url}/instance/${vnf_id}")"
 echo "$response"
 print_msg "Assert additional label has been assigned to rb instance"
-test "$(jq -r .request.labels.testCaseName <<< "${response}")" == plugin_fw.sh
+test "$(jq -r '.request.labels.testCaseName' <<< "${response}")" == plugin_fw.sh
+print_msg "Assert ReleaseName has been correctly overriden"
+test "$(jq -r '.request."release-name"' <<< "${response}")" == "${release_name}"
 
 #Teardown
 print_msg "Deleting VNF Instance"
@@ -133,3 +140,5 @@ delete_resource "${base_url}/rb/definition/${rb_name}/${rb_version}"
 
 print_msg "Deleting ${cloud_region_id} cloud region connection"
 delete_resource "${base_url}/connectivity-info/${cloud_region_id}"
+
+print_msg "Test finished successfully"