shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 16:51:11 +03:00
Code Releases Activity

add a few minor optimizations and some refactoring for multi-cred

Browse Source
This commit is contained in:
Ryan Petrello 2017-11-14 16:47:28 -05:00
parent eb140d9e69
commit fa09d68603
No known key found for this signature in database
GPG Key ID: F2AA5F2122351777
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/views.py
View File

@ -2998,7 +2998,7 @@ class JobTemplateExtraCredentialsList(JobTemplateCredentialsList):
def get_queryset(self):
sublist_qs = super(JobTemplateExtraCredentialsList, self).get_queryset()
sublist_qs = sublist_qs.filter(**{'credential_type__kind__in': ['cloud', 'net']})
sublist_qs = sublist_qs.filter(credential_type__kind__in=['cloud', 'net'])
return sublist_qs
def is_valid_relation(self, parent, sub, created=False):
@ -3794,7 +3794,7 @@ class JobExtraCredentialsList(JobCredentialsList):
def get_queryset(self):
sublist_qs = super(JobExtraCredentialsList, self).get_queryset()
sublist_qs = sublist_qs.filter(**{'credential_type__kind__in': ['cloud', 'net']})
sublist_qs = sublist_qs.filter(credential_type__kind__in=['cloud', 'net'])
return sublist_qs

6
awx/main/models/jobs.py
View File

@ -166,11 +166,11 @@ class JobOptions(BaseModel):
@property
def network_credentials(self):
return [cred for cred in self.credentials.all() if cred.credential_type.kind == 'net']
return list(self.credentials.filter(credential_type__kind='net'))
@property
def cloud_credentials(self):
return [cred for cred in self.credentials.all() if cred.credential_type.kind == 'cloud']
return list(self.credentials.filter(credential_type__kind='cloud'))
@property
def credential(self):
@ -186,7 +186,7 @@ class JobOptions(BaseModel):
def get_deprecated_credential(self, kind):
try:
return [cred for cred in self.credentials.all() if cred.credential_type.kind == kind][0]
return self.credentials.filter(credential_type__kind=kind).first()
except IndexError:
return None

15
awx/main/tests/unit/test_tasks.py
View File

@ -245,12 +245,15 @@ class TestJobExecution:
# mock the job.credentials M2M relation so we can avoid DB access
job._credentials = []
patch = mock.patch.object(UnifiedJob, 'credentials', mock.Mock(
all=lambda: job._credentials,
add=job._credentials.append,
filter=mock.Mock(return_value=job._credentials),
spec_set=['all', 'add', 'filter']
))
patch = mock.patch.object(UnifiedJob, 'credentials', mock.Mock(**{
'all': lambda: job._credentials,
'add': job._credentials.append,
'filter.return_value': mock.Mock(
__iter__ = lambda *args: iter(job._credentials),
first = lambda: job._credentials[0]
),
'spec_set': ['all', 'add', 'filter']
}))
self.patches.append(patch)
patch.start()