Realize /api/v0.1/ci_relations/s [done]

api/views/cmdb/ci.py

@@ -12,9 +12,9 @@ from api.lib.cmdb.ci import CIManager
 from api.lib.cmdb.const import ExistPolicy
 from api.lib.cmdb.const import ResourceType, PermEnum
 from api.lib.cmdb.const import RetKey
-from api.lib.cmdb.search.db.search import Search as SearchFromDB
-from api.lib.cmdb.search.es.search import Search as SearchFromES
-from api.lib.cmdb.search.db.search import SearchError
+from api.lib.cmdb.search import SearchError
+from api.lib.cmdb.search.ci.db.search import Search as SearchFromDB
+from api.lib.cmdb.search.ci.es.search import Search as SearchFromES
 from api.lib.perm.acl.acl import has_perm_from_args
 from api.lib.perm.auth import auth_abandoned
 from api.lib.utils import get_page
@@ -126,13 +126,13 @@ class CISearchView(APIView):
     def get(self):
         """@params: q: query statement
                     fl: filter by column
-                    count: the number of ci
+                    count/page_size: the number of ci
                     ret_key: id, name, alias
                     facet: statistic
         """
 
         page = get_page(request.values.get("page", 1))
-        count = get_page_size(request.values.get("count"))
+        count = get_page_size(request.values.get("count") or request.values.get("page_size"))
 
         query = request.values.get('q', "")
         fl = handle_arg_list(request.values.get('fl', ""))
@@ -140,8 +140,6 @@ class CISearchView(APIView):
         if ret_key not in (RetKey.NAME, RetKey.ALIAS, RetKey.ID):
             ret_key = RetKey.NAME
         facet = handle_arg_list(request.values.get("facet", ""))
-        fl = list(filter(lambda x: x != "", fl))
-        facet = list(filter(lambda x: x != "", facet))
         sort = request.values.get("sort")
 
         start = time.time()

api/views/cmdb/ci_relation.py

@@ -1,14 +1,62 @@
 # -*- coding:utf-8 -*- 
 
 
+import time
+
+from flask import abort
+from flask import current_app
 from flask import request
 
 from api.lib.cmdb.ci import CIRelationManager
+from api.lib.cmdb.search import SearchError
+from api.lib.cmdb.search.ci_relation.search import Search
+from api.lib.perm.auth import auth_abandoned
 from api.lib.utils import get_page
 from api.lib.utils import get_page_size
+from api.lib.utils import handle_arg_list
 from api.resource import APIView
 
 
+class CIRelationSearchView(APIView):
+    url_prefix = ("/ci_relations/s", "/ci_relations/search")
+
+    @auth_abandoned
+    def get(self):
+        """@params: q: query statement
+                    fl: filter by column
+                    count: the number of ci
+                    root_id: ci id
+                    level: default is 1
+                    facet: statistic
+        """
+
+        page = get_page(request.values.get("page", 1))
+        count = get_page_size(request.values.get("count") or request.values.get("page_size"))
+
+        root_id = request.values.get('root_id')
+        level = request.values.get('level', 1)
+
+        query = request.values.get('q', "")
+        fl = handle_arg_list(request.values.get('fl', ""))
+        facet = handle_arg_list(request.values.get("facet", ""))
+        sort = request.values.get("sort")
+
+        start = time.time()
+        s = Search(root_id, level, query, fl, facet, page, count, sort)
+        try:
+            response, counter, total, page, numfound, facet = s.search()
+        except SearchError as e:
+            return abort(400, str(e))
+        current_app.logger.debug("search time is :{0}".format(time.time() - start))
+
+        return self.jsonify(numfound=numfound,
+                            total=total,
+                            page=page,
+                            facet=facet,
+                            counter=counter,
+                            result=response)
+
+
 class GetSecondCIsView(APIView):
     url_prefix = "/ci_relations/<int:first_ci_id>/second_cis"
 

api/views/cmdb/ci_type_relation.py

@@ -25,18 +25,26 @@ class GetParentsView(APIView):
 
 
 class CITypeRelationView(APIView):
-    url_prefix = "/ci_type_relations/<int:parent_id>/<int:child_id>"
+    url_prefix = ("/ci_type_relations", "/ci_type_relations/<int:parent_id>/<int:child_id>")
+
+    @role_required(RoleEnum.CONFIG)
+    def get(self):
+        res = CITypeRelationManager.get()
+
+        return self.jsonify(res)
 
     @role_required(RoleEnum.CONFIG)
     @args_required("relation_type_id")
     def post(self, parent_id, child_id):
         relation_type_id = request.values.get("relation_type_id")
         ctr_id = CITypeRelationManager.add(parent_id, child_id, relation_type_id)
+
         return self.jsonify(ctr_id=ctr_id)
 
     @role_required(RoleEnum.CONFIG)
     def delete(self, parent_id, child_id):
         CITypeRelationManager.delete_2(parent_id, child_id)
+
         return self.jsonify(code=200, parent_id=parent_id, child_id=child_id)
 
 
@@ -46,4 +54,5 @@ class CITypeRelationDelete2View(APIView):
     @role_required(RoleEnum.CONFIG)
     def delete(self, ctr_id):
         CITypeRelationManager.delete(ctr_id)
+
         return self.jsonify(code=200, ctr_id=ctr_id)