Skip to content

Commit

Permalink
Rename return_inventory_Source_soptions to load_combined_inventory_so…
Browse files Browse the repository at this point in the history
…urce_options
  • Loading branch information
djyasin committed Oct 22, 2024
1 parent 2168ad3 commit 8f30d54
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions awx/api/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
)

from awx.main.utils.filters import SmartFilter
from awx.main.utils.plugins import return_inventory_source_options
from awx.main.utils.plugins import load_combined_inventory_source_options
from awx.main.utils.named_url_graph import reset_counters
from awx.main.scheduler.task_manager_models import TaskManagerModels
from awx.main.redact import UriCleaner, REPLACE_STR
Expand Down Expand Up @@ -2326,7 +2326,7 @@ class Meta:
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
if 'source' in self.fields:
self.fields['source'].choices = return_inventory_source_options()
self.fields['source'].choices = load_combined_inventory_source_options()

def get_related(self, obj):
res = super(InventorySourceOptionsSerializer, self).get_related(obj)
Expand Down Expand Up @@ -5507,7 +5507,7 @@ def get_summary_fields(self, obj):
return summary_fields

def validate_unified_job_template(self, value):
if type(value) == InventorySource and value.source not in return_inventory_source_options():
if type(value) == InventorySource and value.source not in load_combined_inventory_source_options():
raise serializers.ValidationError(_('Inventory Source must be a cloud resource.'))
elif type(value) == Project and value.scm_type == '':
raise serializers.ValidationError(_('Manual Project cannot have a schedule set.'))
Expand Down
2 changes: 1 addition & 1 deletion awx/main/utils/plugins.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def compute_cloud_inventory_sources() -> dict[str, str]:


@cache
def return_inventory_source_options() -> dict[str, str]:
def load_combined_inventory_source_options() -> dict[str, str]:
"""Return a dictionary of cloud provider plugin names
plus file. File needed to be separate since it is needs to be consumed directly
by the serializer.
Expand Down

0 comments on commit 8f30d54

Please sign in to comment.