diff options
| author |   Guangrong Fu <fu.guangrong@zte.com.cn> | 2017-10-09 09:22:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-10-09 09:22:16 +0000 |
| commit | b4e2bd572489d6fce49571b4c3e681d267ffcc57 (patch) | |
| tree | 10140a9de90e3737b39702d92e0ff5e5d17b6e4f /holmes-actions/src/test | |
| parent | bdcee6f0a360c315ce4f2b8b5a14b8cd82be6bcd (diff) | |
| parent | bfb24b1cc32e287b019fbcef89ac403a660354bb (diff) | |
Merge "modify control loop name"
Diffstat (limited to 'holmes-actions/src/test')
3 files changed, 3 insertions, 4 deletions
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/dcae/utils/DcaeConfigurationParserTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/dcae/utils/DcaeConfigurationParserTest.java index e20ed5e..827220c 100644 --- a/holmes-actions/src/test/java/org/onap/holmes/common/dcae/utils/DcaeConfigurationParserTest.java +++ b/holmes-actions/src/test/java/org/onap/holmes/common/dcae/utils/DcaeConfigurationParserTest.java @@ -52,7 +52,6 @@ public class DcaeConfigurationParserTest { br.lines().forEach(line -> {
sb.append(line);
});
-
try {
br.close();
} catch (IOException e) {
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/dmaap/DmaapServiceTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/dmaap/DmaapServiceTest.java index 7198ec8..72a0bc8 100644 --- a/holmes-actions/src/test/java/org/onap/holmes/common/dmaap/DmaapServiceTest.java +++ b/holmes-actions/src/test/java/org/onap/holmes/common/dmaap/DmaapServiceTest.java @@ -207,10 +207,10 @@ public class DmaapServiceTest { PowerMock.replayAll(); PolicyMsg actual = Whitebox - .invokeMethod(dmaapService, "getEnrichedPolicyMsg", vmEntity, vesAlarm); + .invokeMethod(dmaapService, "getEnrichedPolicyMsg", vmEntity, vesAlarm, "loopName"); PowerMock.verifyAll(); - assertThat(actual.getPolicyName(), equalTo("vLoadBalancer")); + assertThat(actual.getClosedLoopControlName(), equalTo(null)); assertThat(actual.getAai().get("vserver.prov-status"), equalTo("prov")); assertThat(actual.getAai().get("vserver.vserver-name2") == null, equalTo(true)); assertThat(actual.getAai().get("generic-vnf.service-instance-id"), equalTo("")); diff --git a/holmes-actions/src/test/resources/dcae.config.json b/holmes-actions/src/test/resources/dcae.config.json index 6fe72e8..f5aa3ae 100644 --- a/holmes-actions/src/test/resources/dcae.config.json +++ b/holmes-actions/src/test/resources/dcae.config.json @@ -1,5 +1,5 @@ {
- "holmes.default.rule.volte.scenario1": "package dcae.ves.test\nimport org.onap.some.related.packages;\nrule\"SameVNF_Relation_Rule\"\nsalience 120\nno-loop true\nwhen\n$root : VesAlarm(\n$sourceId: sourceId, sourceId != null && !sourceId.equals(\"\"),\nspecificProblem in ( \"LSS_cpiPCSCFFailReg(121297)\", \"LSS_cpiSIPRetransmitInvite(120267)\" ),\n$eventId: eventId)\n$child : VesAlarm( eventId != $eventId,\nCorrelationUtil.getInstance().isTopologicallyRelated(sourceId, $sourceId),\nspecificProblem in (\"LSS_externalLinkDown(4271)\",\"LSS_failedAttachReqsRateExceeded(4272)\"),\nthis after [-60s, 60s] $root)\nthen\nDmaapService.publishResult(...);\nend",
+ "holmes.default.rule.volte.scenario1": "loopname$$$package dcae.ves.test\nimport org.onap.some.related.packages;\nrule\"SameVNF_Relation_Rule\"\nsalience 120\nno-loop true\nwhen\n$root : VesAlarm(\n$sourceId: sourceId, sourceId != null && !sourceId.equals(\"\"),\nspecificProblem in ( \"LSS_cpiPCSCFFailReg(121297)\", \"LSS_cpiSIPRetransmitInvite(120267)\" ),\n$eventId: eventId)\n$child : VesAlarm( eventId != $eventId,\nCorrelationUtil.getInstance().isTopologicallyRelated(sourceId, $sourceId),\nspecificProblem in (\"LSS_externalLinkDown(4271)\",\"LSS_failedAttachReqsRateExceeded(4272)\"),\nthis after [-60s, 60s] $root)\nthen\nDmaapService.publishResult(...);\nend",
"collector.schema.file": "./etc/CommonEventFormat_27.2.json",
"collector.service.port": 8080,
"collector.dmaap.streamid": "fault=sec_fault,roadm-sec-to-hp|syslog=sec_syslog|heartbeat=sec_heartbeat|measurementsForVfScaling=sec_measurement|mobileFlow=sec_mobileflow|other=sec_other|stateChange=sec_statechange|thresholdCrossingAlert=sec_thresholdCrossingAlert",
|