github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

[Update] 修改cpu的数量问题

pull/1416/head
ibuler 2018-08-15 12:00:47 +08:00
parent 3533bf588b
commit 7ddf7f2a79
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/assets/models/asset.py
View File

@ -100,6 +100,7 @@ class Asset(OrgModelMixin):
verbose_name=_('CPU model')) verbose_name=_('CPU model'))
cpu_count = models.IntegerField(null=True, verbose_name=_('CPU count')) cpu_count = models.IntegerField(null=True, verbose_name=_('CPU count'))
cpu_cores = models.IntegerField(null=True, verbose_name=_('CPU cores')) cpu_cores = models.IntegerField(null=True, verbose_name=_('CPU cores'))
cpu_vcpus = models.IntegerField(null=True, verbose_name=_('CPU vcpus'))
memory = models.CharField(max_length=64, null=True, blank=True, memory = models.CharField(max_length=64, null=True, blank=True,
verbose_name=_('Memory')) verbose_name=_('Memory'))
disk_total = models.CharField(max_length=1024, null=True, blank=True, disk_total = models.CharField(max_length=1024, null=True, blank=True,
@ -171,7 +172,7 @@ class Asset(OrgModelMixin):
def hardware_info(self): def hardware_info(self):
if self.cpu_count: if self.cpu_count:
return '{} Core {} {}'.format( return '{} Core {} {}'.format(
self.cpu_count * self.cpu_cores, self.cpu_vcpus or self.cpu_count * self.cpu_cores,
self.memory, self.disk_total self.memory, self.disk_total
) )
else: else:

1
apps/assets/tasks.py
View File

@ -60,6 +60,7 @@ def set_assets_hardware_info(result, **kwargs):
___cpu_model = ___cpu_model[:64] ___cpu_model = ___cpu_model[:64]
___cpu_count = info.get('ansible_processor_count', 0) ___cpu_count = info.get('ansible_processor_count', 0)
___cpu_cores = info.get('ansible_processor_cores', None) or len(info.get('ansible_processor', [])) ___cpu_cores = info.get('ansible_processor_cores', None) or len(info.get('ansible_processor', []))
___cpu_vcpus = info.get('ansible_processor_vcpus', 0)
___memory = '%s %s' % capacity_convert('{} MB'.format(info.get('ansible_memtotal_mb'))) ___memory = '%s %s' % capacity_convert('{} MB'.format(info.get('ansible_memtotal_mb')))
disk_info = {} disk_info = {}
for dev, dev_info in info.get('ansible_devices', {}).items(): for dev, dev_info in info.get('ansible_devices', {}).items():