nofusscomputing/centurion_erp
1
0
Fork 0
Code Issues Wiki Activity

feat(itam): render group software config within device rendered config

Browse Source 
!22 #43
This commit is contained in:
Jon Lockwood
2024-06-08 07:18:16 +09:30
parent 0c382a73e5
commit 460eff1f71
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/itam/models/device.py
View File

@ -5,8 +5,9 @@ from django.db import models
from access.fields import * from access.fields import *
from access.models import TenancyObject from access.models import TenancyObject
from core.mixin.history_save import SaveHistory from app.helpers.merge_software import merge_software
from core.mixin.history_save import SaveHistory
from itam.models.device_common import DeviceCommonFields, DeviceCommonFieldsName from itam.models.device_common import DeviceCommonFields, DeviceCommonFieldsName
from itam.models.device_models import DeviceModel from itam.models.device_models import DeviceModel
@ -94,6 +95,9 @@ class Device(DeviceCommonFieldsName, SaveHistory):
"software": [] "software": []
} }
host_software = []
group_software = []
for software in softwares: for software in softwares:
if software.action: if software.action:
@ -115,7 +119,7 @@ class Device(DeviceCommonFieldsName, SaveHistory):
if software.version: if software.version:
software_action['version'] = software.version.name software_action['version'] = software.version.name
config['software'] = config['software'] + [ software_action ] host_software += [ software_action ]
config: dict = config config: dict = config
@ -131,7 +135,15 @@ class Device(DeviceCommonFieldsName, SaveHistory):
if rendered_config: if rendered_config:
config.update(json.loads(group.group.render_config())) config.update(json.loads(rendered_config))
rendered_config: dict = json.loads(rendered_config)
if 'software' in rendered_config.keys():
group_software = group_software + rendered_config['software']
config['software'] = merge_software(group_software, host_software)
return config return config