summaryrefslogtreecommitdiffstats
path: root/src/test
diff options
context:
space:
mode:
authorxg353y <xg353y@intl.att.com>2017-10-05 18:04:24 +0200
committerxg353y <xg353y@intl.att.com>2017-10-06 11:14:26 +0200
commite00f654909c75400cb881ed648a75d09767502cc (patch)
tree183fc49a4e6c2d9a9b09dd2f44d8f676cd1ffdac /src/test
parentf696add81ddfb39e6c6cdf77871fdcc19cb2b419 (diff)
Update Holmes related feature
No blueprint need to be send to SDC; Add configuration policy name in holmes UI; Update the config body sent to Policy. Change-Id: I4bf5b0c32d64f4acf28ac6f24128e463e28e5779 Signed-off-by: xg353y <xg353y@intl.att.com> Issue-ID: CLAMP-27
Diffstat (limited to 'src/test')
-rw-r--r--src/test/java/org/onap/clamp/clds/it/HolmesPolicyDelegateItCase.java63
-rw-r--r--src/test/java/org/onap/clamp/clds/model/prop/ModelPropertiesTest.java2
-rw-r--r--src/test/resources/example/model-properties/holmes/modelBpmnProperties.json4
-rw-r--r--src/test/resources/example/model-properties/modelBpmnProp.json2
4 files changed, 67 insertions, 4 deletions
diff --git a/src/test/java/org/onap/clamp/clds/it/HolmesPolicyDelegateItCase.java b/src/test/java/org/onap/clamp/clds/it/HolmesPolicyDelegateItCase.java
new file mode 100644
index 000000000..b45c29719
--- /dev/null
+++ b/src/test/java/org/onap/clamp/clds/it/HolmesPolicyDelegateItCase.java
@@ -0,0 +1,63 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+package org.onap.clamp.clds.it;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.IOException;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.onap.clamp.clds.AbstractItCase;
+import org.onap.clamp.clds.client.HolmesPolicyDelegate;
+import org.onap.clamp.clds.model.prop.Holmes;
+import org.onap.clamp.clds.model.prop.ModelProperties;
+import org.onap.clamp.clds.util.ResourceFileUtil;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+/**
+ * Test Onap HolmesPolicyDelegate features.
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@TestPropertySource(locations = "classpath:application-no-camunda.properties")
+public class HolmesPolicyDelegateItCase extends AbstractItCase {
+
+ @Test
+ public void testCreatePolicyJson() throws IOException {
+ String modelBpmnProp = ResourceFileUtil
+ .getResourceAsString("example/model-properties/holmes/modelBpmnProperties.json");
+ String modelBpmn = ResourceFileUtil.getResourceAsString("example/model-properties/holmes/modelBpmn.json");
+
+ ModelProperties prop = new ModelProperties("example-model-name", "ClosedLoop_FRWL_SIG_fad4dcae_e498_11e6_852e_0050568c4ccf", null, true, modelBpmn,
+ modelBpmnProp);
+
+ Holmes holmes = prop.getType(Holmes.class);
+ String result = HolmesPolicyDelegate.formatHolmesConfigBody(prop, holmes);
+ assertTrue("ClosedLoop_FRWL_SIG_fad4dcae_e498_11e6_852e_0050568c4ccf$$$blabla".equals(result));
+ }
+}
diff --git a/src/test/java/org/onap/clamp/clds/model/prop/ModelPropertiesTest.java b/src/test/java/org/onap/clamp/clds/model/prop/ModelPropertiesTest.java
index 45f39a422..9daa97c6e 100644
--- a/src/test/java/org/onap/clamp/clds/model/prop/ModelPropertiesTest.java
+++ b/src/test/java/org/onap/clamp/clds/model/prop/ModelPropertiesTest.java
@@ -113,7 +113,7 @@ public class ModelPropertiesTest {
Holmes holmes = prop.getType(Holmes.class);
assertNotNull(holmes);
assertTrue(holmes.isFound());
- assertEquals("policy1", holmes.getOperationalPolicy());
+ assertEquals("configPolicy1", holmes.getConfigPolicyName());
assertEquals("blabla", holmes.getCorrelationLogic());
}
diff --git a/src/test/resources/example/model-properties/holmes/modelBpmnProperties.json b/src/test/resources/example/model-properties/holmes/modelBpmnProperties.json
index 14b3a8c28..cd76a1289 100644
--- a/src/test/resources/example/model-properties/holmes/modelBpmnProperties.json
+++ b/src/test/resources/example/model-properties/holmes/modelBpmnProperties.json
@@ -5,8 +5,8 @@
"value": "blabla"
},
{
- "name": "operationalPolicy",
- "value": "policy1"
+ "name": "configPolicyName",
+ "value": "configPolicy1"
}
],
"Policy_0honxgv": {
diff --git a/src/test/resources/example/model-properties/modelBpmnProp.json b/src/test/resources/example/model-properties/modelBpmnProp.json
index a521ba7d7..eacb12448 100644
--- a/src/test/resources/example/model-properties/modelBpmnProp.json
+++ b/src/test/resources/example/model-properties/modelBpmnProp.json
@@ -101,7 +101,7 @@
"value": "blabla"
},
{
- "name": "operationalPolicy",
+ "name": "configPolicyName",
"value": "policy1"
}
]