External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-06 03:01:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix old/inventory tests for Credential

Browse Source
This commit is contained in:
Wayne Witzel III
2016-03-24 16:05:31 -04:00
parent ad9bfe9bda
commit 08e9c46c41
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/serializers.py
View File

@@ -1588,10 +1588,6 @@ class CredentialSerializer(BaseSerializer):
activity_stream = reverse('api:credential_activity_stream_list', args=(obj.pk,)), activity_stream = reverse('api:credential_activity_stream_list', args=(obj.pk,)),
access_list = reverse('api:credential_access_list', args=(obj.pk,)), access_list = reverse('api:credential_access_list', args=(obj.pk,)),
)) ))
if obj.user:
res['user'] = reverse('api:user_detail', args=(obj.user.pk,))
if obj.team:
res['team'] = reverse('api:team_detail', args=(obj.team.pk,))
return res return res

13
awx/main/tests/old/inventory.py
View File

@@ -1502,9 +1502,9 @@ class InventoryUpdatesTest(BaseTransactionTest):
self.skipTest('no test ec2 credentials defined!') self.skipTest('no test ec2 credentials defined!')
self.create_test_license_file() self.create_test_license_file()
credential = Credential.objects.create(kind='aws', credential = Credential.objects.create(kind='aws',
user=self.super_django_user,
username=source_username, username=source_username,
password=source_password) password=source_password)
credential.owner_role.members.add(self.super_django_user)
# Set parent group name to one that might be created by the sync. # Set parent group name to one that might be created by the sync.
group = self.group group = self.group
group.name = 'ec2' group.name = 'ec2'
@@ -1588,10 +1588,10 @@ class InventoryUpdatesTest(BaseTransactionTest):
self.skipTest('no test ec2 sts credentials defined!') self.skipTest('no test ec2 sts credentials defined!')
self.create_test_license_file() self.create_test_license_file()
credential = Credential.objects.create(kind='aws', credential = Credential.objects.create(kind='aws',
user=self.super_django_user,
username=source_username, username=source_username,
password=source_password, password=source_password,
security_token=source_token) security_token=source_token)
credential.owner_role.members.add(self.super_django_user)
# Set parent group name to one that might be created by the sync. # Set parent group name to one that might be created by the sync.
group = self.group group = self.group
group.name = 'ec2' group.name = 'ec2'
@@ -1610,10 +1610,11 @@ class InventoryUpdatesTest(BaseTransactionTest):
source_regions = getattr(settings, 'TEST_AWS_REGIONS', 'all') source_regions = getattr(settings, 'TEST_AWS_REGIONS', 'all')
self.create_test_license_file() self.create_test_license_file()
credential = Credential.objects.create(kind='aws', credential = Credential.objects.create(kind='aws',
user=self.super_django_user,
username=source_username, username=source_username,
password=source_password, password=source_password,
security_token="BADTOKEN") security_token="BADTOKEN")
credential.owner_role.members.add(self.super_django_user)
# Set parent group name to one that might be created by the sync. # Set parent group name to one that might be created by the sync.
group = self.group group = self.group
group.name = 'ec2' group.name = 'ec2'
@@ -1645,9 +1646,9 @@ class InventoryUpdatesTest(BaseTransactionTest):
self.skipTest('no test ec2 credentials defined!') self.skipTest('no test ec2 credentials defined!')
self.create_test_license_file() self.create_test_license_file()
credential = Credential.objects.create(kind='aws', credential = Credential.objects.create(kind='aws',
user=self.super_django_user,
username=source_username, username=source_username,
password=source_password) password=source_password)
credential.owner_role.members.add(self.super_django_user)
group = self.group group = self.group
group.name = 'AWS Inventory' group.name = 'AWS Inventory'
group.save() group.save()
@@ -1772,9 +1773,9 @@ class InventoryUpdatesTest(BaseTransactionTest):
self.skipTest('no test rackspace credentials defined!') self.skipTest('no test rackspace credentials defined!')
self.create_test_license_file() self.create_test_license_file()
credential = Credential.objects.create(kind='rax', credential = Credential.objects.create(kind='rax',
user=self.super_django_user,
username=source_username, username=source_username,
password=source_password) password=source_password)
credential.owner_role.members.add(self.super_django_user)
# Set parent group name to one that might be created by the sync. # Set parent group name to one that might be created by the sync.
group = self.group group = self.group
group.name = 'DFW' group.name = 'DFW'
@@ -1824,10 +1825,10 @@ class InventoryUpdatesTest(BaseTransactionTest):
self.skipTest('no test vmware credentials defined!') self.skipTest('no test vmware credentials defined!')
self.create_test_license_file() self.create_test_license_file()
credential = Credential.objects.create(kind='vmware', credential = Credential.objects.create(kind='vmware',
user=self.super_django_user,
username=source_username, username=source_username,
password=source_password, password=source_password,
host=source_host) host=source_host)
credential.owner_role.members.add(self.super_django_user)
inventory_source = self.update_inventory_source(self.group, inventory_source = self.update_inventory_source(self.group,
source='vmware', credential=credential) source='vmware', credential=credential)
# Check first without instance_id set (to import by name only). # Check first without instance_id set (to import by name only).