← Back to branch summary

~niedbalski/charm-helpers/fetch_is-package-installed

« back to all changes in this revision

Viewing changes to tests/contrib/openstack/test_os_contexts.py

  • Committer: Marco Ceppi
  • Date: 2014-04-02 16:53:53 UTC
  • mfrom: (107.2.18 charm-helpers)
  • Revision ID: marco@ceppi.net-20140402165353-x7fey0m92rona817
[james-page] Look for tenant_id in identity context

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/contrib/openstack/test_os_contexts.py
85
85
    'auth_host': 'keystone-host.local',
86
86
    'auth_port': '35357',
87
87
    'service_tenant': 'admin',
 
88
    'service_tenant_id': '123456',
88
89
    'service_password': 'foo',
89
90
    'service_username': 'adam',
90
91
    'service_protocol': 'http',
365
366
        expected = {
366
367
            'admin_password': 'foo',
367
368
            'admin_tenant_name': 'admin',
 
369
            'admin_tenant_id': None,
368
370
            'admin_user': 'adam',
369
371
            'auth_host': 'keystone-host.local',
370
372
            'auth_port': '35357',
384
386
        expected = {
385
387
            'admin_password': 'foo',
386
388
            'admin_tenant_name': 'admin',
 
389
            'admin_tenant_id': '123456',
387
390
            'admin_user': 'adam',
388
391
            'auth_host': 'keystone-host.local',
389
392
            'auth_port': '35357',
403
406
        expected = {
404
407
            'admin_password': 'foo',
405
408
            'admin_tenant_name': 'admin',
 
409
            'admin_tenant_id': None,
406
410
            'admin_user': 'adam',
407
411
            'auth_host': 'keystone-host.local',
408
412
            'auth_port': '35357',