diff options
| -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-- | tests/optf-osdf/osdf/optf_osdf_test.robot | 16 |
5 files changed, 32 insertions, 19 deletions
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/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']} |