summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliyin <liyin11@huawei.com>2016-12-02 18:12:06 +0800
committerAce Lee <liyin11@huawei.com>2016-12-02 11:35:08 +0000
commit590b32bbd38fc62f3d221e4a5b3be9ab93bc45fe (patch)
treedec85a4ed2c28ef7012df0a2579c8541dab21cc7
parentc8df867b2a9630399ce3f08aef1794283b15bd13 (diff)
dashboard bug: can't deploy dashboard
JIRA: BOTTLENECK-116 This patch fix the bug that bottlenecks project can't establish dashboard, error message is elasticsearch is not install. after install elasticsearch, the error message is can't get ip. to fix this bug, change file requriment.txt and dashboard file. Change-Id: Ibad0dc46ab44d500b799bbf67e169d76c59e7199 Signed-off-by: liyin <liyin11@huawei.com>
-rw-r--r--requirements.txt1
-rwxr-xr-xtestsuites/posca/testcase_dashboard/system_bandwidth.py39
-rw-r--r--testsuites/posca/testcase_script/posca_factor_system_bandwidth.py2
3 files changed, 34 insertions, 8 deletions
diff --git a/requirements.txt b/requirements.txt
index 28f7736e..f732bcc8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -78,3 +78,4 @@ unittest2==1.1.0
warlock==1.2.0
wrapt==1.10.6
pyroute2==0.4.10
+elasticsearch==5.0.1
diff --git a/testsuites/posca/testcase_dashboard/system_bandwidth.py b/testsuites/posca/testcase_dashboard/system_bandwidth.py
index 708820d1..69020c04 100755
--- a/testsuites/posca/testcase_dashboard/system_bandwidth.py
+++ b/testsuites/posca/testcase_dashboard/system_bandwidth.py
@@ -9,13 +9,20 @@
##############################################################################
import ConfigParser
from elasticsearch import Elasticsearch
+from pyroute2 import IPDB
config = ConfigParser.ConfigParser()
-file_str = "testcase_cfg/posca_factor_system_bandwidth.yaml"
+file_str = "/home/opnfv/bottlenecks/testsuites/posca/testcase_cfg/posca_factor_system_bandwidth.yaml"
with open(file_str, "rd") as cfgfile:
config.readfp(cfgfile)
ES_ip_a = config.get("config", "ES_ip")
+with IPDB() as ip:
+ GATEWAY_IP = ip.routes['default'].gateway
+ if ES_ip_a is "":
+ ES_ip_a = GATEWAY_IP+":9200"
+ print("ES_ip is null get local ip is %s" %(ES_ip_a))
+
es_ip = ES_ip_a.split(':')
es = Elasticsearch([{'host':es_ip[0]}])
doc={
@@ -25,7 +32,10 @@ doc={
}
res = es.index(index=".kibana",doc_type="index-pattern",id="bottlenecks",body=doc)
-print(res['created'])
+if res['created']=="True":
+ print("bottlenecks index-pattern has created")
+else:
+ print("bottlenecks index-pattern has existed")
doc={
"buildNum": 10146,
@@ -39,7 +49,10 @@ doc={
"version": 1,
}
res = es.index(index=".kibana",doc_type="search",id="system_bandwidth",body=doc)
-print(res['created'])
+if res['created']=="True":
+ print("system_bandwidth search has created")
+else:
+ print("system_bandwidth search has existed")
doc = {
"title": "system_bandwidth_line-date",
@@ -53,7 +66,10 @@ doc = {
}
res = es.index(
index=".kibana", doc_type="visualization", id="system_bandwidth_line-date", body=doc)
-print(res['created'])
+if res['created']=="True":
+ print("system_bandwidth_line-date visualization has created")
+else:
+ print("system_bandwidth_line-date visualization has existed")
doc = {
"title": "system_bandwidth_line-char",
@@ -68,7 +84,10 @@ doc = {
res = es.index(
index=".kibana", doc_type="visualization", id="system_bandwidth_line-char", body=doc)
-print(res['created'])
+if res['created']=="True":
+ print("system_bandwidth_line-char visualization has created")
+else:
+ print("system_bandwidth_line-char visualization has existed")
doc = {
"title": "system_bandwidth_terms_data",
@@ -83,7 +102,10 @@ doc = {
res = es.index(
index=".kibana", doc_type="visualization", id="system_bandwidth_terms_data", body=doc)
-print(res['created'])
+if res['created']=="True":
+ print("system_bandwidth_terms_data visualization has created")
+else:
+ print("system_bandwidth_terms_data visualization has existed")
doc = {
"title": "system_bandwidth_dashboard",
@@ -100,4 +122,7 @@ doc = {
res = es.index(
index=".kibana", doc_type="dashboard", id="system_bandwidth_dashboard", body=doc)
-print(res['created'])
+if res['created']=="True":
+ print("system_bandwidth dashboard has created")
+else:
+ print("system_bandwidth dashboard has existed")
diff --git a/testsuites/posca/testcase_script/posca_factor_system_bandwidth.py b/testsuites/posca/testcase_script/posca_factor_system_bandwidth.py
index 0eb88814..0b77b6b6 100644
--- a/testsuites/posca/testcase_script/posca_factor_system_bandwidth.py
+++ b/testsuites/posca/testcase_script/posca_factor_system_bandwidth.py
@@ -136,7 +136,7 @@ def main():
cmd = '/home/opnfv/bottlenecks/testsuites/posca/testcase_dashboard/\
system_bandwidth.py'
pargs = [INTERPRETER, cmd]
- print("Begin to establish dashboard, False means already exist.\n")
+ print("\nBegin to establish dashboard.")
sub_result = subprocess.Popen(pargs)
sub_result.wait()
print("System Bandwidth testing time : %s" %(endtime - starttime))