← Back to branch summary

~ubuntu-branches/ubuntu/trusty/heat/trusty-security

« back to all changes in this revision

Viewing changes to heat/tests/test_instance_network.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2013-09-08 21:51:19 UTC
  • mto: This revision was merged to the branch mainline in revision 14.
  • Revision ID: package-import@ubuntu.com-20130908215119-7tcek6gn73275x5k
Tags: upstream-2013.2~b3
Import upstream version 2013.2~b3

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/tests/test_instance_network.py
17
17
from heat.tests.v1_1 import fakes
18
18
from heat.engine.resources import instance as instances
19
19
from heat.engine.resources import network_interface as network_interfaces
 
20
from heat.engine.resources import nova_utils
20
21
from heat.common import template_format
21
22
from heat.engine import parser
22
23
from heat.engine import scheduler
23
24
from heat.openstack.common import uuidutils
24
25
from heat.tests.common import HeatTestCase
25
26
from heat.tests import utils
26
 
from heat.tests.utils import dummy_context
27
 
from heat.tests.utils import setup_dummy_db
28
27
 
29
28
 
30
29
wp_template = '''
149
148
    def setUp(self):
150
149
        super(instancesTest, self).setUp()
151
150
        self.fc = fakes.FakeClient()
152
 
        setup_dummy_db()
 
151
        utils.setup_dummy_db()
153
152
 
154
153
    def _create_test_instance(self, return_server, name):
155
154
        stack_name = '%s_stack' % name
158
157
        kwargs = {'KeyName': 'test',
159
158
                  'InstanceType': 'm1.large',
160
159
                  'SubnetId': '4156c7a5-e8c4-4aff-a6e1-8f3c7bc83861'}
161
 
        stack = parser.Stack(dummy_context(), stack_name, template,
 
160
        stack = parser.Stack(utils.dummy_context(), stack_name, template,
162
161
                             environment.Environment(kwargs),
163
162
                             stack_id=uuidutils.generate_uuid())
164
163
 
175
174
        instance.t = instance.stack.resolve_runtime_data(instance.t)
176
175
 
177
176
        # need to resolve the template functions
178
 
        server_userdata = instance._build_userdata(
 
177
        server_userdata = nova_utils.build_userdata(
 
178
            instance,
179
179
            instance.t['Properties']['UserData'])
180
 
 
 
180
        instance.mime_string = server_userdata
181
181
        self.m.StubOutWithMock(self.fc.servers, 'create')
182
182
        self.fc.servers.create(
183
183
            image=1, flavor=3, key_name='test',
199
199
        kwargs = {'KeyName': 'test',
200
200
                  'InstanceType': 'm1.large',
201
201
                  'SubnetId': '4156c7a5-e8c4-4aff-a6e1-8f3c7bc83861'}
202
 
        stack = parser.Stack(dummy_context(), stack_name, template,
 
202
        stack = parser.Stack(utils.dummy_context(), stack_name, template,
203
203
                             environment.Environment(kwargs),
204
204
                             stack_id=uuidutils.generate_uuid())
205
205
 
222
222
        instance.t = instance.stack.resolve_runtime_data(instance.t)
223
223
 
224
224
        # need to resolve the template functions
225
 
        server_userdata = instance._build_userdata(
 
225
        server_userdata = nova_utils.build_userdata(
 
226
            instance,
226
227
            instance.t['Properties']['UserData'])
 
228
        instance.mime_string = server_userdata
227
229
        self.m.StubOutWithMock(self.fc.servers, 'create')
228
230
        self.fc.servers.create(
229
231
            image=1, flavor=3, key_name='test',