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

Updated inventory role/resource model to better match the spec

Browse Source
This commit is contained in:
Akita Noek
2016-01-29 15:25:26 -05:00
parent 1cd8f6f46a
commit 4d080497cc
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
awx/main/models/inventory.py
View File

@@ -105,6 +105,12 @@ class Inventory(CommonModel, ResourceMixin):
resource_field='resource', resource_field='resource',
permissions = { 'read': True } permissions = { 'read': True }
) )
updater_role = ImplicitRoleField(
role_name='Inventory Updater',
)
executor_role = ImplicitRoleField(
role_name='Inventory Executor',
)
def get_absolute_url(self): def get_absolute_url(self):
return reverse('api:inventory_detail', args=(self.pk,)) return reverse('api:inventory_detail', args=(self.pk,))
@@ -330,7 +336,7 @@ class Inventory(CommonModel, ResourceMixin):
return self.groups.exclude(parents__pk__in=group_pks).distinct() return self.groups.exclude(parents__pk__in=group_pks).distinct()
class Host(CommonModelNameNotUnique): class Host(CommonModelNameNotUnique, ResourceMixin):
''' '''
A managed node A managed node
''' '''
@@ -548,6 +554,14 @@ class Group(CommonModelNameNotUnique, ResourceMixin):
resource_field='resource', resource_field='resource',
permissions = { 'read': True } permissions = { 'read': True }
) )
updater_role = ImplicitRoleField(
role_name='Inventory Group Updater',
parent_role='inventory.updater_role'
)
executor_role = ImplicitRoleField(
role_name='Inventory Group Executor',
parent_role='inventory.executor_role'
)
def __unicode__(self): def __unicode__(self):
return self.name return self.name
@@ -1118,24 +1132,6 @@ class InventorySource(UnifiedJobTemplate, InventorySourceOptions, ResourceMixin)
update_cache_timeout = models.PositiveIntegerField( update_cache_timeout = models.PositiveIntegerField(
default=0, default=0,
) )
admin_role = ImplicitRoleField(
role_name='Inventory Group Administrator',
parent_role=[
'group.admin_role',
'inventory.admin_role',
],
resource_field='resource',
permissions = { 'all': True }
)
auditor_role = ImplicitRoleField(
role_name='Inventory Group Auditor',
parent_role=[
'group.auditor_role',
'inventory.auditor_role',
],
resource_field='resource',
permissions = { 'read': True }
)
@classmethod @classmethod
def _get_unified_job_class(cls): def _get_unified_job_class(cls):