X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=monitor%2Fbarometer_automated_client_install.py;h=9bb2c6b15cbd59a13998d4e2e000d7ffe562a4f9;hb=742fc9ab94ede1187c9146e5336e28fe84d510c5;hp=7bbfa70195a74b895e1c14d6f73486517f4d9248;hpb=2833e627cbf31eb89f313ec167f215c48fa70217;p=bottlenecks.git

diff --git a/monitor/barometer_automated_client_install.py b/monitor/barometer_automated_client_install.py
index 7bbfa701..9bb2c6b1 100644
--- a/monitor/barometer_automated_client_install.py
+++ b/monitor/barometer_automated_client_install.py
@@ -8,29 +8,36 @@
 ##############################################################################
 
 import logging
-import sys
 import yaml
-sys.path.insert(0, '/home/opnfv/bottlenecks/utils/infra_setup/passwordless_SSH/')
-import ssh
+import utils.infra_setup.passwordless_SSH.ssh as ssh
 
 logger = logging.getLogger(__name__)
+barometer_client_install_sh =\
+    "/home/opnfv/bottlenecks/monitor/barometer_install_client.sh"
+barometer_client_install_conf =\
+    "/home/opnfv/bottlenecks/monitor/barometer_client.conf"
+
 with open('/tmp/pod.yaml') as f:
     dataMap = yaml.safe_load(f)
     for x in dataMap:
         for y in dataMap[x]:
-            if (y['role']=='Controller') or (y['role']=='Compute'):
+            if (y['role'] == 'Controller') or (y['role'] == 'Compute'):
                 ip = str(y['ip'])
                 user = str(y['user'])
                 pwd = str(y['password'])
-                ssh_d = ssh.SSH(user, host= ip, password= pwd)
-                status, stdout, stderr = ssh_d.execute("cd /etc && mkdir barometer-config")
+                ssh_d = ssh.SSH(user, host=ip, password=pwd)
+                status, stdout, stderr = ssh_d.execute(
+                    "cd /etc && mkdir barometer_config"
+                )
                 if status:
                     raise Exception("Command failed with non-zero status.")
                     logger.info(stdout.splitlines())
-                with open("/home/opnfv/bottlenecks/monitor/barometer_client.conf") as stdin_file:
-                    ssh_d.run("cat > /etc/barometer-config/barometer_client_collectd.conf", stdin=stdin_file)
-
-                with open("/home/opnfv/bottlenecks/monitor/barometer_install_client.sh") as stdin_file:
-                    ssh_d.run("cat > /etc/barometer-config/install.sh", stdin=stdin_file)
+                with open(barometer_client_install_conf) as stdin_file:
+                    ssh_d.run("cat > /etc/barometer_config/\
+                        barometer_client_collectd.conf",
+                              stdin=stdin_file)
+                with open(barometer_client_install_sh) as stdin_file:
+                    ssh_d.run("cat > /etc/barometer_config/install.sh",
+                              stdin=stdin_file)
 
-                ssh_d.run("cd /etc/barometer-config/ && bash ./install.sh")
+                ssh_d.run("cd /etc/barometer_config/ && bash ./install.sh")