From: Morgan Richomme <morgan.richomme@orange.com>
Date: Mon, 17 Oct 2016 17:00:32 +0000 (+0000)
Subject: Merge "project-ize kibana_dashboard"
X-Git-Tag: danube.1.0~709
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=307a8f07e8c17800ed1214394a3aacf02045a03a;hp=-c;p=releng.git

Merge "project-ize kibana_dashboard"
---

307a8f07e8c17800ed1214394a3aacf02045a03a
diff --combined utils/test/dashboard/dashboard/elastic2kibana/main.py
index 4542c31ec,e4c17d737..5af512e2f
--- a/utils/test/dashboard/dashboard/elastic2kibana/main.py
+++ b/utils/test/dashboard/dashboard/elastic2kibana/main.py
@@@ -4,10 -4,10 +4,10 @@@ import urlpars
  
  import argparse
  
- from common import elastic_access
- from common import logger_utils
- from conf import config
- from conf import testcases
+ from dashboard.common import elastic_access
+ from dashboard.common import logger_utils
+ from dashboard.conf import config
+ from dashboard.conf import testcases
  from dashboard_assembler import DashboardAssembler
  from visualization_assembler import VisualizationAssembler
  
@@@ -132,7 -132,7 +132,7 @@@ class KibanaConstructor(object)
          })
  
          elastic_data = elastic_access.get_docs(
 -            urlparse.urljoin(CONF.es_url, '/test_results/mongo2elastic'),
 +            urlparse.urljoin(CONF.es_url, '/testapi/results'),
              CONF.es_creds,
              query)
  
diff --combined utils/test/dashboard/dashboard/mongo2elastic/main.py
index 8c7300b79,3f92c5699..c2a8d1149
--- a/utils/test/dashboard/dashboard/mongo2elastic/main.py
+++ b/utils/test/dashboard/dashboard/mongo2elastic/main.py
@@@ -10,10 -10,11 +10,11 @@@ import uui
  
  import argparse
  
- from common import logger_utils, elastic_access
- from conf import testcases
- from conf.config import APIConfig
- from mongo2elastic import format
+ from dashboard.common import elastic_access
+ from dashboard.common import logger_utils
+ from dashboard.conf import testcases
+ from dashboard.conf.config import APIConfig
+ from dashboard.mongo2elastic import format
  
  logger = logger_utils.DashboardLogger('mongo2elastic').get
  
@@@ -241,7 -242,7 +242,7 @@@ class DocumentsPublisher(object)
  
  
  def main():
 -    base_elastic_url = urlparse.urljoin(CONF.es_url, '/test_results/mongo2elastic')
 +    base_elastic_url = urlparse.urljoin(CONF.es_url, '/testapi/results')
      days = args.latest_days
      es_creds = CONF.es_creds