From 152c59365f8ed4a918a84f33fa1b65f3c16fe7ef Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Thu, 20 Jun 2019 15:50:28 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=E5=BA=8F=E5=88=97=E7=B1=BB=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E8=B5=84=E4=BA=A7protocols=E7=9A=84=E5=8D=8F=E8=AE=AE=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F/,=20=E5=90=8C=E6=97=B6=E6=B7=BB=E5=8A=A0protocol?=
 =?UTF-8?q?=E5=92=8Cport=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/backends/vault.py    | 10 +---------
 apps/assets/serializers/asset.py | 15 +++++++--------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/apps/assets/backends/vault.py b/apps/assets/backends/vault.py
index da7583458..d21245247 100644
--- a/apps/assets/backends/vault.py
+++ b/apps/assets/backends/vault.py
@@ -1,19 +1,11 @@
 # -*- coding: utf-8 -*-
 #
 
-from ..base import BaseBackend
+from .base import BaseBackend
 
 
 class VaultBackend(BaseBackend):
 
-    @classmethod
-    def get(cls, username, asset):
-        pass
-
     @classmethod
     def filter(cls, username=None, asset=None, latest=True):
         pass
-
-    @classmethod
-    def create(cls, **kwargs):
-        pass
diff --git a/apps/assets/serializers/asset.py b/apps/assets/serializers/asset.py
index c66004ba0..77715b351 100644
--- a/apps/assets/serializers/asset.py
+++ b/apps/assets/serializers/asset.py
@@ -27,8 +27,6 @@ class ProtocolsRelatedField(serializers.RelatedField):
         return str(value)
 
     def to_internal_value(self, data):
-        print(data)
-        print(type(data))
         if isinstance(data, dict):
             return data
         if '/' not in data:
@@ -152,7 +150,9 @@ class AssetGrantedSerializer(serializers.ModelSerializer):
     """
     被授权资产的数据结构
     """
-    protocols = ProtocolSerializer(many=True)
+    protocols = ProtocolsRelatedField(
+        many=True, queryset=Protocol.objects.all(), label=_("Protocols")
+    )
     system_users_granted = AssetSystemUserSerializer(many=True, read_only=True)
     system_users_join = serializers.SerializerMethodField()
     # nodes = NodeTMPSerializer(many=True, read_only=True)
@@ -160,9 +160,9 @@ class AssetGrantedSerializer(serializers.ModelSerializer):
     class Meta:
         model = Asset
         fields = (
-            "id", "hostname", "ip", "protocols", "system_users_granted",
-            "is_active", "system_users_join", "os", 'domain',
-            "platform", "comment", "org_id", "org_name",
+            "id", "hostname", "ip", "protocol", "port", "protocols",
+            "system_users_granted", "is_active", "system_users_join", "os",
+            'domain', "platform", "comment", "org_id", "org_name",
         )
 
     @staticmethod
@@ -187,8 +187,7 @@ class AssetGrantedSerializer(serializers.ModelSerializer):
 
 
 class AssetSimpleSerializer(serializers.ModelSerializer):
-    protocols = ProtocolSerializer(many=True)
 
     class Meta:
         model = Asset
-        fields = ['id', 'hostname', 'ip', 'protocols', 'connectivity', 'port']
+        fields = ['id', 'hostname', 'ip', 'connectivity', 'port']