From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Fri, 2 Mar 2018 08:24:48 +0000 (+0100)
Subject: Switch from openstack.creds to the new env_file
X-Git-Tag: opnfv-6.0.0~15^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=39eba67a1ad63477e4bef69bd9eb7eba6f4682cd;p=barometer.git

Switch from openstack.creds to the new env_file

This file was renamed to avoid linking Kubernetes testcases to
OpenStack credentials.

This patch is mandatory for gating.

Change-Id: I6b4e7e83d6dfc8cf1d60bf016ef258a273156ffe
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

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}"