summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xkud/tests/_common_test.sh29
-rwxr-xr-xkud/tests/nfd.sh3
-rwxr-xr-xkud/tests/plugin.sh2
-rwxr-xr-xkud/tests/plugin_edgex.sh2
-rwxr-xr-xkud/tests/vFW/firewall3
-rwxr-xr-xkud/tests/vFW/packetgen3
-rwxr-xr-xkud/tests/vFW/sink3
-rw-r--r--src/k8splugin/api/api.go9
-rw-r--r--src/k8splugin/api/brokerhandler_test.go6
9 files changed, 49 insertions, 11 deletions
diff --git a/kud/tests/_common_test.sh b/kud/tests/_common_test.sh
new file mode 100755
index 00000000..be22db9a
--- /dev/null
+++ b/kud/tests/_common_test.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+# SPDX-license-identifier: Apache-2.0
+##############################################################################
+# Copyright 2019 © Samsung Electronics Co., Ltd.
+# 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
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+# install_deps() - Install dependencies required for functional tests
+function install_deps {
+ if ! $(jq --version &>/dev/null); then
+ source /etc/os-release || source /usr/lib/os-release
+ case ${ID,,} in
+ *suse)
+ ;;
+ ubuntu|debian)
+ sudo apt-get install -y jq
+ ;;
+ rhel|centos|fedora)
+ ;;
+ esac
+ fi
+}
diff --git a/kud/tests/nfd.sh b/kud/tests/nfd.sh
index 17548206..b7e1f3e8 100755
--- a/kud/tests/nfd.sh
+++ b/kud/tests/nfd.sh
@@ -12,10 +12,13 @@ set -o errexit
set -o nounset
set -o pipefail
+source _common_test.sh
+
rm -f $HOME/*.yaml
pod_name=nfd-pod
+install_deps
cat << POD > $HOME/$pod_name.yaml
apiVersion:
v1
diff --git a/kud/tests/plugin.sh b/kud/tests/plugin.sh
index 1137f1b9..af74af5f 100755
--- a/kud/tests/plugin.sh
+++ b/kud/tests/plugin.sh
@@ -14,6 +14,7 @@ set -o pipefail
#set -o xtrace
source _common.sh
+source _common_test.sh
source _functions.sh
base_url="http://localhost:8081"
@@ -57,6 +58,7 @@ function start_aai_service {
}
# Setup
+install_deps
destroy_deployment $plugin_deployment_name
#start_aai_service
diff --git a/kud/tests/plugin_edgex.sh b/kud/tests/plugin_edgex.sh
index 3165efbf..4e806e6f 100755
--- a/kud/tests/plugin_edgex.sh
+++ b/kud/tests/plugin_edgex.sh
@@ -13,6 +13,7 @@ set -o nounset
set -o pipefail
#set -o xtrace
+source _common_test.sh
source _functions.sh
base_url="http://localhost:8081/v1/vnf_instances/"
@@ -21,6 +22,7 @@ namespace="default"
csar_id=cb009bfe-bbee-11e8-9766-525400435678
# Setup
+install_deps
_checks_args ${csar_id}
cp -R ./edgex/* ${CSAR_DIR}/${csar_id}/
diff --git a/kud/tests/vFW/firewall b/kud/tests/vFW/firewall
index 93d4f2a3..c839c4d6 100755
--- a/kud/tests/vFW/firewall
+++ b/kud/tests/vFW/firewall
@@ -51,7 +51,8 @@ function install_vfw_scripts {
local ves_reporting_path="${ves_path}/evel/evel-library"
pushd /opt
- wget -q https://git.onap.org/demo/plain/vnfs/vFW/scripts/{v_firewall_init,vfirewall}.sh
+ wget -q "https://nexus.onap.org/content/repositories/staging/org/onap/demo/vnf/vfw/vfw-scripts/${version}/vfw-scripts-${version}.zip"
+ unzip "vfw-scripts-${version}.zip"
chmod +x *.sh
_untar_url "sample-distribution/${version}/sample-distribution-${version}-hc.tar.gz"
diff --git a/kud/tests/vFW/packetgen b/kud/tests/vFW/packetgen
index 51d5c676..c51cd9f8 100755
--- a/kud/tests/vFW/packetgen
+++ b/kud/tests/vFW/packetgen
@@ -49,7 +49,8 @@ function install_vfw_scripts {
local version=$(cat /opt/config/demo_artifacts_version.txt)
pushd /opt
- wget -q https://git.onap.org/demo/plain/vnfs/vFW/scripts/{v_packetgen_init,vpacketgen,run_traffic_fw_demo}.sh
+ wget -q "https://nexus.onap.org/content/repositories/staging/org/onap/demo/vnf/vfw/vfw-scripts/${version}/vfw-scripts-${version}.zip"
+ unzip "vfw-scripts-${version}.zip"
chmod +x *.sh
_untar_url "sample-distribution/${version}/sample-distribution-${version}-hc.tar.gz"
diff --git a/kud/tests/vFW/sink b/kud/tests/vFW/sink
index 5604198f..ace3b389 100755
--- a/kud/tests/vFW/sink
+++ b/kud/tests/vFW/sink
@@ -27,7 +27,8 @@ function install_dependencies {
# install_vfw_scripts() -
function install_vfw_scripts {
pushd /opt
- wget -q https://git.onap.org/demo/plain/vnfs/vFW/scripts/{v_sink_init,vsink}.sh
+ wget -q "https://nexus.onap.org/content/repositories/staging/org/onap/demo/vnf/vfw/vfw-scripts/${version}/vfw-scripts-${version}.zip"
+ unzip "vfw-scripts-${version}.zip"
chmod +x *.sh
mv vsink.sh /etc/init.d
diff --git a/src/k8splugin/api/api.go b/src/k8splugin/api/api.go
index 5fed28a0..2976b82f 100644
--- a/src/k8splugin/api/api.go
+++ b/src/k8splugin/api/api.go
@@ -43,12 +43,11 @@ func NewRouter(defClient rb.DefinitionManager,
// instRouter.HandleFunc("/{vnfInstanceId}", UpdateHandler).Methods("PUT")
//Setup the broker handler here
+ //Use the base router without any path prefixes
brokerHandler := brokerInstanceHandler{client: instClient}
- instRouter.HandleFunc("/{cloud-owner}/{cloud-region}/infra_workload", brokerHandler.createHandler).Methods("POST")
- instRouter.HandleFunc("/{cloud-owner}/{cloud-region}/infra_workload/{instID}",
- brokerHandler.getHandler).Methods("GET")
- instRouter.HandleFunc("/{cloud-owner}/{cloud-region}/infra_workload/{instID}",
- brokerHandler.deleteHandler).Methods("DELETE")
+ router.HandleFunc("/{cloud-owner}/{cloud-region}/infra_workload", brokerHandler.createHandler).Methods("POST")
+ router.HandleFunc("/{cloud-owner}/{cloud-region}/infra_workload/{instID}", brokerHandler.getHandler).Methods("GET")
+ router.HandleFunc("/{cloud-owner}/{cloud-region}/infra_workload/{instID}", brokerHandler.deleteHandler).Methods("DELETE")
//Setup the connectivity api handler here
connectionClient := connection.NewConnectionClient()
diff --git a/src/k8splugin/api/brokerhandler_test.go b/src/k8splugin/api/brokerhandler_test.go
index d9991e68..16046634 100644
--- a/src/k8splugin/api/brokerhandler_test.go
+++ b/src/k8splugin/api/brokerhandler_test.go
@@ -122,7 +122,7 @@ func TestBrokerCreateHandler(t *testing.T) {
for _, testCase := range testCases {
t.Run(testCase.label, func(t *testing.T) {
- request := httptest.NewRequest("POST", "/v1/cloudowner/cloudregion/infra_workload", testCase.input)
+ request := httptest.NewRequest("POST", "/cloudowner/cloudregion/infra_workload", testCase.input)
resp := executeRequest(request, NewRouter(nil, nil, testCase.instClient, nil, nil))
if testCase.expectedCode != resp.StatusCode {
@@ -204,7 +204,7 @@ func TestBrokerGetHandler(t *testing.T) {
for _, testCase := range testCases {
t.Run(testCase.label, func(t *testing.T) {
- request := httptest.NewRequest("GET", "/v1/cloudowner/cloudregion/infra_workload/"+testCase.input, nil)
+ request := httptest.NewRequest("GET", "/cloudowner/cloudregion/infra_workload/"+testCase.input, nil)
resp := executeRequest(request, NewRouter(nil, nil, testCase.instClient, nil, nil))
if testCase.expectedCode != resp.StatusCode {
@@ -251,7 +251,7 @@ func TestBrokerDeleteHandler(t *testing.T) {
for _, testCase := range testCases {
t.Run(testCase.label, func(t *testing.T) {
- request := httptest.NewRequest("DELETE", "/v1/cloudowner/cloudregion/infra_workload/"+testCase.input, nil)
+ request := httptest.NewRequest("DELETE", "/cloudowner/cloudregion/infra_workload/"+testCase.input, nil)
resp := executeRequest(request, NewRouter(nil, nil, testCase.instClient, nil, nil))
if testCase.expectedCode != resp.StatusCode {