Merge "Move "read_yaml_file" to common.yaml_loader"

diff --cc yardstick/benchmark/contexts/base.py
index 1c798fb,796a14b..f3f5879
--- 1/yardstick/benchmark/contexts/base.py
--- 2/yardstick/benchmark/contexts/base.py
+++ b/yardstick/benchmark/contexts/base.py
@@@ -79,11 -80,8 +80,11 @@@ class Context(object)
                  raise
  
              self.file_path = os.path.join(YARDSTICK_ROOT_PATH, file_path)
-             cfg = utils.read_yaml_file(self.file_path)
+             cfg = yaml_loader.read_yaml_file(self.file_path)
  
 +        for node in cfg["nodes"]:
 +            node["ctx_type"] = self.__context_type__
 +
          self.nodes.extend(cfg["nodes"])
          self.controllers.extend([node for node in cfg["nodes"]
                                   if node.get("role") == "Controller"])

diff --cc yardstick/tests/unit/benchmark/contexts/test_base.py
Simple merge

diff --cc yardstick/tests/unit/benchmark/contexts/test_node.py
Simple merge