Skip to content

Commit

Permalink
OCP VM Order by vm_name (#5369)
Browse files Browse the repository at this point in the history
* OCP VM Order by vm_name

* switch namespace to project in provider map
  • Loading branch information
lcouzens authored Nov 12, 2024
1 parent 1a4acbe commit b6097ed
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion koku/api/report/ocp/provider_map.py
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,7 @@ def __init__(self, provider, report_type, schema_name):
"request_memory_units": Value("GiB", output_field=CharField()),
"cluster": Max(Coalesce("cluster_alias", "cluster_id")),
"node": Max(F("node")),
"namespace": Max("namespace"),
"project": Max("namespace"),
"source_uuid": ArrayAgg(
F("source_uuid"), filter=Q(source_uuid__isnull=False), distinct=True
),
Expand Down
1 change: 1 addition & 0 deletions koku/api/report/ocp/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ class OCPVirtualMachinesOrderBySerializer(OCPOrderBySerializer):
project = serializers.ChoiceField(choices=OrderSerializer.ORDER_CHOICES, required=False)
cluster = serializers.ChoiceField(choices=OrderSerializer.ORDER_CHOICES, required=False)
node = serializers.ChoiceField(choices=OrderSerializer.ORDER_CHOICES, required=False)
vm_name = serializers.ChoiceField(choices=OrderSerializer.ORDER_CHOICES, required=False)
request_cpu = serializers.ChoiceField(choices=OrderSerializer.ORDER_CHOICES, required=False)
request_memory = serializers.ChoiceField(choices=OrderSerializer.ORDER_CHOICES, required=False)

Expand Down

0 comments on commit b6097ed

Please sign in to comment.