diff options
author | Pamela Dragosh <pdragosh@research.att.com> | 2019-12-10 14:28:33 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-12-10 14:28:33 +0000 |
commit | d97629ff8ec522d30d1f552201496182c72559ab (patch) | |
tree | 5c8b14c99aca96471ce88a530615620836836044 /main/src/test/resources | |
parent | e040acb6d41207ba3df631bffb5ffe3312283aec (diff) | |
parent | 73aaafa0ab601533d5cdbd839055cb7b5f9bb6ec (diff) |
Merge "Only update policies in PAP REST API"
Diffstat (limited to 'main/src/test/resources')
-rw-r--r-- | main/src/test/resources/e2e/deployGroups.json | 56 | ||||
-rw-r--r-- | main/src/test/resources/e2e/deployGroups2.json | 69 | ||||
-rw-r--r-- | main/src/test/resources/e2e/deployGroupsReq.json | 24 | ||||
-rw-r--r-- | main/src/test/resources/e2e/deployGroupsReq2.json | 28 | ||||
-rw-r--r-- | main/src/test/resources/e2e/deployPolicies.json | 2 | ||||
-rw-r--r-- | main/src/test/resources/simpleDeploy/createGroupNewPolicy2.json | 10 | ||||
-rw-r--r-- | main/src/test/resources/simpleDeploy/daoPolicyList2.json | 22 | ||||
-rw-r--r-- | main/src/test/resources/simpleDeploy/deployGroups.json | 39 |
8 files changed, 249 insertions, 1 deletions
diff --git a/main/src/test/resources/e2e/deployGroups.json b/main/src/test/resources/e2e/deployGroups.json new file mode 100644 index 00000000..1b9c33c3 --- /dev/null +++ b/main/src/test/resources/e2e/deployGroups.json @@ -0,0 +1,56 @@ +{ + "groups": [ + { + "name": "deployGroups", + "pdpGroupState": "PASSIVE", + "properties": { + "hello": "world" + }, + "pdpSubgroups": [ + { + "pdpType": "pdpTypeA", + "desiredInstanceCount": 2, + "properties": {}, + "pdpInstances": [ + { + "instanceId": "pdpAA_1", + "pdpState": "ACTIVE", + "healthy": "HEALTHY" + }, + { + "instanceId": "pdpAA_2", + "pdpState": "ACTIVE", + "healthy": "HEALTHY" + } + ], + "supportedPolicyTypes": [ + { + "name": "onap.policies.monitoring.cdap.tca.hi.lo.app", + "version": "1.0.0" + } + ], + "policies": [] + }, + { + "pdpType": "pdpTypeB", + "desiredInstanceCount": 1, + "properties": {}, + "pdpInstances": [ + { + "instanceId": "pdpAB_1", + "pdpState": "ACTIVE", + "healthy": "HEALTHY" + } + ], + "supportedPolicyTypes": [ + { + "name": "onap.policies.monitoring.cdap.tca.hi.lo.app", + "version": "1.0.0" + } + ], + "policies": [] + } + ] + } + ] +} diff --git a/main/src/test/resources/e2e/deployGroups2.json b/main/src/test/resources/e2e/deployGroups2.json new file mode 100644 index 00000000..6d784bfa --- /dev/null +++ b/main/src/test/resources/e2e/deployGroups2.json @@ -0,0 +1,69 @@ +{ + "groups": [ + { + "name": "deployGroups", + "pdpGroupState": "PASSIVE", + "properties": { + "hello": "world" + }, + "pdpSubgroups": [ + { + "pdpType": "pdpTypeA", + "desiredInstanceCount": 2, + "properties": {}, + "pdpInstances": [ + { + "instanceId": "pdpAA_1", + "pdpState": "ACTIVE", + "healthy": "HEALTHY" + }, + { + "instanceId": "pdpAA_2", + "pdpState": "ACTIVE", + "healthy": "HEALTHY" + } + ], + "supportedPolicyTypes": [ + { + "name": "onap.policies.monitoring.cdap.tca.hi.lo.app", + "version": "1.0.0" + } + ], + "policies": [ + { + "name": "onap.restart.tca", + "version": "1.0.0" + }, + { + "name": "onap.restart.tcaB", + "version": "1.0.0" + }, + { + "name": "onap.restart.tcaC", + "version": "1.0.0" + } + ] + }, + { + "pdpType": "pdpTypeB", + "desiredInstanceCount": 1, + "properties": {}, + "pdpInstances": [ + { + "instanceId": "pdpAB_1", + "pdpState": "ACTIVE", + "healthy": "HEALTHY" + } + ], + "supportedPolicyTypes": [ + { + "name": "onap.policies.monitoring.cdap.tca.hi.lo.app", + "version": "1.0.0" + } + ], + "policies": [] + } + ] + } + ] +} diff --git a/main/src/test/resources/e2e/deployGroupsReq.json b/main/src/test/resources/e2e/deployGroupsReq.json new file mode 100644 index 00000000..2e397d1d --- /dev/null +++ b/main/src/test/resources/e2e/deployGroupsReq.json @@ -0,0 +1,24 @@ +{ + "groups": [ + { + "name": "deployGroups", + "deploymentSubgroups": [ + { + "pdpType": "pdpTypeA", + "action": "PATCH", + "policies": [ + { + "name": "onap.restart.tca", + "version": "1.0.0" + } + ] + }, + { + "pdpType": "pdpTypeB", + "action": "PATCH", + "policies": [] + } + ] + } + ] +} diff --git a/main/src/test/resources/e2e/deployGroupsReq2.json b/main/src/test/resources/e2e/deployGroupsReq2.json new file mode 100644 index 00000000..0993ddfa --- /dev/null +++ b/main/src/test/resources/e2e/deployGroupsReq2.json @@ -0,0 +1,28 @@ +{ + "groups": [ + { + "name": "deployGroups", + "deploymentSubgroups": [ + { + "pdpType": "pdpTypeA", + "action": "PATCH", + "policies": [ + { + "name": "onap.restart.tcaB", + "version": "1.0.0" + }, + { + "name": "onap.restart.tcaC", + "version": "1.0.0" + } + ] + }, + { + "pdpType": "pdpTypeB", + "action": "PATCH", + "policies": [] + } + ] + } + ] +} diff --git a/main/src/test/resources/e2e/deployPolicies.json b/main/src/test/resources/e2e/deployPolicies.json index 4cafe77b..90363ee7 100644 --- a/main/src/test/resources/e2e/deployPolicies.json +++ b/main/src/test/resources/e2e/deployPolicies.json @@ -1,7 +1,7 @@ { "groups": [ { - "name": "deployPolicies", + "name": "deployGroups", "pdpGroupState": "ACTIVE", "pdpSubgroups": [ { diff --git a/main/src/test/resources/simpleDeploy/createGroupNewPolicy2.json b/main/src/test/resources/simpleDeploy/createGroupNewPolicy2.json new file mode 100644 index 00000000..84ea2286 --- /dev/null +++ b/main/src/test/resources/simpleDeploy/createGroupNewPolicy2.json @@ -0,0 +1,10 @@ +{ + "policies": [ + { + "name": "policyC", + "version": "1.2.3", + "type": "typeA", + "type_version": "100.2.3" + } + ] +} diff --git a/main/src/test/resources/simpleDeploy/daoPolicyList2.json b/main/src/test/resources/simpleDeploy/daoPolicyList2.json new file mode 100644 index 00000000..d4d1446b --- /dev/null +++ b/main/src/test/resources/simpleDeploy/daoPolicyList2.json @@ -0,0 +1,22 @@ +{ + "policies": [ + { + "name": "policyA", + "version": "1.2.3", + "type": "typeA", + "type_version": "100.2.3" + }, + { + "name": "policyB", + "version": "1.2.3", + "type": "typeA", + "type_version": "100.2.3" + }, + { + "name": "policyC", + "version": "1.2.3", + "type": "typeA", + "type_version": "100.2.3" + } + ] +} diff --git a/main/src/test/resources/simpleDeploy/deployGroups.json b/main/src/test/resources/simpleDeploy/deployGroups.json new file mode 100644 index 00000000..59c4eb87 --- /dev/null +++ b/main/src/test/resources/simpleDeploy/deployGroups.json @@ -0,0 +1,39 @@ +{ + "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": "typeA", + "version": "100.2.3" + } + ], + "pdpInstances": [ + { + "instanceId": "pdpA" + } + ], + "policies": [ + { + "name": "policyA", + "version": "1.2.3" + } + ] + } + ] + } + ] +} |