Merge "vnf_generic: replace list comprehension with generator expression"

[yardstick.git] / yardstick / dispatcher / file.py

diff --git a/yardstick/dispatcher/file.py b/yardstick/dispatcher/file.py
index 7c644f8..8d3c369 100644 (file)
--- a/yardstick/dispatcher/file.py
+++ b/yardstick/dispatcher/file.py
@@ -1,15 +1,26 @@
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
+# Copyright 2013 IBM Corp
+# All Rights Reserved.
 #
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
+#    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.
+
+# yardstick comment: this is a modified copy of
+# ceilometer/ceilometer/dispatcher/file.py
 
-import logging
+from __future__ import absolute_import
 
 from yardstick.dispatcher.base import Base as DispatchBase
+from yardstick.common import constants as consts
+from yardstick.common import utils
 
 
 class FileDispatcher(DispatchBase):
@@ -18,36 +29,15 @@ class FileDispatcher(DispatchBase):
 
     __dispatcher_type__ = "File"
 
-    # TODO: make parameters below configurable, currently just hard coded
-    # Path of the file to record the data
-    file_path = "/tmp/yardstick.out"
-    # The max size of the file
-    max_bytes = 0
-    # The max number of the files to keep
-    backup_count = 0
-
     def __init__(self, conf):
         super(FileDispatcher, self).__init__(conf)
-        self.log = None
-
-        # if the directory and path are configured, then log to the file
-        if self.file_path:
-            dispatcher_logger = logging.Logger('dispatcher.file')
-            dispatcher_logger.setLevel(logging.INFO)
-            # create rotating file handler which logs result
-            rfh = logging.handlers.RotatingFileHandler(
-                self.conf.get('file_path', self.file_path),
-                maxBytes=self.max_bytes,
-                backupCount=self.backup_count,
-                encoding='utf8')
-
-            rfh.setLevel(logging.INFO)
-            # Only wanted the data to be saved in the file, not the
-            # project root logger.
-            dispatcher_logger.propagate = False
-            dispatcher_logger.addHandler(rfh)
-            self.log = dispatcher_logger
+        self.result = []
 
     def record_result_data(self, data):
-        if self.log:
-            self.log.info(data)
+        self.result.append(data)
+
+    def flush_result_data(self):
+        file_path = self.conf.get('file_path', consts.DEFAULT_OUTPUT_FILE)
+
+        data = {'status': 1, 'result': self.result}
+        utils.write_json_to_file(file_path, data)