X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=baro_tests%2Fcollectd.py;fp=baro_tests%2Fcollectd.py;h=3cd55bf1e17192ba39569b56178bc8093df2b381;hb=0c9398c650e78977f7e6bec460f578e17bc58c31;hp=1b5a9232879d8486f2fac8d40b76b90fbff82fbe;hpb=21785d87913475a45bd9251c8d0e605eeeb4f578;p=barometer.git

diff --git a/baro_tests/collectd.py b/baro_tests/collectd.py
index 1b5a9232..3cd55bf1 100644
--- a/baro_tests/collectd.py
+++ b/baro_tests/collectd.py
@@ -210,21 +210,27 @@ class CSVClient(object):
                                 meter_category, date))
                         stdout2 = node.run_cmd(
                             "tail -1 /var/lib/collectd/csv/"
-                            + "{0}.jf.intel.com/{1}/{2}-{3}".format(
-                                compute_node.get_name(), plugin_subdir,
+                            + "{0}/{1}/{2}-{3}".format(
+                                hostname, plugin_subdir,
                                 meter_category, date))
                         # Storing last two values
                         values = stdout1
+                        values2 = stdout2
                         if values is None:
                             logger.error(
                                 'Getting last two CSV entries of meter category'
                                 + ' {0} in {1} subdir failed'.format(
                                     meter_category, plugin_subdir))
+                        elif values2 is None:
+                            logger.error(
+                                'Getting last CSV entries of meter category'
+                                + ' {0} in {1} subdir failed'.format(
+                                    meter_category, plugin_subdir))
                         else:
                             values = values.split(',')
                             old_value = float(values[0])
-                            stdout2 = stdout2.split(',')
-                            new_value = float(stdout2[0])
+                            values2 = values2.split(',')
+                            new_value = float(values2[0])
                             metrics.append((
                                 plugin_subdir, meter_category, old_value,
                                 new_value))