diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 2e5fff3e0a..8096799db0 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -1390,7 +1390,9 @@ class GroupSerializer(BaseSerializerWithVariables): def create(self, validated_data): # TODO: remove in 3.3 instance = super(GroupSerializer, self).create(validated_data) if self.version == 1: # TODO: remove in 3.3 - InventorySource.objects.create(deprecated_group=instance, inventory=instance.inventory) + manual_src = InventorySource(deprecated_group=instance, inventory=instance.inventory) + manual_src.v1_group_name = instance.name + manual_src.save() return instance def validate_name(self, value): diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py index f88f838087..7bddaf727d 100644 --- a/awx/main/models/inventory.py +++ b/awx/main/models/inventory.py @@ -1249,10 +1249,11 @@ class InventorySource(UnifiedJobTemplate, InventorySourceOptions): replace_text = '__replace_%s__' % now() old_name_re = re.compile(r'^inventory_source \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.*?$') if not self.name or old_name_re.match(self.name) or '__replace_' in self.name: + group_name = getattr(self, 'v1_group_name', '') if self.inventory and self.pk: - self.name = '%s (%s)' % (self.inventory.name, self.pk) + self.name = '%s (%s - %s)' % (group_name, self.inventory.name, self.pk) elif self.inventory: - self.name = '%s (%s)' % (self.inventory.name, replace_text) + self.name = '%s (%s - %s)' % (group_name, self.inventory.name, replace_text) elif not is_new_instance: self.name = 'inventory source (%s)' % self.pk else: