Implement batching of VES events

Issue-ID: CERT-6
Change-Id: Ie2ba74075539e6896b1c1bd580cf0a80414a04a1
Signed-off-by: Gokul Singaraju <goksing@gmail.com>

4 files changed, 33 insertions, 29 deletions

diff --git a/vnfs/VES5.0/evel/evel-test-collector/code/collector/collector.py b/vnfs/VES5.0/evel/evel-test-collector/code/collector/collector.py
index 8e702aa7..b9473ae5 100644
--- a/vnfs/VES5.0/evel/evel-test-collector/code/collector/collector.py
+++ b/vnfs/VES5.0/evel/evel-test-collector/code/collector/collector.py
@@ -7,20 +7,20 @@ Only intended for test purposes.
 License
 -------
 
- * ===================================================================
- * Copyright © 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.
+  ===================================================================
+  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.
 '''
 
 from rest_dispatcher import PathDispatcher, set_404_content
@@ -562,11 +562,16 @@ USAGE
                           else '')
         throttle_url = '/{0}eventListener/v{1}/clientThrottlingState'.\
                        format(vel_path, api_version)
+        batch_url = '/{0}eventListener/v{1}/eventBatch'.\
+                       format(vel_path, api_version)
         set_404_content(root_url)
         dispatcher = PathDispatcher()
         vendor_event_listener = partial(listener, schema = vel_schema)
         dispatcher.register('GET', root_url, vendor_event_listener)
         dispatcher.register('POST', root_url, vendor_event_listener)
+        batch_event_listener = partial(listener, schema = vel_schema)
+        dispatcher.register('GET', batch_url, batch_event_listener)
+        dispatcher.register('POST', batch_url, batch_event_listener)
         vendor_throttle_listener = partial(listener, schema = throttle_schema)
         dispatcher.register('GET', throttle_url, vendor_throttle_listener)
         dispatcher.register('POST', throttle_url, vendor_throttle_listener)
diff --git a/vnfs/VES5.0/evel/evel-test-collector/code/collector/rest_dispatcher.py b/vnfs/VES5.0/evel/evel-test-collector/code/collector/rest_dispatcher.py
index e3b51aa6..e00465a4 100644
--- a/vnfs/VES5.0/evel/evel-test-collector/code/collector/rest_dispatcher.py
+++ b/vnfs/VES5.0/evel/evel-test-collector/code/collector/rest_dispatcher.py
@@ -7,20 +7,20 @@ Only intended for test purposes.
 License
 -------
 
- * ===================================================================
- * Copyright © 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.
+   ===================================================================
+   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.
 
 '''
 
diff --git a/vnfs/VES5.0/evel/evel-test-collector/docs/att_interface_definition/event_format_updated.json b/vnfs/VES5.0/evel/evel-test-collector/docs/att_interface_definition/event_format_updated.json
index 160add52..7dfef260 100644
--- a/vnfs/VES5.0/evel/evel-test-collector/docs/att_interface_definition/event_format_updated.json
+++ b/vnfs/VES5.0/evel/evel-test-collector/docs/att_interface_definition/event_format_updated.json
@@ -10,7 +10,6 @@
 						"description": "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",

 						"type": "string"

 					},

-					"licenseLink": "http://www.apache.org/licenses/LICENSE-2.0",

 					"condition1": {

 						"description": "Unless required by applicable law or agreed to in writing, software 13 * distributed under the License is distributed on an AS IS BASIS,",

 						"type": "string"

diff --git a/vnfs/VES5.0/evel/evel-test-collector/scripts/linux/go-collector.sh b/vnfs/VES5.0/evel/evel-test-collector/scripts/linux/go-collector.sh
index 31fd8af4..31fd8af4 100644..100755
--- a/vnfs/VES5.0/evel/evel-test-collector/scripts/linux/go-collector.sh
+++ b/vnfs/VES5.0/evel/evel-test-collector/scripts/linux/go-collector.sh