diff options
| author |   Jim Hahn <jrh3@att.com> | 2021-07-19 16:21:25 -0400 |
|---|---|---|
| committer | Jim Hahn <jrh3@att.com> | 2021-07-30 09:59:53 -0400 |
| commit | 1b21a87140899dd453d2f8766dd1aa98aec6ce14 (patch) | |
| tree | 995df7175f51668f2f2173c2f5901dd93bb7fad3 /packages | |
| parent | 9eba753aed9d5575fa24ab8806e4d614668c75cb (diff) | |
Use new RestClientParameters class in distribution
This is a re-do of a previously reverted review. It's mostly the same
as before, but there are some minor differences.
Replaced LifecycleApiForwarderParameters with RestClientParameters.
Also modified the code to get the HttpClient objects once.
Also removed some unused json test files.
This requires changes to property files in CSITs and OOM:
- add "clientName" to the api & pap structures
- rename "hostName" to "hostname"
- rename "isHttps" to "useHttps" and move it inside the api & pap
structures
Issue-ID: POLICY-3456
Change-Id: I32b04bc3b6880ec7798814dad268143bc3b06faf
Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/policy-distribution-tarball/src/main/resources/etc/defaultConfig.json | 11 | ||||
| -rw-r--r-- | packages/policy-distribution-tarball/src/main/resources/etc/s3pConfig.json | 9 |
2 files changed, 13 insertions, 7 deletions
diff --git a/packages/policy-distribution-tarball/src/main/resources/etc/defaultConfig.json b/packages/policy-distribution-tarball/src/main/resources/etc/defaultConfig.json index f5fe30d5..02fecfb1 100644 --- a/packages/policy-distribution-tarball/src/main/resources/etc/defaultConfig.json +++ b/packages/policy-distribution-tarball/src/main/resources/etc/defaultConfig.json @@ -71,20 +71,23 @@ "parameterClassName": "org.onap.policy.distribution.forwarding.lifecycle.api.LifecycleApiForwarderParameters", "parameters": { "apiParameters": { - "hostName": "policy-api", + "clientName": "policy-api", + "hostname": "policy-api", "port": 6969, + "useHttps": true, "userName": "healthcheck", "password": "zb!XztG34" }, "papParameters": { - "hostName": "policy-pap", + "clientName": "policy-pap", + "hostname": "policy-pap", "port": 6969, + "useHttps": true, "userName": "healthcheck", "password": "zb!XztG34" }, - "isHttps": true, "deployPolicies": true } } } -}
\ No newline at end of file +} diff --git a/packages/policy-distribution-tarball/src/main/resources/etc/s3pConfig.json b/packages/policy-distribution-tarball/src/main/resources/etc/s3pConfig.json index 4589fddc..430b81a1 100644 --- a/packages/policy-distribution-tarball/src/main/resources/etc/s3pConfig.json +++ b/packages/policy-distribution-tarball/src/main/resources/etc/s3pConfig.json @@ -51,18 +51,21 @@ "parameterClassName": "org.onap.policy.distribution.forwarding.lifecycle.api.LifecycleApiForwarderParameters", "parameters": { "apiParameters": { - "hostName": "policy-api", + "clientName": "policy-api", + "hostname": "policy-api", "port": 6969, + "useHttps": true, "userName": "healthcheck", "password": "zb!XztG34" }, "papParameters": { - "hostName": "policy-pap", + "clientName": "policy-pap", + "hostname": "policy-pap", "port": 6969, + "useHttps": true, "userName": "healthcheck", "password": "zb!XztG34" }, - "isHttps": true, "deployPolicies": true } } |