From 92284a123c5db6f06b34de125ea6705ba9d8ddf2 Mon Sep 17 00:00:00 2001
From: Ifat Afek <ifat.afek@nokia.com>
Date: Tue, 23 Jan 2018 12:40:04 +0000
Subject: [PATCH] Rename 'type' to 'template_type'

Change-Id: Idc431787c77ab3f3f3ffca8ab0e281fd57f46818
---
 vitrage/evaluator/template_data.py                 | 14 +++++++-------
 .../evaluator/template_loading/template_loader.py  |  6 +++---
 .../template_loading/v2/test_template_loader.py    |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/vitrage/evaluator/template_data.py b/vitrage/evaluator/template_data.py
index 44ce18d0e..d5d580ea2 100644
--- a/vitrage/evaluator/template_data.py
+++ b/vitrage/evaluator/template_data.py
@@ -47,10 +47,10 @@ class Scenario(object):
 # noinspection PyAttributeOutsideInit
 class TemplateData(object):
 
-    def __init__(self, name, type, version, entities,
+    def __init__(self, name, template_type, version, entities,
                  relationships, scenarios):
         self.name = name
-        self.type = type
+        self.template_type = template_type
         self.version = version
         self.entities = entities
         self.relationships = relationships
@@ -65,12 +65,12 @@ class TemplateData(object):
         self._name = template_name
 
     @property
-    def type(self):
-        return self._type
+    def template_type(self):
+        return self._template_type
 
-    @type.setter
-    def type(self, template_type):
-        self._type = template_type
+    @template_type.setter
+    def template_type(self, template_type):
+        self._template_type = template_type
 
     @property
     def version(self):
diff --git a/vitrage/evaluator/template_loading/template_loader.py b/vitrage/evaluator/template_loading/template_loader.py
index 6e1adb0ff..d6b4157c1 100644
--- a/vitrage/evaluator/template_loading/template_loader.py
+++ b/vitrage/evaluator/template_loading/template_loader.py
@@ -57,8 +57,8 @@ class TemplateLoader(object):
 
         name = template_def[TFields.METADATA][TFields.NAME]
 
-        # type might be None, it is defined only in version 2
-        type = template_def[TFields.METADATA].get(TFields.TYPE)
+        # template_type might be None, it is defined only in version 2
+        template_type = template_def[TFields.METADATA].get(TFields.TYPE)
 
         if def_templates is None:
             def_templates = {}
@@ -89,7 +89,7 @@ class TemplateLoader(object):
                                    self.relationships).\
             build_scenarios(template_def[TFields.SCENARIOS])
 
-        return TemplateData(name, type, template_schema.version(),
+        return TemplateData(name, template_type, template_schema.version(),
                             self.entities, self.relationships, scenarios)
 
     def _build_entities(self, entities_defs):
diff --git a/vitrage/tests/unit/evaluator/template_loading/v2/test_template_loader.py b/vitrage/tests/unit/evaluator/template_loading/v2/test_template_loader.py
index 93488233b..7d8ba7044 100644
--- a/vitrage/tests/unit/evaluator/template_loading/v2/test_template_loader.py
+++ b/vitrage/tests/unit/evaluator/template_loading/v2/test_template_loader.py
@@ -45,7 +45,7 @@ class TemplateLoaderTest(base.BaseTest):
         template_data = TemplateLoader().load(template_definition)
         self.assertIsNotNone(template_data)
 
-        type = template_data.type
-        self.assertIsNotNone(type, 'v2 template must include a type')
-        self.assertEqual(TemplateTypes.STANDARD, type,
-                         'type should be ' + TemplateTypes.STANDARD)
+        template_type = template_data.template_type
+        self.assertIsNotNone(template_type, 'v2 template must include a type')
+        self.assertEqual(TemplateTypes.STANDARD, template_type,
+                         'template_type should be ' + TemplateTypes.STANDARD)