summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2021-07-19 16:21:25 -0400
committerJim Hahn <jrh3@att.com>2021-07-20 09:37:05 -0400
commitb59b14d47b590ff94b7c98348c1617990d03c86f (patch)
tree2bccdb90eb3ffa96a8840c1666728ac60b007271 /packages
parent9eba753aed9d5575fa24ab8806e4d614668c75cb (diff)
Use new RestClientParameters class in distribution
Replaced LifecycleApiForwarderParameters with RestClientParameters. Also modified the code to get the HttpClient objects once. This requires changes to property files in CSITs and OOM: - rename "hostName" to "hostname" - rename "isHttps" to "useHttps" and move it inside the api & pap structures Issue-ID: POLICY-3456 Change-Id: I654c32c9b6628263a68d821e11c5a316e8b6e2cc Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'packages')
-rw-r--r--packages/policy-distribution-tarball/src/main/resources/etc/defaultConfig.json9
-rw-r--r--packages/policy-distribution-tarball/src/main/resources/etc/s3pConfig.json7
2 files changed, 9 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..36bec4c0 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,21 @@
"parameterClassName": "org.onap.policy.distribution.forwarding.lifecycle.api.LifecycleApiForwarderParameters",
"parameters": {
"apiParameters": {
- "hostName": "policy-api",
+ "hostname": "policy-api",
"port": 6969,
+ "useHttps": true,
"userName": "healthcheck",
"password": "zb!XztG34"
},
"papParameters": {
- "hostName": "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..b2970e73 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,19 @@
"parameterClassName": "org.onap.policy.distribution.forwarding.lifecycle.api.LifecycleApiForwarderParameters",
"parameters": {
"apiParameters": {
- "hostName": "policy-api",
+ "hostname": "policy-api",
"port": 6969,
+ "useHttps": true,
"userName": "healthcheck",
"password": "zb!XztG34"
},
"papParameters": {
- "hostName": "policy-pap",
+ "hostname": "policy-pap",
"port": 6969,
+ "useHttps": true,
"userName": "healthcheck",
"password": "zb!XztG34"
},
- "isHttps": true,
"deployPolicies": true
}
}