aboutsummaryrefslogtreecommitdiffstats
path: root/test/csit/scripts/optf-has/has
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-04-21 04:34:59 +0000
committerGerrit Code Review <gerrit@onap.org>2018-04-21 04:34:59 +0000
commitf6a5fa3fff39f5d297c17067a5d3846b6682dd8a (patch)
tree06b5f5730bc7851e4ed9290bca1c566a77cbcdfe /test/csit/scripts/optf-has/has
parentae7c76453603c74bfc035828dc9744fdd6495728 (diff)
parent85ca1cace1741dc6d69346d69553154e14706468 (diff)
Merge "Add HPA and VimFit test cases"
Diffstat (limited to 'test/csit/scripts/optf-has/has')
-rw-r--r--test/csit/scripts/optf-has/has/has-properties/conductor.conf.onap32
-rwxr-xr-xtest/csit/scripts/optf-has/has/has_script.sh2
2 files changed, 32 insertions, 2 deletions
diff --git a/test/csit/scripts/optf-has/has/has-properties/conductor.conf.onap b/test/csit/scripts/optf-has/has/has-properties/conductor.conf.onap
index 0f9e7494d..a8e84846c 100644
--- a/test/csit/scripts/optf-has/has/has-properties/conductor.conf.onap
+++ b/test/csit/scripts/optf-has/has/has-properties/conductor.conf.onap
@@ -314,7 +314,7 @@ aafns = conductor
#table_prefix = sdnc
# Base URL for SDN-C. (string value)
-server_url = http://localhost:8082/restconf/
+server_url = http://localhost:8083/restconf/
# Basic Authentication Username (string value)
username = admin
@@ -346,3 +346,33 @@ extensions = sdnc
# solver will restart any orphaned solving requests at startup. (boolean value)
#concurrent = false
+
+[multicloud]
+
+#
+# From conductor
+#
+
+# Base URL for Multicloud without a trailing slash. (string value)
+server_url = http://msb.onap.org:8082/api/multicloud
+
+# Timeout for Multicloud Rest Call (string value)
+multicloud_rest_timeout = 30
+
+# Number of retry for Multicloud Rest Call (string value)
+multicloud_retries = 3
+
+# The version of Multicloud API. (string value)
+server_url_version = v0
+
+
+
+[vim_controller]
+
+#
+# From conductor
+#
+
+# Extensions list to use (list value)
+extensions = multicloud
+
diff --git a/test/csit/scripts/optf-has/has/has_script.sh b/test/csit/scripts/optf-has/has/has_script.sh
index ac907eea1..ee5479e10 100755
--- a/test/csit/scripts/optf-has/has/has_script.sh
+++ b/test/csit/scripts/optf-has/has/has_script.sh
@@ -60,7 +60,7 @@ MULTICLOUDSIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.I
echo "MULTICLOUDSIM_IP=${MULTICLOUDSIM_IP}"
# change MULTICLOUD reference to the local instance
-sed -i -e "s%localhost:8082/%${MULTICLOUDSIM_IP}:8082/%g" /tmp/conductor/properties/conductor.conf
+sed -i -e "s%msb.onap.org:8082/%${MULTICLOUDSIM_IP}:8082/%g" /tmp/conductor/properties/conductor.conf
#onboard conductor into music
curl -vvvvv --noproxy "*" --request POST http://${MUSIC_IP}:8080/MUSIC/rest/v2/admin/onboardAppWithMusic -H "Content-Type: application/json" --data @${WORKSPACE}/test/csit/tests/optf-has/has/data/onboard.json