summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Smith <aasmith@redhat.com>2018-03-05 16:11:24 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-05 16:11:24 +0000
commit763b590b90a7db5bc22ae95ffce8eea8276c8e2a (patch)
tree0d3eb7618984925979b934e1cb5aa9ef0c632d9f
parent69b5da25c2d1ca62fe08fd4088366a5341372c7c (diff)
parent39eba67a1ad63477e4bef69bd9eb7eba6f4682cd (diff)
Merge "Switch from openstack.creds to the new env_file"
-rw-r--r--baro_tests/config_server.py21
1 files changed, 8 insertions, 13 deletions
diff --git a/baro_tests/config_server.py b/baro_tests/config_server.py
index f35f7882..6c67ee6a 100644
--- a/baro_tests/config_server.py
+++ b/baro_tests/config_server.py
@@ -14,12 +14,15 @@
"""Classes used by collectd.py"""
-import paramiko
import time
import os.path
import os
import re
+
from opnfv.deployment import factory
+import paramiko
+from functest.utils import constants
+
ID_RSA_PATH = '/root/.ssh/id_rsa'
SSH_KEYS_SCRIPT = '/home/opnfv/barometer/baro_utils/get_ssh_keys.sh'
DEF_PLUGIN_INTERVAL = 10
@@ -263,9 +266,7 @@ class ConfigServer(object):
nodes = get_apex_nodes()
for node in nodes:
if controller_name == node.get_dict()['name']:
- node.put_file(
- '/home/opnfv/functest/conf/openstack.creds',
- 'overcloudrc.v3')
+ node.put_file(constants.ENV_FILE, 'overcloudrc.v3')
stdout = node.run_cmd(
"source overcloudrc.v3;"
+ "openstack catalog list | grep gnocchi")
@@ -286,9 +287,7 @@ class ConfigServer(object):
nodes = get_apex_nodes()
for node in nodes:
if controller_name == node.get_dict()['name']:
- node.put_file(
- '/home/opnfv/functest/conf/openstack.creds',
- 'overcloudrc.v3')
+ node.put_file(constants.ENV_FILE, 'overcloudrc.v3')
stdout = node.run_cmd(
"source overcloudrc.v3;"
+ "openstack catalog list | grep aodh")
@@ -481,9 +480,7 @@ class ConfigServer(object):
if node.is_controller():
self.__logger.info('Getting AODH Alarm list on {}' .format(
(node.get_dict()['name'])))
- node.put_file(
- '/home/opnfv/functest/conf/openstack.creds',
- 'overcloudrc.v3')
+ node.put_file(constants.ENV_FILE, 'overcloudrc.v3')
stdout = node.run_cmd(
"source overcloudrc.v3;"
+ "aodh alarm list | grep {0} | grep {1}"
@@ -540,9 +537,7 @@ class ConfigServer(object):
if node.is_controller():
self.__logger.info('Getting gnocchi metric list on {}' .format(
(node.get_dict()['name'])))
- node.put_file(
- '/home/opnfv/functest/conf/openstack.creds',
- 'overcloudrc.v3')
+ node.put_file(constants.ENV_FILE, 'overcloudrc.v3')
stdout = node.run_cmd(
"source overcloudrc.v3;"
+ "gnocchi metric list | grep {0} | grep {1}"