1 files changed, 25 insertions, 43 deletions

diff --git a/vstf/vstf/controller/reporters/report/provider/html_provider.py b/vstf/vstf/controller/reporters/report/provider/html_provider.py
index b0b07432..74c4c593 100755
--- a/vstf/vstf/controller/reporters/report/provider/html_provider.py
+++ b/vstf/vstf/controller/reporters/report/provider/html_provider.py
@@ -1,63 +1,45 @@
-#!/usr/bin/python
-# -*- coding: utf8 -*-
-# author: wly
-# date: 2015-09-25
-# see license for license details
-__version__ = ''' '''
+##############################################################################
+# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
+#
+# 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
+##############################################################################
+
 import logging
 
 LOG = logging.getLogger(__name__)
 from vstf.controller.settings.html_settings import HtmlSettings
-from vstf.controller.settings.data_settings import DataSettings
+from vstf.controller.settings.template_settings import TemplateSettings
 
 
 class HtmlProvider(object):
-    def __init__(self, content, style):
-        self._content = content
+    def __init__(self, info, style):
+        self._info = info
         self._style = style
 
+    @property
     def get_style(self):
+        assert "style" in self._style
         return self._style["style"]
 
-    def get_subject(self):
-        return self._content["subject"]
-
-    def get_ovs_title(self):
-        return self._content["ovs"]["title"]
-
-    def get_ovs_table(self):
-        return map(lambda x: list(x), self._content["ovs"]["content"].items())
-
-    def get_result_title(self):
-        return self._content["result"]["title"]
-
-    def get_result_table(self, ttype):
-        result = []
-        content = self._content["result"]["content"]
-        if ttype in content:
-            result.append(content[ttype]["columns"])
-            result.extend(content[ttype]["data"])
-
-            result = map(lambda x: list(x), zip(*result))
-        return result
-
-
-class StyleProvider(object):
-    def __init__(self, style):
-        self._style = style
-
-    def get_style(self):
-        return self._style["style"]
+    @property
+    def get_context(self):
+        assert "context" in self._info
+        return self._info["context"]
 
 
-def unit_test():
+def main():
     from vstf.common.log import setup_logging
     setup_logging(level=logging.DEBUG, log_file="/var/log/html-provder.log", clevel=logging.INFO)
 
     html_settings = HtmlSettings()
     LOG.info(html_settings.settings)
-    data_settings = DataSettings()
-    LOG.info(data_settings.settings)
+    info = TemplateSettings()
+    provider = HtmlProvider(info.settings, html_settings.settings)
+    LOG.info(provider.get_style)
+    LOG.info(provider.get_context)
 
-    hprovider = HtmlProvider(data_settings.settings, html_settings.settings)
-    sprovider = StyleProvider(html_settings.settings)
+if __name__ == '__main__':
+    main()
\ No newline at end of file