External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-10 19:07:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6117 from jangsutsr/dynamic_inv_src_dependency_update

Browse Source 
Dependency updates
This commit is contained in:
Aaron Tan
2017-05-10 09:57:58 -04:00
committed by GitHub
parent 34073e65f5 cfb633e8a6
commit 3099fd7a01
35 changed files with 666 additions and 1022 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
awx/main/tests/functional/api/test_credential.py
View File

@@ -1036,71 +1036,6 @@ def test_aws_create_fail_required_fields(post, organization, admin, version, par
assert 'password' in json.dumps(response.data)
#
# Rackspace Credentials
#
@pytest.mark.django_db
@pytest.mark.parametrize('version, params', [
['v1', {
'kind': 'rax',
'name': 'Best credential ever',
'username': 'some_username',
'password': 'some_password',
}],
['v2', {
'credential_type': 1,
'name': 'Best credential ever',
'inputs': {
'username': 'some_username',
'password': 'some_password',
}
}]
])
def test_rax_create_ok(post, organization, admin, version, params):
rax = CredentialType.defaults['rackspace']()
rax.save()
params['organization'] = organization.id
response = post(
reverse('api:credential_list', kwargs={'version': version}),
params,
admin
)
assert response.status_code == 201
assert Credential.objects.count() == 1
cred = Credential.objects.all()[:1].get()
assert cred.inputs['username'] == 'some_username'
assert decrypt_field(cred, 'password') == 'some_password'
@pytest.mark.django_db
@pytest.mark.parametrize('version, params', [
['v1', {
'kind': 'rax',
'name': 'Best credential ever'
}],
['v2', {
'credential_type': 1,
'name': 'Best credential ever',
'inputs': {}
}]
])
def test_rax_create_fail_required_field(post, organization, admin, version, params):
rax = CredentialType.defaults['rackspace']()
rax.save()
params['organization'] = organization.id
response = post(
reverse('api:credential_list', kwargs={'version': version}),
params,
admin
)
assert response.status_code == 400
assert Credential.objects.count() == 0
assert 'username' in json.dumps(response.data)
assert 'password' in json.dumps(response.data)
#
# VMware vCenter Credentials
#

1
awx/main/tests/functional/test_credential.py
View File

@@ -18,7 +18,6 @@ def test_default_cred_types():
'gce',
'net',
'openstack',
'rackspace',
'satellite6',
'scm',
'ssh',

5
awx/main/tests/functional/test_credential_migration.py
View File

@@ -196,11 +196,6 @@ def test_openstack_migration():
assert Credential.objects.count() == 1
@pytest.mark.skip(reason="TODO: rackspace should be a custom type (we're removing official support)")
def test_rackspace():
pass
@pytest.mark.django_db
def test_vmware_migration():
cred = Credential(name='My Credential')

10
awx/main/tests/functional/test_inventory_source_migration.py
View File

@@ -16,6 +16,16 @@ def test_inv_src_manual_removal(inventory_source):
assert not InventorySource.objects.filter(pk=inventory_source.pk).exists()
@pytest.mark.django_db
def test_rax_inv_src_removal(inventory_source):
inventory_source.source = 'rax'
inventory_source.save()
assert InventorySource.objects.filter(pk=inventory_source.pk).exists()
invsrc.remove_rax_inventory_sources(apps, None)
assert not InventorySource.objects.filter(pk=inventory_source.pk).exists()
@pytest.mark.django_db
def test_inv_src_rename(inventory_source_factory):
inv_src01 = inventory_source_factory('t1')