From d246b9bb35159a1dd595aa2abbffdae6c3a27228 Mon Sep 17 00:00:00 2001 From: Bai Date: Mon, 20 Feb 2023 17:24:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B5=84=E4=BA=A7?= =?UTF-8?q?=E7=A1=AC=E4=BB=B6=E4=BF=A1=E6=81=AF=E6=94=B6=E9=9B=86=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/automations/gather_facts/manager.py | 2 +- apps/assets/serializers/asset/host.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/assets/automations/gather_facts/manager.py b/apps/assets/automations/gather_facts/manager.py index 877ce811c..5ec25cb17 100644 --- a/apps/assets/automations/gather_facts/manager.py +++ b/apps/assets/automations/gather_facts/manager.py @@ -24,7 +24,7 @@ class GatherFactsManager(BasePlaybookManager): asset = self.host_asset_mapper.get(host) if asset and info: for k, v in info.items(): - info[k] = v.strip() + info[k] = v.strip() if isinstance(v, str) else v asset.info = info asset.save() else: diff --git a/apps/assets/serializers/asset/host.py b/apps/assets/serializers/asset/host.py index dd8d3bc2f..10b06dc20 100644 --- a/apps/assets/serializers/asset/host.py +++ b/apps/assets/serializers/asset/host.py @@ -12,8 +12,7 @@ class HostInfoSerializer(serializers.Serializer): vendor = serializers.CharField(max_length=64, required=False, allow_blank=True, label=_('Vendor')) model = serializers.CharField(max_length=54, required=False, allow_blank=True, label=_('Model')) sn = serializers.CharField(max_length=128, required=False, allow_blank=True, label=_('Serial number')) - - cpu_model = serializers.CharField(max_length=64, required=False, allow_blank=True, label=_('CPU model')) + cpu_model = serializers.ListField(child=serializers.CharField(max_length=64, allow_blank=True), required=False, label=_('CPU model')) cpu_count = serializers.IntegerField(required=False, label=_('CPU count')) cpu_cores = serializers.IntegerField(required=False, label=_('CPU cores')) cpu_vcpus = serializers.IntegerField(required=False, label=_('CPU vcpus'))