Instance call build_userdata directly

get_mime_string is only ever called once so caching the results
in self.mime_string is not necessary.

Change-Id: I36a1eb358b1228a946c5f8fa6e76869f10c398fd

heat/engine/resources/instance.py

@@ -191,7 +191,6 @@ class Instance(resource.Resource):
     def __init__(self, name, json_snippet, stack):
         super(Instance, self).__init__(name, json_snippet, stack)
         self.ipaddress = None
-        self.mime_string = None
 
     def _set_ipaddress(self, networks):
         '''
@@ -278,11 +277,6 @@ class Instance(resource.Resource):
             security_groups = None
         return security_groups
 
-    def get_mime_string(self, userdata):
-        if not self.mime_string:
-            self.mime_string = nova_utils.build_userdata(self, userdata)
-        return self.mime_string
-
     def _get_nova_metadata(self, properties):
         if properties is None or properties.get('Tags') is None:
             return None
@@ -327,7 +321,7 @@ class Instance(resource.Resource):
                 flavor=flavor_id,
                 key_name=key_name,
                 security_groups=security_groups,
-                userdata=self.get_mime_string(userdata),
+                userdata=nova_utils.build_userdata(self, userdata),
                 meta=self._get_nova_metadata(self.properties),
                 scheduler_hints=scheduler_hints,
                 nics=nics,

heat/tests/test_engine_service.py

@@ -158,7 +158,11 @@ def setup_mocks(mocks, stack):
     instance = stack['WebServer']
     user_data = instance.properties['UserData']
     server_userdata = nova_utils.build_userdata(instance, user_data)
-    instance.mime_string = server_userdata
+    mocks.StubOutWithMock(nova_utils, 'build_userdata')
+    nova_utils.build_userdata(
+        instance,
+        instance.t['Properties']['UserData']).AndReturn(server_userdata)
+
     mocks.StubOutWithMock(fc.servers, 'create')
     fc.servers.create(image=744, flavor=3, key_name='test',
                       name=utils.PhysName(stack.name, 'WebServer'),

heat/tests/test_instance.py

@@ -94,7 +94,12 @@ class InstancesTest(HeatTestCase):
             server_userdata = nova_utils.build_userdata(
                 instance,
                 instance.t['Properties']['UserData'])
-            instance.mime_string = server_userdata
+            self.m.StubOutWithMock(nova_utils, 'build_userdata')
+            nova_utils.build_userdata(
+                instance,
+                instance.t['Properties']['UserData']).AndReturn(
+                    server_userdata)
+
             self.m.StubOutWithMock(self.fc.servers, 'create')
             self.fc.servers.create(
                 image=1, flavor=1, key_name='test',

heat/tests/test_instance_network.py

@@ -177,7 +177,11 @@ class instancesTest(HeatTestCase):
         server_userdata = nova_utils.build_userdata(
             instance,
             instance.t['Properties']['UserData'])
-        instance.mime_string = server_userdata
+        self.m.StubOutWithMock(nova_utils, 'build_userdata')
+        nova_utils.build_userdata(
+            instance,
+            instance.t['Properties']['UserData']).AndReturn(server_userdata)
+
         self.m.StubOutWithMock(self.fc.servers, 'create')
         self.fc.servers.create(
             image=1, flavor=3, key_name='test',
@@ -225,7 +229,11 @@ class instancesTest(HeatTestCase):
         server_userdata = nova_utils.build_userdata(
             instance,
             instance.t['Properties']['UserData'])
-        instance.mime_string = server_userdata
+        self.m.StubOutWithMock(nova_utils, 'build_userdata')
+        nova_utils.build_userdata(
+            instance,
+            instance.t['Properties']['UserData']).AndReturn(server_userdata)
+
         self.m.StubOutWithMock(self.fc.servers, 'create')
         self.fc.servers.create(
             image=1, flavor=3, key_name='test',

heat/tests/test_nokey.py

@@ -67,7 +67,11 @@ class nokeyTest(HeatTestCase):
         server_userdata = nova_utils.build_userdata(
             instance,
             instance.t['Properties']['UserData'])
-        instance.mime_string = server_userdata
+        self.m.StubOutWithMock(nova_utils, 'build_userdata')
+        nova_utils.build_userdata(
+            instance,
+            instance.t['Properties']['UserData']).AndReturn(server_userdata)
+
         self.m.StubOutWithMock(self.fc.servers, 'create')
         self.fc.servers.create(
             image=1, flavor=1, key_name=None,

heat/tests/test_server_tags.py

@@ -149,7 +149,11 @@ class ServerTagsTest(HeatTestCase):
         server_userdata = nova_utils.build_userdata(
             instance,
             instance.t['Properties']['UserData'])
-        instance.mime_string = server_userdata
+        self.m.StubOutWithMock(nova_utils, 'build_userdata')
+        nova_utils.build_userdata(
+            instance,
+            instance.t['Properties']['UserData']).AndReturn(server_userdata)
+
         self.m.StubOutWithMock(self.fc.servers, 'create')
         self.fc.servers.create(
             image=1, flavor=1, key_name='test',