diff options
| author |   sebdet <sebastien.determe@intl.att.com> | 2019-04-26 13:04:08 +0200 |
|---|---|---|
| committer | sebdet <sebastien.determe@intl.att.com> | 2019-04-26 13:04:08 +0200 |
| commit | 5415b26467f198856b3149c11827a93e2ed8a72a (patch) | |
| tree | 71546e21f21b3a0fe1b373bf291d69e0d9caa101 /src/test | |
| parent | 373b07b5c7f7e74cffb3a7250a691cb649856b94 (diff) | |
Change Yaml to Json payload
Change the operational policy payload from Yaml to a JSon, yaml being
embedded as URLEncoded
Issue-ID: CLAMP-359
Change-Id: I8c97bb155e6136ce37c29a65a7d9d85e21fedd61
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java | 4 | ||||
| -rw-r--r-- | src/test/resources/tosca/operational-policy-payload.json | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java b/src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java index 76e29c31f..b12ca89f5 100644 --- a/src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java +++ b/src/test/java/org/onap/clamp/policy/microservice/OperationalPolicyPayloadTest.java @@ -43,8 +43,10 @@ public class OperationalPolicyPayloadTest { JsonObject jsonConfig = new GsonBuilder().create().fromJson( ResourceFileUtil.getResourceAsString("tosca/operational-policy-properties.json"), JsonObject.class); OperationalPolicy policy = new OperationalPolicy("testPolicy", null, jsonConfig); - assertThat(policy.createPolicyPayload()) + assertThat(policy.createPolicyPayloadYaml()) .isEqualTo(ResourceFileUtil.getResourceAsString("tosca/operational-policy-payload.yaml")); + assertThat(policy.createPolicyPayload()) + .isEqualTo(ResourceFileUtil.getResourceAsString("tosca/operational-policy-payload.json")); } @Test diff --git a/src/test/resources/tosca/operational-policy-payload.json b/src/test/resources/tosca/operational-policy-payload.json new file mode 100644 index 000000000..1017d0a2c --- /dev/null +++ b/src/test/resources/tosca/operational-policy-payload.json @@ -0,0 +1,4 @@ +{ + "policy-id": "testPolicy", + "content": "tosca_definitions_version%3A+tosca_simple_yaml_1_0_0%0Atopology_template%3A%0A++policies%3A%0A++-+testPolicy%3A%0A++++++type%3A+onap.policies.controlloop.Operational%0A++++++version%3A+1.0.0%0A++++++metadata%3A+%7Bpolicy-id%3A+testPolicy%7D%0A++++++properties%3A%0A++++++++controlLoop%3A+%7BcontrolLoopName%3A+control+loop%2C+version%3A+2.0.0%2C+trigger_policy%3A+new1%2C%0A++++++++++timeout%3A+%2730%27%2C+abatement%3A+%27true%27%7D%0A++++++++policies%3A%0A++++++++-+id%3A+new1%0A++++++++++recipe%3A+Rebuild%0A++++++++++retry%3A+%2710%27%0A++++++++++timeout%3A+%2720%27%0A++++++++++actor%3A+SO%0A++++++++++payload%3A+test%0A++++++++++success%3A+new2%0A++++++++++failure%3A+new2%0A++++++++++failure_timeout%3A+new2%0A++++++++++failure_retries%3A+new2%0A++++++++++failure_exception%3A+new2%0A++++++++++failure_guard%3A+new2%0A++++++++++target%3A+%7Btype%3A+VFC%2C+resourceTargetId%3A+test%7D%0A++++++++-+id%3A+new2%0A++++++++++recipe%3A+Migrate%0A++++++++++retry%3A+%2730%27%0A++++++++++timeout%3A+%2740%27%0A++++++++++actor%3A+SDNC%0A++++++++++payload%3A+test%0A++++++++++target%3A+%7Btype%3A+VFC%2C+resourceTargetId%3A+test%7D%0A" +}
\ No newline at end of file |