aboutsummaryrefslogtreecommitdiffstats
path: root/src/test/java
diff options
context:
space:
mode:
authorDeterme, Sebastien (sd378r) <sd378r@intl.att.com>2018-04-24 16:15:10 +0200
committerDeterme, Sebastien (sd378r) <sd378r@intl.att.com>2018-04-24 16:15:10 +0200
commit132711f4a6792b4738908a21477c8241bbf3cbbd (patch)
treea2ce3323b407805256023378d98b186121c43e4f /src/test/java
parentb7091047a9d3607cea0141570c52da9487762303 (diff)
Remove enodeB code
Remove useless code for operational policy Issue-ID: CLAMP-153 Change-Id: Ib63b98f19656116935f0f8b325fc0f8b739f6c59 Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
Diffstat (limited to 'src/test/java')
-rw-r--r--src/test/java/org/onap/clamp/clds/it/OperationPolicyReqItCase.java18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/test/java/org/onap/clamp/clds/it/OperationPolicyReqItCase.java b/src/test/java/org/onap/clamp/clds/it/OperationPolicyReqItCase.java
index 43f212cf3..a91da8a07 100644
--- a/src/test/java/org/onap/clamp/clds/it/OperationPolicyReqItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/OperationPolicyReqItCase.java
@@ -74,20 +74,24 @@ public class OperationPolicyReqItCase {
// now validate the Yaml, to do so we replace the dynamic ID by a known
// key so that we can compare it
String yaml = URLDecoder.decode(attributes.get(0).get(AttributeType.RULE).get("ControlLoopYaml"), "UTF-8");
- yaml = yaml.replaceAll("trigger_policy: (.*)", "trigger_policy: <generatedId>");
- yaml = yaml.replaceAll("id: (.*)", "id: <generatedId>");
- yaml = yaml.replaceAll("success: (.*)", "success: <generatedId>");
- // Remove this field as not always present (depends of policy api)
- yaml = yaml.replaceAll(" pnf: null" + System.lineSeparator(), "");
- yaml = yaml.substring(yaml.indexOf("controlLoop:"), yaml.length());
+ yaml = replaceGeneratedValues(yaml);
assertEquals(ResourceFileUtil.getResourceAsString("example/operational-policy/yaml-policy-chain-1.yaml"), yaml);
yaml = URLDecoder.decode(attributes.get(1).get(AttributeType.RULE).get("ControlLoopYaml"), "UTF-8");
+ yaml = replaceGeneratedValues(yaml);
+ assertEquals(ResourceFileUtil.getResourceAsString("example/operational-policy/yaml-policy-chain-2.yaml"), yaml);
+ }
+
+ private String replaceGeneratedValues(String yaml) {
yaml = yaml.replaceAll("trigger_policy: (.*)", "trigger_policy: <generatedId>");
yaml = yaml.replaceAll("id: (.*)", "id: <generatedId>");
yaml = yaml.replaceAll("success: (.*)", "success: <generatedId>");
// Remove this field as not always present (depends of policy api)
yaml = yaml.replaceAll(" pnf: null" + System.lineSeparator(), "");
+ yaml = yaml.replaceAll("failure: (.*)", "failure: <generatedId>");
+ yaml = yaml.replaceAll("failure_exception: (.*)", "failure_exception: <generatedId>");
+ yaml = yaml.replaceAll("failure_retries: (.*)", "failure_retries: <generatedId>");
+ yaml = yaml.replaceAll("failure_timeout: (.*)", "failure_timeout: <generatedId>");
yaml = yaml.substring(yaml.indexOf("controlLoop:"), yaml.length());
- assertEquals(ResourceFileUtil.getResourceAsString("example/operational-policy/yaml-policy-chain-2.yaml"), yaml);
+ return yaml;
}
}