diff options
| author |   Jim Hahn <jrh3@att.com> | 2019-11-06 12:19:33 -0500 |
|---|---|---|
| committer | Jim Hahn <jrh3@att.com> | 2019-11-06 15:52:56 -0500 |
| commit | a3bf3134c01d979cebc94f5b2c915cfa400a9a72 (patch) | |
| tree | fdb7488ae7e79ab6b130927a81463cf379346084 /main/src/test/resources | |
| parent | 43f8999d3f94e23231bc3cbb45089d8541c4f2cf (diff) | |
Support policy types with wild-cards
Allow supported policy types to end with ".*", which causes the prefix
to be matched when new policies are deployed. This entailed updates
in three areas:
- when a subgroup is added via the group api
- when a subgroup is updated via the group api
- when a policy is deployed via the simple api
Issue-ID: POLICY-1636
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I4ae15971481ce5b2042b5d6fdfd16e11ad099c50
Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'main/src/test/resources')
4 files changed, 101 insertions, 0 deletions
diff --git a/main/src/test/resources/simpleDeploy/createGroupsWildCard.json b/main/src/test/resources/simpleDeploy/createGroupsWildCard.json new file mode 100644 index 00000000..a1d26d14 --- /dev/null +++ b/main/src/test/resources/simpleDeploy/createGroupsWildCard.json @@ -0,0 +1,56 @@ +{ + "groups": [ + { + "name": "groupA", + "version": "200.2.3", + "description": "my description", + "pdpGroupState": "ACTIVE", + "properties": { + "hello": "world" + }, + "pdpSubgroups": [ + { + "pdpType": "pdpTypeA", + "desiredInstanceCount": 1, + "properties": { + "abc": "def" + }, + "supportedPolicyTypes": [ + { + "name": "some.*", + "version": "2.3.4" + } + ], + "pdpInstances": [ + { + "instanceId": "pdpA" + } + ], + "policies": [ + { + "name": "policy.some", + "version": "1.2.3" + } + ] + }, + { + "pdpType": "pdpTypeB", + "desiredInstanceCount": 1, + "currentInstanceCount": 22, + "supportedPolicyTypes": [ + { + "name": "typeA", + "version": "100.2.3" + } + ], + "pdpInstances": [ + { + "instanceId": "pdpB" + } + ], + "policies": [] + } + ] + } + ] +} diff --git a/main/src/test/resources/simpleDeploy/daoPolicyListWildCard.json b/main/src/test/resources/simpleDeploy/daoPolicyListWildCard.json new file mode 100644 index 00000000..ab2f2b89 --- /dev/null +++ b/main/src/test/resources/simpleDeploy/daoPolicyListWildCard.json @@ -0,0 +1,10 @@ +{ + "policies": [ + { + "name": "policy.some", + "version": "1.2.3", + "type": "some.type", + "type_version": "100.2.3" + } + ] +} diff --git a/main/src/test/resources/simpleDeploy/daoPolicyListWildCardUnmatched.json b/main/src/test/resources/simpleDeploy/daoPolicyListWildCardUnmatched.json new file mode 100644 index 00000000..25fd0645 --- /dev/null +++ b/main/src/test/resources/simpleDeploy/daoPolicyListWildCardUnmatched.json @@ -0,0 +1,10 @@ +{ + "policies": [ + { + "name": "policy.some", + "version": "1.2.3", + "type": "another.type", + "type_version": "100.2.3" + } + ] +} diff --git a/main/src/test/resources/simpleDeploy/deployPoliciesWildCard.json b/main/src/test/resources/simpleDeploy/deployPoliciesWildCard.json new file mode 100644 index 00000000..9e43af02 --- /dev/null +++ b/main/src/test/resources/simpleDeploy/deployPoliciesWildCard.json @@ -0,0 +1,25 @@ +{ + "groups": [ + { + "name": "groupA", + "version": "200.2.3", + "pdpSubgroups": [ + { + "pdpType": "pdpTypeB", + "supportedPolicyTypes": [ + { + "name": "some.*", + "version": "2.3.4" + } + ], + "pdpInstances": [ + { + "instanceId": "pdpB" + } + ], + "policies": [] + } + ] + } + ] +} |