[Update] 修改cpu的数量问题

apps/assets/models/asset.py

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

apps/assets/tasks.py

@@ -60,6 +60,7 @@ def set_assets_hardware_info(result, **kwargs):
         ___cpu_model = ___cpu_model[:64]
         ___cpu_count = info.get('ansible_processor_count', 0)
         ___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')))
         disk_info = {}
         for dev, dev_info in info.get('ansible_devices', {}).items():