diff options
| -rwxr-xr-x | run-csit.sh | 42 | ||||
| -rw-r--r-- | scripts/optf-has/has/has-properties/conductor.conf.onap | 3 | ||||
| -rw-r--r-- | scripts/optf-osdf/osdf/osdf-properties/osdf.json | 25 | ||||
| -rwxr-xr-x | scripts/optf-osdf/osdf/osdf-properties/osdf_config.yaml | 5 | ||||
| -rwxr-xr-x | scripts/optf-osdf/osdf/osdf_script.sh | 2 | ||||
| -rw-r--r-- | scripts/policy/config/drools-apps/env/base.conf | 6 | ||||
| -rw-r--r-- | tests/optf-osdf/osdf/optf_osdf_test.robot | 16 | ||||
| -rw-r--r-- | tests/sdc-dcae-d/dcaed/monitoring_configuration_service_test.robot | 2 |
8 files changed, 63 insertions, 38 deletions
diff --git a/run-csit.sh b/run-csit.sh index 2c45812d..634b0c7c 100755 --- a/run-csit.sh +++ b/run-csit.sh @@ -22,6 +22,29 @@ # functions # +function on_exit(){ + rc=$? + rsync -av "$WORKDIR/" "$WORKSPACE/archives" + + # Record list of active docker containers + docker ps --format "{{.Image}}" > "$WORKSPACE/archives/_docker-images.log" + + # show memory consumption after all docker instances initialized + docker_stats | tee "$WORKSPACE/archives/_sysinfo-2-after-robot.txt" + + # Run teardown script plan if it exists + cd "${TESTPLANDIR}" + TEARDOWN="${TESTPLANDIR}/teardown.sh" + if [ -f "${TEARDOWN}" ]; then + echo "Running teardown script ${TEARDOWN}" + source_safely "${TEARDOWN}" + fi + # TODO: do something with the output + exit $rc +} +# ensure that teardown and other finalizing steps are always executed +trap on_exit EXIT + function docker_stats(){ #General memory details echo "> top -bn1 | head -3" @@ -166,22 +189,5 @@ python -m robot.run -N ${TESTPLAN} -v WORKSPACE:/tmp ${ROBOT_VARIABLES} ${TESTOP RESULT=$? load_set echo "RESULT: $RESULT" -rsync -av "$WORKDIR/" "$WORKSPACE/archives" - -# Record list of active docker containers -docker ps --format "{{.Image}}" > "$WORKSPACE/archives/_docker-images.log" - -# show memory consumption after all docker instances initialized -docker_stats | tee "$WORKSPACE/archives/_sysinfo-2-after-robot.txt" - -# Run teardown script plan if it exists -cd "${TESTPLANDIR}" -TEARDOWN="${TESTPLANDIR}/teardown.sh" -if [ -f "${TEARDOWN}" ]; then - echo "Running teardown script ${TEARDOWN}" - source_safely "${TEARDOWN}" -fi - -# TODO: do something with the output - +# Note that the final steps are done in on_exit function after this exit! exit $RESULT diff --git a/scripts/optf-has/has/has-properties/conductor.conf.onap b/scripts/optf-has/has/has-properties/conductor.conf.onap index 55f557c3..8df0d076 100644 --- a/scripts/optf-has/has/has-properties/conductor.conf.onap +++ b/scripts/optf-has/has/has-properties/conductor.conf.onap @@ -131,6 +131,9 @@ log_dir = /var/log #fatal_deprecations = false +[auth] +appkey = h@ss3crtky400fdntc#001 + [aaf_api] # diff --git a/scripts/optf-osdf/osdf/osdf-properties/osdf.json b/scripts/optf-osdf/osdf/osdf-properties/osdf.json index 0950957b..e52cb0cd 100644 --- a/scripts/optf-osdf/osdf/osdf-properties/osdf.json +++ b/scripts/optf-osdf/osdf/osdf-properties/osdf.json @@ -13,21 +13,21 @@ "name": "conductor", "values": { "UserName": "admin1", - "Password": "plan.15" + "Password": "22234d3472ef5da8ecba5a096110a024f1db5cf195c665f910d558c9e83db19d" } }, { "name": "policyPlatform", "values": { "UserName": "testpdp", - "Password": "alpha123" + "Password": "7a03bdee7a0381daf4ee426b9d2b695e3f4233ffd19a852a3fb0ff0156fbdde7" } }, { "name": "policyClient", "values": { "UserName": "python", - "Password": "test" + "Password": "3a3c8546c91f99f4becc069ba0fbb13ef46f4f3028f5bba09f3f4a9030ddc0a0" } }, { @@ -48,35 +48,35 @@ "name": "osdfPlacement", "values": { "UserName": "test", - "Password": "testpwd" + "Password": "c66b1570ae257375e500f9fe0e62b2a325466137ac5f29581e2e05cce1170212" } }, { "name": "osdfPlacementSO", "values": { "UserName": "so_test", - "Password": "so_testpwd" + "Password": "3d62d49b3e4ada38fd4146d2d82f4ba2f09345a46f15970cd439924c991b8202" } }, { "name": "osdfPlacementVFC", "values": { "UserName": "vfc_test", - "Password": "vfc_testpwd" + "Password": "1fb1cd581f96060d29ecad06be97151656bf29bce66bad587cd2fbaf5ea1e66d" } }, { "name": "osdfCMScheduler", "values": { "UserName": "test1", - "Password": "testpwd1" + "Password": "c5279fb02d7bac5269b1a644ac8e36f41f6ba7a2eae03dc469cb80d71811322b" } }, { "name": "configDb", "values": { "UserName": "osdf", - "Password": "passwd" + "Password": "40697f254409c2b97763892ecdeb50c847d605f5beb6f988f1c142a7e0344d0c" } }, { @@ -90,7 +90,14 @@ "name": "osdfPCIOpt", "values": { "UserName": "pci_test", - "Password": "pci_testpwd" + "Password": "fbf4dcb7f7cda8fdfb742838b0c90ae5bea249801f3f725fdc98941a6e4c347c" + } + }, + { + "name": "osdfOptEngine", + "values": { + "UserName": "opt_test", + "Password": "02946408ce6353d45540cd01d912686f19f48c3d8a955d5effdc14c6a43477e5" } } ] diff --git a/scripts/optf-osdf/osdf/osdf-properties/osdf_config.yaml b/scripts/optf-osdf/osdf/osdf-properties/osdf_config.yaml index f8f75005..6578567f 100755 --- a/scripts/optf-osdf/osdf/osdf-properties/osdf_config.yaml +++ b/scripts/optf-osdf/osdf/osdf-properties/osdf_config.yaml @@ -18,7 +18,7 @@ conductorMaxRetries: 5 # if we don't get something in 30 minutes, give up conductorMinorVersion: 0 # Policy Platform -- requires ClientAuth, Authorization, and Environment -policyPlatformUrl: http://127.0.0.1:5000/simulated/policy/pdp-has-vcpe-good/getConfig # Policy Dev platform URL +policyPlatformUrl: http://127.0.0.1:5000/simulated/policy/pdpx/decision/v1 # Policy Dev platform URL policyPlatformEnv: TEST # Environment for policy platform # Config for DMaaP @@ -47,3 +47,6 @@ aaf_ca_certs: ssl_certs/aaf_root_ca.cer configDbUrl: http://127.0.0.1:5000/simulated/configdb configDbGetCellListUrl: 'getCellList' configDbGetNbrListUrl: 'getNbrList' + +#key +appkey: os35@rrtky400fdntc#001t5
\ No newline at end of file diff --git a/scripts/optf-osdf/osdf/osdf_script.sh b/scripts/optf-osdf/osdf/osdf_script.sh index 6d4efa19..db668949 100755 --- a/scripts/optf-osdf/osdf/osdf_script.sh +++ b/scripts/optf-osdf/osdf/osdf_script.sh @@ -34,7 +34,7 @@ cd ${DIR} # run docker containers OSDF_CONF=/tmp/osdf/properties/osdf_config.yaml IMAGE_NAME=nexus3.onap.org:10001/onap/optf-osdf -IMAGE_VER=1.2.4-SNAPSHOT-latest +IMAGE_VER=2.0.1-SNAPSHOT-latest mkdir -p /tmp/osdf/properties mkdir -p /tmp/sms/properties diff --git a/scripts/policy/config/drools-apps/env/base.conf b/scripts/policy/config/drools-apps/env/base.conf index c11e7e98..f32162fe 100644 --- a/scripts/policy/config/drools-apps/env/base.conf +++ b/scripts/policy/config/drools-apps/env/base.conf @@ -80,11 +80,13 @@ PAP_PASSWORD=alpha123 PDP_HOST=pdp PDP_PORT=6969 +PDP_CONTEXT_URI=policy/pdpx/v1 PDP_USERNAME=testpdp PDP_PASSWORD=alpha123 PDP_CLIENT_USERNAME=python PDP_CLIENT_PASSWORD=test PDP_ENVIRONMENT=TEST +GUARD_DISABLED=false # DCAE DMaaP @@ -100,6 +102,7 @@ DMAAP_SERVERS=mr.api.simpledemo.onap.org AAI_HOST=aai.api.simpledemo.onap.org AAI_PORT=8443 +AAI_CONTEXT_URI= AAI_URL=https://aai.api.simpledemo.onap.org:8443 AAI_USERNAME=policy@policy.onap.org AAI_PASSWORD=demo123456! @@ -108,6 +111,7 @@ AAI_PASSWORD=demo123456! SO_HOST=vm1.mso.simpledemo.onap.org SO_PORT=8080 +SO_CONTEXT_URI=onap/so/infra SO_URL=http://vm1.mso.simpledemo.onap.org:8080/onap/so/infra SO_USERNAME=InfraPortalClient SO_PASSWORD=password1$ @@ -116,6 +120,7 @@ SO_PASSWORD=password1$ VFC_HOST= VFC_PORT= +VFC_CONTEXT_URI=api/nslcm/v1 VFC_URL= VFC_USERNAME= VFC_PASSWORD= @@ -124,6 +129,7 @@ VFC_PASSWORD= SDNC_HOST= SDNC_PORT= +SDNC_CONTEXT_URI=restconf/operations SDNC_URL= SDNC_USERNAME= SDNC_PASSWORD= diff --git a/tests/optf-osdf/osdf/optf_osdf_test.robot b/tests/optf-osdf/osdf/optf_osdf_test.robot index c3921d5c..79a5750e 100644 --- a/tests/optf-osdf/osdf/optf_osdf_test.robot +++ b/tests/optf-osdf/osdf/optf_osdf_test.robot @@ -33,14 +33,14 @@ SendPlacementWithValidAuth Should Be Equal As Integers ${resp.status_code} 202 Should Be Equal accepted ${response_json['requestStatus']} -#SendPCIOptimizationWithAuth -# [Documentation] It sends a POST request PCI Optimization service -# -# ${data}= Get Binary File ${CURDIR}${/}data${/}pci-opt-request.json -# ${resp}= Http Post host=${osdf_host} restUrl=/api/oof/v1/pci data=${data} auth=${pci_auth} -# ${response_json} json.loads ${resp.content} -# Should Be Equal As Integers ${resp.status_code} 202 -# Should Be Equal accepted ${response_json['requestStatus']} +SendPCIOptimizationWithAuth + [Documentation] It sends a POST request PCI Optimization service + + ${data}= Get Binary File ${CURDIR}${/}data${/}pci-opt-request.json + ${resp}= Http Post host=${osdf_host} restUrl=/api/oof/v1/pci data=${data} auth=${pci_auth} + ${response_json} json.loads ${resp.content} + Should Be Equal As Integers ${resp.status_code} 202 + Should Be Equal accepted ${response_json['requestStatus']} diff --git a/tests/sdc-dcae-d/dcaed/monitoring_configuration_service_test.robot b/tests/sdc-dcae-d/dcaed/monitoring_configuration_service_test.robot index 1941e357..49e4faa7 100644 --- a/tests/sdc-dcae-d/dcaed/monitoring_configuration_service_test.robot +++ b/tests/sdc-dcae-d/dcaed/monitoring_configuration_service_test.robot @@ -3,7 +3,7 @@ Resource sdc_interface.robot Resource sdc_dcaed_interface.robot *** Test Cases *** -# This test case implements the steps described in +# For now, this test case implements the steps described in # https://wiki.onap.org/display/DW/How+to+Create+a+Service+with+a+Monitoring+Configuration+using+SDC Create Service With Monitoring Configuration Test [Tags] sdc-dcae-d |