From 530ae4d5331d652f2feda8c5e5cdb41eb81a0ee8 Mon Sep 17 00:00:00 2001
From: Robert Tingirica <rtingirica@cloudbasesolutions.com>
Date: Wed, 17 Sep 2014 19:13:24 +0300
Subject: [PATCH] Adds fix for heat directory bug

---
 .../plugins/windows/userdataplugins/heat.py   | 11 ++++----
 .../windows/userdataplugins/test_heat.py      | 28 +++++++++++++------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/cloudbaseinit/plugins/windows/userdataplugins/heat.py b/cloudbaseinit/plugins/windows/userdataplugins/heat.py
index 0d560424..072770e3 100644
--- a/cloudbaseinit/plugins/windows/userdataplugins/heat.py
+++ b/cloudbaseinit/plugins/windows/userdataplugins/heat.py
@@ -38,14 +38,15 @@ class HeatPlugin(base.BaseUserDataPlugin):
     def __init__(self):
         super(HeatPlugin, self).__init__("text/x-cfninitdata")
 
-    def _check_heat_config_dir(self):
-        if not os.path.exists(CONF.heat_config_dir):
-            os.makedirs(CONF.heat_config_dir)
+    def _check_dir(self, file_name):
+        dir_name = os.path.dirname(file_name)
+        if not os.path.exists(dir_name):
+            os.makedirs(dir_name)
 
     def process(self, part):
-        self._check_heat_config_dir()
-
         file_name = os.path.join(CONF.heat_config_dir, part.get_filename())
+        self._check_dir(file_name)
+
         with open(file_name, 'wb') as f:
             f.write(part.get_payload())
 
diff --git a/cloudbaseinit/tests/plugins/windows/userdataplugins/test_heat.py b/cloudbaseinit/tests/plugins/windows/userdataplugins/test_heat.py
index 821e6c25..cf6b4b84 100644
--- a/cloudbaseinit/tests/plugins/windows/userdataplugins/test_heat.py
+++ b/cloudbaseinit/tests/plugins/windows/userdataplugins/test_heat.py
@@ -15,6 +15,7 @@
 #    under the License.
 
 import mock
+import os
 import unittest
 
 from oslo.config import cfg
@@ -31,25 +32,36 @@ class HeatUserDataHandlerTests(unittest.TestCase):
 
     @mock.patch('os.path.exists')
     @mock.patch('os.makedirs')
-    def test_check_heat_config_dir(self, mock_makedirs, mock_exists):
+    @mock.patch('os.path.dirname')
+    def test_check_heat_config_dir(self, mock_dirname, mock_makedirs,
+                                   mock_exists):
         mock_exists.return_value = False
-        self._heat._check_heat_config_dir()
-        mock_exists.assert_called_once_with(CONF.heat_config_dir)
-        mock_makedirs.assert_called_once_with(CONF.heat_config_dir)
+        fake_path = mock.sentinel.fake_path
+        fake_dir = mock.sentinel.fake_dir
+        mock_dirname.return_value = fake_dir
+
+        self._heat._check_dir(file_name=fake_path)
+
+        mock_dirname.assert_called_once_with(fake_path)
+        mock_exists.assert_called_once_with(fake_dir)
+        mock_makedirs.assert_called_once_with(fake_dir)
 
     @mock.patch('cloudbaseinit.plugins.windows.userdatautils'
                 '.execute_user_data_script')
     @mock.patch('cloudbaseinit.plugins.windows.userdataplugins.heat'
-                '.HeatPlugin._check_heat_config_dir')
-    def _test_process(self, mock_check_heat_config_dir,
-                      mock_execute_user_data_script, filename):
+                '.HeatPlugin._check_dir')
+    def _test_process(self, mock_check_dir, mock_execute_user_data_script,
+                      filename):
         mock_part = mock.MagicMock()
         mock_part.get_filename.return_value = filename
         with mock.patch('six.moves.builtins.open', mock.mock_open(),
                         create=True) as handle:
             response = self._heat.process(mock_part)
+
             handle().write.assert_called_once_with(mock_part.get_payload())
-        mock_check_heat_config_dir.assert_called_once_with()
+
+        path = os.path.join(CONF.heat_config_dir, filename)
+        mock_check_dir.assert_called_once_with(path)
         mock_part.get_filename.assert_called_with()
         if filename == self._heat._heat_user_data_filename:
             mock_execute_user_data_script.assert_called_with(