From 1b3263d32a5f1425956ac77747aa1d76deb93e71 Mon Sep 17 00:00:00 2001
From: Aleksandr Dobdin <adobdin@mirantis.com>
Date: Wed, 7 Sep 2016 10:30:06 +0000
Subject: [PATCH] added: represent cluster ids

---
 timmy/env.py   | 2 +-
 timmy/nodes.py | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/timmy/env.py b/timmy/env.py
index a5fa62a..ed8f8f6 100644
--- a/timmy/env.py
+++ b/timmy/env.py
@@ -16,7 +16,7 @@
 #    under the License.
 
 project_name = 'timmy'
-version = '1.19.1'
+version = '1.19.2'
 
 if __name__ == '__main__':
     import sys
diff --git a/timmy/nodes.py b/timmy/nodes.py
index 7283d5e..e0bf077 100644
--- a/timmy/nodes.py
+++ b/timmy/nodes.py
@@ -108,6 +108,7 @@ class Node(object):
         self.outputs_timestamp = False
         self.outputs_timestamp_dir = None
         self.apply_conf(conf)
+        self.cluster_repr = "cluster-%s" % str(cluster)
         if self.id is not None:
             self.repr = "node-%s-%s" % (self.id, self.ip)
         else:
@@ -282,7 +283,7 @@ class Node(object):
             return False
 
     def exec_cmd(self, fake=False, ok_codes=None):
-        cl = 'cluster-%s' % self.cluster
+        cl = self.cluster_repr
         self.logger.debug('%s/%s/%s/%s' %
                           (self.outdir, Node.ckey, cl, self.repr))
         if self.cmds:
@@ -367,7 +368,7 @@ class Node(object):
 
     def get_files(self, timeout=15):
         self.logger.info('%s: getting files' % self.repr)
-        cl = 'cluster-%s' % self.cluster
+        cl = self.cluster_repr
         if self.files or self.filelists:
             ddir = os.path.join(self.outdir, Node.fkey, cl, self.repr)
             tools.mdir(ddir)
@@ -725,6 +726,8 @@ class NodeManager(object):
                         online=True,
                         ip=self.conf['fuel_ip'],
                         conf=self.conf)
+        fuelnode.cluster_repr = ""
+        fuelnode.repr = "fuel"
         # soft-skip Fuel if it is hard-filtered
         if not self.filter(fuelnode, self.conf['hard_filter']):
             fuelnode.filtered_out = True