From c7d0075d223eab9f89fd28853c4b138792059be9 Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Thu, 1 Jun 2017 10:45:37 -0700 Subject: Merge of new rebased code Change-Id: I9b8d1f69eb3e0af1935ed8304fea4bf54c1aac47 Signed-off-by: Patrick Brady --- .../src/test/resources/IncomingMessage.txt | 24 ------------------- .../src/test/resources/IncomingMessage1607.txt | 24 ------------------- .../src/test/resources/IncomingMessagedemo.txt | 24 +++++++++++++++++++ .../src/test/resources/OutgoingMessage.txt | 14 ----------- .../src/test/resources/OutgoingMessage1607.txt | 27 ---------------------- .../src/test/resources/OutgoingMessagedemo.txt | 27 ++++++++++++++++++++++ .../org/openecomp/appc/default.properties | 2 +- 7 files changed, 52 insertions(+), 90 deletions(-) delete mode 100644 appc-event-listener/appc-event-listener-bundle/src/test/resources/IncomingMessage.txt delete mode 100644 appc-event-listener/appc-event-listener-bundle/src/test/resources/IncomingMessage1607.txt create mode 100644 appc-event-listener/appc-event-listener-bundle/src/test/resources/IncomingMessagedemo.txt delete mode 100644 appc-event-listener/appc-event-listener-bundle/src/test/resources/OutgoingMessage.txt delete mode 100644 appc-event-listener/appc-event-listener-bundle/src/test/resources/OutgoingMessage1607.txt create mode 100644 appc-event-listener/appc-event-listener-bundle/src/test/resources/OutgoingMessagedemo.txt (limited to 'appc-event-listener/appc-event-listener-bundle/src/test/resources') 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 deleted file mode 100644 index 0771a790a..000000000 --- a/appc-event-listener/appc-event-listener-bundle/src/test/resources/IncomingMessage.txt +++ /dev/null @@ -1,24 +0,0 @@ -{ -"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", -"VMID": "abc12345-1234-5678-890a-abcdefg12345", -"trapID": "1234567", -"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", -"TenantID": "abcde12345fghijk6789lmnopq123rst", -"VServerSelfLink": "http://192.168.1.2:8774/v2/abcde12345fghijk6789lmnopq123rst/servers/abc12345-1234-5678-890a-abcdefg12345" -} \ No newline at end of file diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/resources/IncomingMessage1607.txt b/appc-event-listener/appc-event-listener-bundle/src/test/resources/IncomingMessage1607.txt deleted file mode 100644 index 667cfae8c..000000000 --- a/appc-event-listener/appc-event-listener-bundle/src/test/resources/IncomingMessage1607.txt +++ /dev/null @@ -1,24 +0,0 @@ -{ - "CommonHeader": { - "TimeStamp": "0000-00-00T00:00:00.000Z", - "APIver": "1.01", - "OriginatorID": "policy.pdp01", - "RequestID": "b74d13c5-bb26-4b04-992c-4679dfc8280e", - "SubrequestID": "1" - }, - "Action": "RESTART", - "Payload": { - "VServerSelfLink": "http://192.168.1.2:8774/v2/abcde12345fghijk6789lmnopq123rst/servers/abc12345-1234-5678-890a-abcdefg12345", - "VNF_NAME": "test", - "VMID": "abc12345-1234-5678-890a-abcdefg12345", - "TenantID": "abcde12345fghijk6789lmnopq123rst", - "LOC_ID": "Test", - "in-maint": "false", - "Identity": "http://example.com:5000/v2.0", - "Prov_status": "ACTIVE", - "OAM_IPV4": "192.168.1.2", - "is-closed-loop-disabled": "false", - "VM_NAME": "test", - "OAM_IPV6": "0000::0000:0000:0000:0000/64" - } -} diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/resources/IncomingMessagedemo.txt b/appc-event-listener/appc-event-listener-bundle/src/test/resources/IncomingMessagedemo.txt new file mode 100644 index 000000000..667cfae8c --- /dev/null +++ b/appc-event-listener/appc-event-listener-bundle/src/test/resources/IncomingMessagedemo.txt @@ -0,0 +1,24 @@ +{ + "CommonHeader": { + "TimeStamp": "0000-00-00T00:00:00.000Z", + "APIver": "1.01", + "OriginatorID": "policy.pdp01", + "RequestID": "b74d13c5-bb26-4b04-992c-4679dfc8280e", + "SubrequestID": "1" + }, + "Action": "RESTART", + "Payload": { + "VServerSelfLink": "http://192.168.1.2:8774/v2/abcde12345fghijk6789lmnopq123rst/servers/abc12345-1234-5678-890a-abcdefg12345", + "VNF_NAME": "test", + "VMID": "abc12345-1234-5678-890a-abcdefg12345", + "TenantID": "abcde12345fghijk6789lmnopq123rst", + "LOC_ID": "Test", + "in-maint": "false", + "Identity": "http://example.com:5000/v2.0", + "Prov_status": "ACTIVE", + "OAM_IPV4": "192.168.1.2", + "is-closed-loop-disabled": "false", + "VM_NAME": "test", + "OAM_IPV6": "0000::0000:0000:0000:0000/64" + } +} diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/resources/OutgoingMessage.txt b/appc-event-listener/appc-event-listener-bundle/src/test/resources/OutgoingMessage.txt deleted file mode 100644 index c5d6c5b56..000000000 --- a/appc-event-listener/appc-event-listener-bundle/src/test/resources/OutgoingMessage.txt +++ /dev/null @@ -1,14 +0,0 @@ -{ -"eventID": "SomeEventID-TBD", - -"VMName": "test", -"from": "appc@test", -"message": "Some Text Here", -"requestClient": "test", -"requestTime": "0000-00-00 00:00:00.000000", -"response": "PENDING", -"responseTime": "0000-00-00 00:00:00.000000", - -"policyName": "RESTART", -"policyVersion": "1" -} diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/resources/OutgoingMessage1607.txt b/appc-event-listener/appc-event-listener-bundle/src/test/resources/OutgoingMessage1607.txt deleted file mode 100644 index 898eb622e..000000000 --- a/appc-event-listener/appc-event-listener-bundle/src/test/resources/OutgoingMessage1607.txt +++ /dev/null @@ -1,27 +0,0 @@ -{ - "CommonHeader": { - "TimeStamp": "0000-00-00T00:00:00.000Z", - "APIver": "1.01", - "OriginatorID": "policy.pdp01", - "RequestID": "b74d13c5-bb26-4b04-992c-4679dfc8280e", - "SubrequestID": "1" - }, - "Status": { - "Code": 100, - "Value": "ACCEPT" - }, - "Payload": { - "VServerSelfLink": "http://192.168.1.2:8774/v2/abcde12345fghijk6789lmnopq123rst/servers/abc12345-1234-5678-890a-abcdefg12345", - "VNF_NAME": "test", - "VMID": "abc12345-1234-5678-890a-abcdefg12345", - "TenantID": "abcde12345fghijk6789lmnopq123rst", - "LOC_ID": "Test", - "in-maint": "false", - "Identity": "http://example.com:5000/v2.0", - "Prov_status": "ACTIVE", - "OAM_IPV4": "192.168.1.2", - "is-closed-loop-disabled": "false", - "VM_NAME": "test", - "OAM_IPV6": "0000::0000:0000:0000:0000/64" - } -} diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/resources/OutgoingMessagedemo.txt b/appc-event-listener/appc-event-listener-bundle/src/test/resources/OutgoingMessagedemo.txt new file mode 100644 index 000000000..898eb622e --- /dev/null +++ b/appc-event-listener/appc-event-listener-bundle/src/test/resources/OutgoingMessagedemo.txt @@ -0,0 +1,27 @@ +{ + "CommonHeader": { + "TimeStamp": "0000-00-00T00:00:00.000Z", + "APIver": "1.01", + "OriginatorID": "policy.pdp01", + "RequestID": "b74d13c5-bb26-4b04-992c-4679dfc8280e", + "SubrequestID": "1" + }, + "Status": { + "Code": 100, + "Value": "ACCEPT" + }, + "Payload": { + "VServerSelfLink": "http://192.168.1.2:8774/v2/abcde12345fghijk6789lmnopq123rst/servers/abc12345-1234-5678-890a-abcdefg12345", + "VNF_NAME": "test", + "VMID": "abc12345-1234-5678-890a-abcdefg12345", + "TenantID": "abcde12345fghijk6789lmnopq123rst", + "LOC_ID": "Test", + "in-maint": "false", + "Identity": "http://example.com:5000/v2.0", + "Prov_status": "ACTIVE", + "OAM_IPV4": "192.168.1.2", + "is-closed-loop-disabled": "false", + "VM_NAME": "test", + "OAM_IPV6": "0000::0000:0000:0000:0000/64" + } +} diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/resources/org/openecomp/appc/default.properties b/appc-event-listener/appc-event-listener-bundle/src/test/resources/org/openecomp/appc/default.properties index 7a65b7195..9aa518a29 100644 --- a/appc-event-listener/appc-event-listener-bundle/src/test/resources/org/openecomp/appc/default.properties +++ b/appc-event-listener/appc-event-listener-bundle/src/test/resources/org/openecomp/appc/default.properties @@ -38,7 +38,7 @@ ### ### test.prefix=appc.ClosedLoop appc.ClosedLoop.disabled=false -appc.ClosedLoop.service=UEB +appc.ClosedLoop.service=dmaap appc.ClosedLoop.poolMembers=192.168.1.2:3904 appc.ClosedLoop.topic.read=APPC-TEST1 appc.ClosedLoop.topic.read.timeout=5 -- cgit 1.2.3-korg