From 4bbdce347883f4938cdbd4981c8cf0126709a968 Mon Sep 17 00:00:00 2001 From: Rebeccah Date: Tue, 22 Oct 2019 15:57:06 -0400 Subject: [PATCH] removed policy_instance variables from container groups default values in the API put/patch view --- awx/api/generics.py | 11 +++++------ awx/api/serializers.py | 2 +- awx/main/utils/common.py | 4 ---- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/awx/api/generics.py b/awx/api/generics.py index ee6db9634d..4f595cb384 100644 --- a/awx/api/generics.py +++ b/awx/api/generics.py @@ -318,12 +318,11 @@ class GenericAPIView(generics.GenericAPIView, APIView): if getattr(field, 'read_only', None): del serializer.fields[name] # Additionally, remove the following fields if an instance group is containerized. - if name == 'is_containerized': - import sdb - sdb.set_trace() - del serializer.fields['policy_instance_percentage'] - del serializer.fields['policy_instance_minimum'] - del serializer.fields['policy_instance_list'] + if name == 'is_containerized' and type(serializer) == InstanceGroupSerializer: + if serializer.instance is not None and serializer.instance.is_containerized: + del serializer.fields['policy_instance_percentage'] + del serializer.fields['policy_instance_minimum'] + del serializer.fields['policy_instance_list'] serializer._data = self.update_raw_data(serializer.data) return serializer diff --git a/awx/api/serializers.py b/awx/api/serializers.py index c4f86a9842..816a7bf4e0 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -4802,7 +4802,7 @@ class InstanceGroupSerializer(BaseSerializer): if self.instance and self.instance.controller_id is not None: raise serializers.ValidationError(_('Isolated instance group membership may not be managed via the API.')) if self.instance.is_containerized: - raise serializers.ValidationError(_('Containerized instances may not be managed via the API')) + raise serializers.ValidationError(_('Containerized instances may not be managed via the API')) return value def validate_policy_instance_percentage(self, value): diff --git a/awx/main/utils/common.py b/awx/main/utils/common.py index e7603fb037..11e4722f5f 100644 --- a/awx/main/utils/common.py +++ b/awx/main/utils/common.py @@ -366,10 +366,6 @@ def get_allowed_fields(obj, serializer_mapping): field_blacklist = ACTIVITY_STREAM_FIELD_EXCLUSIONS.get(obj._meta.model_name, []) if field_blacklist: allowed_fields = [f for f in allowed_fields if f not in field_blacklist] - # raise Exception(_("please render this")) - # if obj.__class__.__name__ == 'InstanceGroup' and obj.is_containerized: - # container_group_blacklist = ["policy_instance_percentage", "policy_instance_minimum", "policy_instance_list"] - # allowed_fields = [f for f in allowed_fields if f not in container_group_blacklist] return allowed_fields