Merge changes Ia35fac70,I7ffaa3d4,I53e7e4d6

* changes:
  Update plugin.sh with new helper functions
  Provide connection info for plugin testcase
  Correct k8splugin endpoint configuration in KUD test

3 files changed, 43 insertions, 51 deletions

diff --git a/kud/tests/_common.sh b/kud/tests/_common.sh
index f9f47f87..044891dd 100755
--- a/kud/tests/_common.sh
+++ b/kud/tests/_common.sh
@@ -27,10 +27,8 @@ unprotected_private_net=unprotected-private-net
 protected_private_net=protected-private-net
 ovn_multus_network_name=ovn-networkobj
 rbd_metadata=rbd_metatada.json
-rbd_content_tarball=vault-consul-dev.tar
 rbp_metadata=rbp_metatada.json
 rbp_instance=rbp_instance.json
-rbp_content_tarball=profile.tar
 
 # vFirewall vars
 demo_artifacts_version=1.5.0
@@ -1119,17 +1117,13 @@ DEPLOYMENT
 # populate_CSAR_rbdefinition() - Function that populates CSAR folder
 # for testing resource bundle definition
 function populate_CSAR_rbdefinition {
-    local csar_id=$1
-
-    _checks_args $csar_id
-    pushd ${CSAR_DIR}/${csar_id}
+    _checks_args "$1"
+    pushd "${CSAR_DIR}/$1"
     print_msg "Create Helm Chart Archives"
-    rm -f ${rbd_content_tarball}.gz
-    rm -f ${rbp_content_tarball}.gz
-    tar -cf $rbd_content_tarball -C $test_folder/vnfs/testrb/helm vault-consul-dev
-    tar -cf $rbp_content_tarball -C $test_folder/vnfs/testrb/helm/profile .
-    gzip $rbp_content_tarball
-    gzip $rbd_content_tarball
+    rm -f *.tar.gz
+    tar -czf rb_profile.tar.gz -C $test_folder/vnfs/testrb/helm/profile .
+    #Creates vault-consul-dev-0.0.0.tgz
+    helm package $test_folder/vnfs/testrb/helm/vault-consul-dev --version 0.0.0
     popd
 }
 
diff --git a/kud/tests/plugin.sh b/kud/tests/plugin.sh
index af74af5f..aff04128 100755
--- a/kud/tests/plugin.sh
+++ b/kud/tests/plugin.sh
@@ -17,9 +17,11 @@ source _common.sh
 source _common_test.sh
 source _functions.sh
 
-base_url="http://localhost:8081"
+base_url="http://localhost:9015/v1"
+kubeconfig_path="$HOME/.kube/config"
 #Will resolve to file $KUBE_CONFIG_DIR/kud
 cloud_region_id="kud"
+cloud_region_owner="test_owner"
 namespace="testns"
 csar_id="94e414f6-9ca4-11e8-bb6a-52540067263b"
 rb_name="test-rbdef"
@@ -34,10 +36,10 @@ function _build_generic_sim {
         return
     fi
     BUILD_ARGS="--no-cache"
-    if [ $HTTP_PROXY ]; then
+    if [ ${HTTP_PROXY:-} ]; then
         BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}"
     fi
-    if [ $HTTPS_PROXY ]; then
+    if [ ${HTTPS_PROXY:-} ]; then
         BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}"
     fi
 
@@ -67,7 +69,7 @@ populate_CSAR_rbdefinition $csar_id
 
 # Test
 print_msg "Create Resource Bundle Definition Metadata"
-payload_raw="
+payload="
 {
     \"rb-name\": \"${rb_name}\",
     \"rb-version\": \"${rb_version}\",
@@ -78,14 +80,13 @@ payload_raw="
     }
 }
 "
-payload=$(echo $payload_raw | tr '\n' ' ')
-rb_ret_name=$(curl -s -d "$payload" -X POST "${base_url}/v1/rb/definition" | jq -r '."rb-name"')
+call_api -d "$payload" "${base_url}/rb/definition"
 
 print_msg "Upload Resource Bundle Definition Content"
-curl -s --data-binary @${CSAR_DIR}/${csar_id}/${rbd_content_tarball}.gz -X POST "${base_url}/v1/rb/definition/$rb_name/$rb_version/content"
+call_api --data-binary "@${CSAR_DIR}/${csar_id}/vault-consul-dev-0.0.0.tgz" "${base_url}/rb/definition/$rb_name/$rb_version/content"
 
 print_msg "Listing Resource Bundle Definitions"
-rb_list=$(curl -s -X GET "${base_url}/v1/rb/definition/$rb_name")
+rb_list=$(call_api "${base_url}/rb/definition/$rb_name")
 if [[ "$rb_list" != *"${rb_name}"* ]]; then
     echo $rb_list
     echo "Resource Bundle Definition not stored"
@@ -94,7 +95,7 @@ fi
 
 print_msg "Create Resource Bundle Profile Metadata"
 kubeversion=$(kubectl version | grep 'Server Version' | awk -F '"' '{print $6}')
-payload_raw="
+payload="
 {
     \"profile-name\": \"${profile_name}\",
     \"rb-name\": \"${rb_name}\",
@@ -107,22 +108,33 @@ payload_raw="
     }
 }
 "
-payload=$(echo $payload_raw | tr '\n' ' ')
-rbp_ret_name=$(curl -s -d "$payload" -X POST "${base_url}/v1/rb/definition/$rb_name/$rb_version/profile" | jq -r '."profile-name"')
+call_api -d "$payload" "${base_url}/rb/definition/$rb_name/$rb_version/profile"
 
 print_msg "Upload Resource Bundle Profile Content"
-curl -s --data-binary @${CSAR_DIR}/${csar_id}/${rbp_content_tarball}.gz -X POST "${base_url}/v1/rb/definition/$rb_name/$rb_version/profile/$profile_name/content"
+call_api --data-binary "@${CSAR_DIR}/${csar_id}/rb_profile.tar.gz" "${base_url}/rb/definition/$rb_name/$rb_version/profile/$profile_name/content"
 
 print_msg "Getting Resource Bundle Profile"
-rbp_ret=$(curl -s -X GET "${base_url}/v1/rb/definition/$rb_name/$rb_version/profile/$profile_name")
+rbp_ret=$(call_api "${base_url}/rb/definition/$rb_name/$rb_version/profile/$profile_name")
 if [[ "$rbp_ret" != *"${profile_name}"* ]]; then
     echo $rbp_ret
     echo "Resource Bundle Profile not stored"
     exit 1
 fi
 
+print_msg "Setup cloud data"
+payload="$(cat <<EOF
+{
+    "cloud-region": "$cloud_region_id",
+    "cloud-owner": "$cloud_region_owner"
+}
+EOF
+)"
+call_api -F "metadata=$payload" \
+    -F "file=@$kubeconfig_path" \
+    "${base_url}/connectivity-info" >/dev/null
+
 print_msg "Instantiate Profile"
-payload_raw="
+payload="
 {
     \"cloud-region\": \"$cloud_region_id\",
     \"rb-name\":\"$rb_name\",
@@ -130,8 +142,9 @@ payload_raw="
     \"profile-name\":\"$profile_name\"
 }
 "
-payload=$(echo $payload_raw | tr '\n' ' ')
-inst_id=$(curl -s -d "$payload" "${base_url}/v1/instance" | jq -r '.id')
+inst_id=$(call_api -d "$payload" "${base_url}/instance")
+echo "$inst_id"
+inst_id=$(jq -r '.id' <<< "$inst_id")
 
 print_msg "Validating Kubernetes"
 kubectl get --no-headers=true --namespace=${namespace} deployment ${release_name}-vault-consul-dev
@@ -139,35 +152,21 @@ kubectl get --no-headers=true --namespace=${namespace} service override-vault-co
 echo "VNF Instance created succesfully with id: $inst_id"
 
 print_msg "Getting $inst_id VNF Instance information"
-vnf_details=$(curl -s -X GET "${base_url}/v1/instance/${inst_id}")
-if [[ -z "$vnf_details" ]]; then
-    echo "Cannot retrieved VNF Instance details"
-    exit 1
-fi
-echo "VNF details $vnf_details"
+call_api "${base_url}/instance/${inst_id}"
 
+# Teardown
 print_msg "Deleting $rb_name/$rb_version Resource Bundle Definition"
-curl -X DELETE "${base_url}/v1/rb/definition/$rb_name/$rb_version"
-if [[ 500 -ne $(curl -o /dev/null -w %{http_code} -s -X GET "${base_url}/v1/rb/definition/$rb_name/$rb_version") ]]; then
-    echo "Resource Bundle Definition not deleted"
 # TODO: Change the HTTP code for 404 when the resource is not found in the API
-    exit 1
-fi
+delete_resource "${base_url}/rb/definition/$rb_name/$rb_version"
 
 print_msg "Deleting $profile_name Resource Bundle Profile"
-curl -X DELETE "${base_url}/v1/rb/definition/$rb_name/$rb_version/profile/$profile_name"
-if [[ 500 -ne $(curl -o /dev/null -w %{http_code} -s -X GET "${base_url}/v1/rb/definition/$rb_name/$rb_version/profile/$profile_name") ]]; then
-    echo "Resource Bundle Profile not deleted"
 # TODO: Change the HTTP code for 404 when the resource is not found in the API
-    exit 1
-fi
+delete_resource "${base_url}/rb/definition/$rb_name/$rb_version/profile/$profile_name"
 
 print_msg "Deleting $inst_id VNF Instance"
-curl -X DELETE "${base_url}/v1/instance/${inst_id}"
-if [[ 404 -ne $(curl -o /dev/null -w %{http_code} -s -X GET "${base_url}/${inst_id}") ]]; then
-    echo "VNF Instance not deleted"
-    exit 1
-fi
+delete_resource "${base_url}/instance/${inst_id}"
+
+print_msg "Deleting ${cloud_region_id} cloud region connection"
+delete_resource "${base_url}/connectivity-info/${cloud_region_id}"
 
-# Teardown
 teardown $plugin_deployment_name
diff --git a/kud/tests/plugin_edgex.sh b/kud/tests/plugin_edgex.sh
index 929961c0..8eae5692 100755
--- a/kud/tests/plugin_edgex.sh
+++ b/kud/tests/plugin_edgex.sh
@@ -99,7 +99,6 @@ kubectl get --no-headers=true --namespace=${namespace} service edgex-core-comman
 print_msg "Retrieving VNF details"
 call_api "${base_url}/instance/${vnf_id}"
 
-
 #Teardown
 print_msg "Deleting VNF Instance"
 delete_resource "${base_url}/instance/${vnf_id}"