External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-14 12:57:40 -02:30
Code Issues Packages Projects Releases Wiki Activity

make inventory source naming consistent with v1

Browse Source
This commit is contained in:
AlanCoding
2017-07-11 16:15:33 -04:00
parent 40aac68402
commit 777b1c3023
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/serializers.py
View File

@@ -1390,7 +1390,9 @@ class GroupSerializer(BaseSerializerWithVariables):
def create(self, validated_data): # TODO: remove in 3.3 def create(self, validated_data): # TODO: remove in 3.3
instance = super(GroupSerializer, self).create(validated_data) instance = super(GroupSerializer, self).create(validated_data)
if self.version == 1: # TODO: remove in 3.3 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 return instance
def validate_name(self, value): def validate_name(self, value):

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

@@ -1249,10 +1249,11 @@ class InventorySource(UnifiedJobTemplate, InventorySourceOptions):
replace_text = '__replace_%s__' % now() 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}.*?$') 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: 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: 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: 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: elif not is_new_instance:
self.name = 'inventory source (%s)' % self.pk self.name = 'inventory source (%s)' % self.pk
else: else: