diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2020-10-29 12:52:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-10-29 12:52:33 +0000 |
| commit | 0963516ab409f4fc2d36ee7c8885eeeaab288a6b (patch) | |
| tree | d17bf78516800a341107f6db5d02e2855431444e /scripts | |
| parent | b6328b945c85e874bc4fcd1368e19878577eadce (diff) | |
| parent | 4e76bd143c04d7f2adcc01255f3666e0d333414c (diff) | |
Merge "[OOF] Add CSIT for NSI/NSSI selection"
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/optf-has/has/has-properties/conductor.conf.onap | 3 | ||||
| -rwxr-xr-x | scripts/optf-has/has/has_script.sh | 2 | ||||
| -rwxr-xr-x | scripts/optf-has/has/simulator_script.sh | 10 |
3 files changed, 5 insertions, 10 deletions
diff --git a/scripts/optf-has/has/has-properties/conductor.conf.onap b/scripts/optf-has/has/has-properties/conductor.conf.onap index 6cf8fb29..3ce7fa05 100644 --- a/scripts/optf-has/has/has-properties/conductor.conf.onap +++ b/scripts/optf-has/has/has-properties/conductor.conf.onap @@ -296,6 +296,7 @@ concurrent = true # Time between checking for new plans. Default value is 1. (integer value) # Minimum value: 1 #polling_interval = 1 +opt_schema_file = /opt/has/conductor/etc/conductor/opt_schema.json # (integer value) # Minimum value: 1 @@ -335,7 +336,7 @@ concurrent = true # # Extensions list to use (list value) -#extensions = aai +extensions = aai,generator [messaging_server] diff --git a/scripts/optf-has/has/has_script.sh b/scripts/optf-has/has/has_script.sh index f851051c..3b24d47a 100755 --- a/scripts/optf-has/has/has_script.sh +++ b/scripts/optf-has/has/has_script.sh @@ -31,7 +31,7 @@ cd ${DIR} COND_CONF=/tmp/conductor/properties/conductor.conf LOG_CONF=/tmp/conductor/properties/log.conf IMAGE_NAME=nexus3.onap.org:10001/onap/optf-has -IMAGE_VER=2.0.2-SNAPSHOT-latest +IMAGE_VER=2.1.2-SNAPSHOT-latest BUNDLE=/tmp/conductor/properties/AAF_RootCA.cer mkdir -p /tmp/conductor/properties diff --git a/scripts/optf-has/has/simulator_script.sh b/scripts/optf-has/has/simulator_script.sh index ccb479b2..c52535cb 100755 --- a/scripts/optf-has/has/simulator_script.sh +++ b/scripts/optf-has/has/simulator_script.sh @@ -44,16 +44,10 @@ if [ ${USER} != 'jenkins' ]; then fi # prepare aaisim -cd ${WORK_DIR}/has/conductor/conductor/tests/functional/simulators/aaisim/ - -# check Dockerfile content -cat ./Dockerfile - -# build aaisim -docker build -t aaisim . +cd ${WORK_DIR}/has/conductor/conductor/tests/functional/simulators/ # run aaisim -docker run -d --name aaisim -p 8081:8081 aaisim +./run_aaisim.sh AAISIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' aaisim` echo "AAISIM_IP=${AAISIM_IP}" |