diff options
| author |   Jim Hahn <jrh3@att.com> | 2019-07-19 15:19:22 -0400 |
|---|---|---|
| committer | Jim Hahn <jrh3@att.com> | 2019-07-19 15:35:18 -0400 |
| commit | 538a204455ca708eaf20785972be3ac1c2a7ed3f (patch) | |
| tree | 28c3f1f4e740aabe325160c45865e1573970a265 /main/src/test/resources | |
| parent | b6037cbe4a1fde65cb91f37b86f9c789d5a3079e (diff) | |
Modify policy/distribution to use RestServer from common
This also entailed removing the local copy of RestServerParameters.
Also added an AafFilter, which was missing from the original code.
Change-Id: Ibbdce8c395e0149ab540a3704b3554a9d96b9705
Issue-ID: POLICY-1652
Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'main/src/test/resources')
3 files changed, 13 insertions, 5 deletions
diff --git a/main/src/test/resources/expectedValidationResults/InvalidRestServerParameters.txt b/main/src/test/resources/expectedValidationResults/InvalidRestServerParameters.txt index ceb195ae..f3152e41 100644 --- a/main/src/test/resources/expectedValidationResults/InvalidRestServerParameters.txt +++ b/main/src/test/resources/expectedValidationResults/InvalidRestServerParameters.txt @@ -1,7 +1,7 @@ validation error(s) on parameters from "parameters/DistributionConfigParameters_InvalidRestServerParameters.json" parameter group "SDCDistributionGroup" type "org.onap.policy.distribution.main.parameters.DistributionParameterGroup" INVALID, parameter group has status INVALID - parameter group "null" type "org.onap.policy.distribution.main.parameters.RestServerParameters" INVALID, parameter group has status INVALID - field "host" type "java.lang.String" value "" INVALID, must be a non-blank string containing hostname/ipaddress of the distribution rest server - field "port" type "int" value "-1" INVALID, must be a positive integer containing port of the distribution rest server - field "userName" type "java.lang.String" value "" INVALID, must be a non-blank string containing userName for distribution rest server credentials - field "password" type "java.lang.String" value "" INVALID, must be a non-blank string containing password for distribution rest server credentials + parameter group "RestServerParameters" type "org.onap.policy.common.endpoints.parameters.RestServerParameters" INVALID, parameter group has status INVALID + field "host" type "java.lang.String" value "" INVALID, must be a non-blank string + field "port" type "int" value "-1" INVALID, must be >= 1 + field "userName" type "java.lang.String" value "" INVALID, must be a non-blank string + field "password" type "java.lang.String" value "" INVALID, must be a non-blank string
\ No newline at end of file diff --git a/main/src/test/resources/parameters/RestServerParameters.json b/main/src/test/resources/parameters/RestServerParameters.json new file mode 100644 index 00000000..86aee276 --- /dev/null +++ b/main/src/test/resources/parameters/RestServerParameters.json @@ -0,0 +1,6 @@ +{ + "host": "0.0.0.0", + "port": 6969, + "userName": "healthcheck", + "password": "zb!XztG34" +} diff --git a/main/src/test/resources/parameters/RestServerParametersEmpty.json b/main/src/test/resources/parameters/RestServerParametersEmpty.json new file mode 100644 index 00000000..e02aef27 --- /dev/null +++ b/main/src/test/resources/parameters/RestServerParametersEmpty.json @@ -0,0 +1,2 @@ +{
+}
\ No newline at end of file |