diff options
| author |   HOCKLA <ah999m@att.com> | 2019-11-15 08:52:39 -0600 |
|---|---|---|
| committer | HOCKLA <ah999m@att.com> | 2019-11-15 11:27:47 -0600 |
| commit | e53be640b3a4c37dbd841c81b5c467082986c05b (patch) | |
| tree | f6e90fac68b0d4dd0b845d36cf774c0054494b25 /main/src/test/resources/parameters | |
| parent | 9a093f08a6b3357bdd750c12703ca8f1cd77fc74 (diff) | |
Changed Xacml-pdp to report pdp group defined in XacmlPdpParameters config file
Ignore the pdp group specified in the PdpUpdate message.
Updated junits and test resources.
Issue-ID: POLICY-2229
Change-Id: I0c7a33c45424cef6440b0837e1dd22a7487c5d44
Signed-off-by: HOCKLA <ah999m@att.com>
Diffstat (limited to 'main/src/test/resources/parameters')
6 files changed, 39 insertions, 4 deletions
diff --git a/main/src/test/resources/parameters/MinimumParameters.json b/main/src/test/resources/parameters/MinimumParameters.json index 42e54581..e547e7ee 100644 --- a/main/src/test/resources/parameters/MinimumParameters.json +++ b/main/src/test/resources/parameters/MinimumParameters.json @@ -1,5 +1,6 @@ { - "name": "XacmlPdpGroup", + "name":"XacmlPdpParameters", + "pdpGroup": "XacmlPdpGroup", "restServerParameters": { "host": "0.0.0.0", "port": 6969, diff --git a/main/src/test/resources/parameters/XacmlPdpConfigParameters.json b/main/src/test/resources/parameters/XacmlPdpConfigParameters.json index 186a7b26..5d0a103c 100644 --- a/main/src/test/resources/parameters/XacmlPdpConfigParameters.json +++ b/main/src/test/resources/parameters/XacmlPdpConfigParameters.json @@ -1,5 +1,6 @@ { - "name": "XacmlPdpGroup", + "name": "XacmlPdpParameters", + "pdpGroup": "XacmlPdpGroup", "restServerParameters": { "host": "0.0.0.0", "port": 6969, diff --git a/main/src/test/resources/parameters/XacmlPdpConfigParameters_InvalidName.json b/main/src/test/resources/parameters/XacmlPdpConfigParameters_InvalidName.json index 27e7ef46..dcc5cd93 100644 --- a/main/src/test/resources/parameters/XacmlPdpConfigParameters_InvalidName.json +++ b/main/src/test/resources/parameters/XacmlPdpConfigParameters_InvalidName.json @@ -1,5 +1,6 @@ { "name": " ", + "pdpGroup": "XacmlPdpGroup", "restServerParameters":{ "host":"0.0.0.0", "port": 6969, diff --git a/main/src/test/resources/parameters/XacmlPdpConfigParameters_InvalidPdpGroup.json b/main/src/test/resources/parameters/XacmlPdpConfigParameters_InvalidPdpGroup.json new file mode 100644 index 00000000..18e486d5 --- /dev/null +++ b/main/src/test/resources/parameters/XacmlPdpConfigParameters_InvalidPdpGroup.json @@ -0,0 +1,30 @@ +{ + "name": "XacmlPdpParameters", + "pdpGroup": " ", + "restServerParameters":{ + "host":"0.0.0.0", + "port": 6969, + "userName":"healthcheck", + "password":"zb!XztG34", + "https":true + }, + "policyApiParameters": { + "host": "0.0.0.0", + "port": 6970, + "userName": "healthcheck", + "password": "zb!XztG34" + }, + "applicationPath": "src/test/resources/apps", + "topicParameterGroup": { + "topicSources" : [{ + "topic" : "POLICY-PDP-PAP", + "servers" : [ "anyserver" ], + "topicCommInfrastructure" : "noop" + }], + "topicSinks" : [{ + "topic" : "POLICY-PDP-PAP", + "servers" : [ "anyserver" ], + "topicCommInfrastructure" : "noop" + }] + } +}
\ No newline at end of file diff --git a/main/src/test/resources/parameters/XacmlPdpConfigParameters_InvalidRestServerParameters.json b/main/src/test/resources/parameters/XacmlPdpConfigParameters_InvalidRestServerParameters.json index d320b11d..4aad68b2 100644 --- a/main/src/test/resources/parameters/XacmlPdpConfigParameters_InvalidRestServerParameters.json +++ b/main/src/test/resources/parameters/XacmlPdpConfigParameters_InvalidRestServerParameters.json @@ -1,5 +1,6 @@ { - "name": "XacmlPdpGroup", + "name":"XacmlPdpParameters", + "pdpGroup": "XacmlPdpGroup", "restServerParameters": { "host": "", "port": -1, diff --git a/main/src/test/resources/parameters/XacmlPdpConfigParameters_Std.json b/main/src/test/resources/parameters/XacmlPdpConfigParameters_Std.json index 1c17414b..3f9e6cb1 100644 --- a/main/src/test/resources/parameters/XacmlPdpConfigParameters_Std.json +++ b/main/src/test/resources/parameters/XacmlPdpConfigParameters_Std.json @@ -1,5 +1,6 @@ { - "name":"XacmlPdpGroup", + "name":"XacmlPdpParameters", + "pdpGroup": "XacmlPdpGroup", "restServerParameters":{ "host":"0.0.0.0", "port":${port}, |