aboutsummaryrefslogtreecommitdiffstats
path: root/appc-event-listener
diff options
context:
space:
mode:
authorPatrick Brady <pb071s@att.com>2017-07-28 11:29:23 -0700
committerPatrick Brady <pb071s@att.com>2017-08-02 15:43:44 +0000
commit38713207b817ed4700f630748c681116338d32f0 (patch)
tree9eb2097cee8d85ac14f17e3a280ae8aefb69d9de /appc-event-listener
parent771ac55e29d099d8bbf783612de975047d75ab12 (diff)
Merging in bug fixes
Change-Id: I85da90b9ba0d03149f42035a820c76ef0285e413 Signed-off-by: Patrick Brady <pb071s@att.com> Issue: APPC-100
Diffstat (limited to 'appc-event-listener')
-rw-r--r--appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/AppcEventListenerActivator.java17
-rw-r--r--appc-event-listener/appc-event-listener-bundle/src/test/resources/IncomingMessage.txt24
2 files changed, 40 insertions, 1 deletions
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/AppcEventListenerActivator.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/AppcEventListenerActivator.java
index 4e61d148a..86abd6057 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/AppcEventListenerActivator.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/AppcEventListenerActivator.java
@@ -126,7 +126,22 @@ public class AppcEventListenerActivator implements BundleActivator {
demoProps.setListenerClass(org.openecomp.appc.listener.demo.impl.ListenerImpl.class);
listeners.add(demoProps);
- // ===========================================================================
+ // ===========================================================================
+
+ ListenerProperties clLCMProps = new ListenerProperties("appc.LCM", props);
+ clLCMProps.setListenerClass(org.openecomp.appc.listener.LCM.impl.ListenerImpl.class);
+ listeners.add(clLCMProps);
+
+ //Configure the OAM properties
+ clLCMProps = new ListenerProperties("appc.OAM", props);
+ clLCMProps.setListenerClass(org.openecomp.appc.listener.LCM.impl.ListenerImpl.class);
+ listeners.add(clLCMProps);
+
+/*
+ ListenerProperties clLCMProps1607 = new ListenerProperties("appc.LCM1607", props);
+ clLCMProps1607.setListenerClass(org.openecomp.appc.listener.LCM1607.impl.ListenerImpl.class);
+ listeners.add(clLCMProps1607);
+*/
adapter = new ControllerImpl(listeners);
if (ctx != null && registration == null) {
diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/resources/IncomingMessage.txt b/appc-event-listener/appc-event-listener-bundle/src/test/resources/IncomingMessage.txt
new file mode 100644
index 000000000..51b9a9c2a
--- /dev/null
+++ b/appc-event-listener/appc-event-listener-bundle/src/test/resources/IncomingMessage.txt
@@ -0,0 +1,24 @@
+{
+"eventID": "SomeEventID-TBD",
+
+"APPCVDCName": "Delete this field not needed by App-C",
+"requestTime": "0000-00-00 00:00:00.000000",
+"policyVersion": "1",
+"VMName": "123",
+"from": "test",
+"msgOid": ".1.3.6.1.4.1.193.183.4.1.3.5.1.4",
+"AICVMID": "abc12345-1234-5678-890a-abcdefg12345",
+"trapID": "1410360",
+"requestClient": "test",
+"message": "Abnormal condition detected",
+"time": "123567890",
+"policyName": "RESTART",
+"trapIDOID": ".1.3.6.1.4.1.193.183.4.1.3.5.1.3",
+"request": "Restart",
+"OPS_CL_timer": "15",
+"nOID": ".1.3.6.1.4.1.193.183.4.2.0.4",
+"AgentAddress": "192.168.1.2",
+"vmOID": ".1.3.6.1.4.1.193.183.4.1.2.1",
+"AICTenantID": "abcde12345fghijk6789lmnopq123rst",
+"AICVServerSelfLink": "http://192.168.1.2:8774/v2/abcde12345fghijk6789lmnopq123rst/servers/abc12345-1234-5678-890a-abcdefg12345"
+} \ No newline at end of file