← Back to branch summary

~ubuntu-branches/ubuntu/wily/heat/wily-proposed

« back to all changes in this revision

Viewing changes to heat/tests/test_stack_user.py

  • Committer: Package Import Robot
  • Author(s): James Page, Corey Bryant, James Page
  • Date: 2015-03-30 11:11:18 UTC
  • mfrom: (1.1.23)
  • Revision ID: package-import@ubuntu.com-20150330111118-2qpycylx6swu4yhj
Tags: 2015.1~b3-0ubuntu1
[ Corey Bryant ]
* New upstream milestone release for OpenStack kilo:
  - d/control: Align with upstream dependencies.
  - d/p/sudoers_patch.patch: Rebased.
  - d/p/fix-requirements.patch: Rebased.

[ James Page ]
* d/p/fixup-assert-regex.patch: Tweak test to use assertRegexpMatches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/tests/test_stack_user.py
17
17
from heat.common import exception
18
18
from heat.common import short_id
19
19
from heat.common import template_format
20
 
from heat.db import api as db_api
21
20
from heat.engine import resource
 
21
from heat.engine.resources import stack_user
22
22
from heat.engine import scheduler
23
 
from heat.engine import stack_user
 
23
from heat.objects import resource_data as resource_data_object
24
24
from heat.tests import common
25
25
from heat.tests import fakes
26
26
from heat.tests import generic_resource
44
44
                                 generic_resource.StackUserResource)
45
45
        self.fc = fakes.FakeKeystoneClient()
46
46
 
47
 
    def tearDown(self):
48
 
        super(StackUserTest, self).tearDown()
49
 
 
50
47
    def _user_create(self, stack_name, project_id, user_id,
51
48
                     resource_name='user', create_project=True,
52
49
                     password=None):
67
64
 
68
65
        rsrc._store()
69
66
        self.m.StubOutWithMock(short_id, 'get_id')
70
 
        short_id.get_id(rsrc.id).AndReturn('aabbcc')
 
67
        short_id.get_id(rsrc.uuid).AndReturn('aabbcc')
71
68
 
72
69
        self.m.StubOutWithMock(fakes.FakeKeystoneClient,
73
70
                               'create_stack_domain_user')
86
83
 
87
84
        scheduler.TaskRunner(rsrc.create)()
88
85
        self.assertEqual((rsrc.CREATE, rsrc.COMPLETE), rsrc.state)
89
 
        rs_data = db_api.resource_data_get_all(rsrc)
 
86
        rs_data = resource_data_object.ResourceData.get_all(rsrc)
90
87
        self.assertEqual({'user_id': 'auser123'}, rs_data)
91
88
        self.m.VerifyAll()
92
89
 
99
96
 
100
97
        scheduler.TaskRunner(rsrc.create)()
101
98
        self.assertEqual((rsrc.CREATE, rsrc.COMPLETE), rsrc.state)
102
 
        rs_data = db_api.resource_data_get_all(rsrc)
 
99
        rs_data = resource_data_object.ResourceData.get_all(rsrc)
103
100
        self.assertEqual({'user_id': 'auser456'}, rs_data)
104
101
        self.m.VerifyAll()
105
102
 
149
146
 
150
147
        scheduler.TaskRunner(rsrc.create)()
151
148
        self.assertEqual((rsrc.CREATE, rsrc.COMPLETE), rsrc.state)
152
 
        db_api.resource_data_delete(rsrc, 'user_id')
 
149
        resource_data_object.ResourceData.delete(rsrc, 'user_id')
153
150
        scheduler.TaskRunner(rsrc.delete)()
154
151
        self.assertEqual((rsrc.DELETE, rsrc.COMPLETE), rsrc.state)
155
152
        self.m.VerifyAll()
255
252
        self.assertEqual(self.fc.credential_id, kp.id)
256
253
        self.assertEqual(self.fc.access, kp.access)
257
254
        self.assertEqual(self.fc.secret, kp.secret)
258
 
        rs_data = db_api.resource_data_get_all(rsrc)
 
255
        rs_data = resource_data_object.ResourceData.get_all(rsrc)
259
256
        self.assertEqual(self.fc.credential_id, rs_data['credential_id'])
260
257
        self.assertEqual(self.fc.access, rs_data['access_key'])
261
258
        self.assertEqual(self.fc.secret, rs_data['secret_key'])
296
293
        rsrc.data_set('access_key', 'access123')
297
294
        rsrc.data_set('secret_key', 'verysecret')
298
295
        rsrc._delete_keypair()
299
 
        rs_data = db_api.resource_data_get_all(rsrc)
 
296
        rs_data = resource_data_object.ResourceData.get_all(rsrc)
300
297
        self.assertEqual({'user_id': 'auserdel'}, rs_data)
301
298
        self.m.VerifyAll()
302
299
 
328
325
        rsrc.data_set('access_key', 'access123')
329
326
        rsrc.data_set('secret_key', 'verysecret')
330
327
        rsrc._delete_keypair()
331
 
        rs_data = db_api.resource_data_get_all(rsrc)
 
328
        rs_data = resource_data_object.ResourceData.get_all(rsrc)
332
329
        self.assertEqual({'user_id': 'auserdel'}, rs_data)
333
330
        self.m.VerifyAll()
334
331
 
348
345
        self.assertEqual((rsrc.CREATE, rsrc.COMPLETE), rsrc.state)
349
346
        rsrc.data_set('credential_id', 'acredential')
350
347
        rsrc._delete_keypair()
351
 
        rs_data = db_api.resource_data_get_all(rsrc)
 
348
        rs_data = resource_data_object.ResourceData.get_all(rsrc)
352
349
        self.assertEqual({'user_id': 'auserdel'}, rs_data)
353
350
        self.m.VerifyAll()
354
351