7x31/cmdb
1
0
Fork 0
mirror of https://github.com/veops/cmdb.git synced 2025-08-07 20:48:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(api): rebuild relation by attribute (#462)

Browse Source
This commit is contained in:
pycook
2024-04-03 15:13:43 +08:00
committed by GitHub
parent bd813174b1
commit 099ddd6ca9
7 changed files with 81 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmdb-api/api/views/cmdb/ci.py
View File

@@ -76,6 +76,7 @@ class CIView(APIView):
@has_perm_for_ci("ci_type", ResourceTypeEnum.CI, PermEnum.ADD, lambda x: CITypeCache.get(x))
def post(self):
ci_type = request.values.get("ci_type")
ticket_id = request.values.pop("ticket_id", None)
_no_attribute_policy = request.values.get("no_attribute_policy", ExistPolicy.IGNORE)
exist_policy = request.values.pop('exist_policy', None)
@@ -87,6 +88,7 @@ class CIView(APIView):
exist_policy=exist_policy or ExistPolicy.REJECT,
_no_attribute_policy=_no_attribute_policy,
_is_admin=request.values.pop('__is_admin', None) or False,
ticket_id=ticket_id,
**ci_dict)
return self.jsonify(ci_id=ci_id)
@@ -95,6 +97,7 @@ class CIView(APIView):
def put(self, ci_id=None):
args = request.values
ci_type = args.get("ci_type")
ticket_id = request.values.pop("ticket_id", None)
_no_attribute_policy = args.get("no_attribute_policy", ExistPolicy.IGNORE)
ci_dict = self._wrap_ci_dict()
@@ -102,6 +105,7 @@ class CIView(APIView):
if ci_id is not None:
manager.update(ci_id,
_is_admin=request.values.pop('__is_admin', None) or False,
ticket_id=ticket_id,
**ci_dict)
else:
request.values.pop('exist_policy', None)
@@ -109,6 +113,7 @@ class CIView(APIView):
exist_policy=ExistPolicy.REPLACE,
_no_attribute_policy=_no_attribute_policy,
_is_admin=request.values.pop('__is_admin', None) or False,
ticket_id=ticket_id,
**ci_dict)
return self.jsonify(ci_id=ci_id)
@@ -221,7 +226,6 @@ class CIHeartbeatView(APIView):
class CIFlushView(APIView):
url_prefix = ("/ci/flush", "/ci/<int:ci_id>/flush")
# @auth_abandoned
def get(self, ci_id=None):
from api.tasks.cmdb import ci_cache
from api.lib.cmdb.const import CMDB_QUEUE

4
cmdb-api/api/views/cmdb/ci_type_relation.py
View File

@@ -43,9 +43,9 @@ class CITypeRelationView(APIView):
@role_required(RoleEnum.CONFIG)
def get(self):
res = CITypeRelationManager.get()
res, type2attributes = CITypeRelationManager.get()
return self.jsonify(res)
return self.jsonify(relations=res, type2attributes=type2attributes)
@has_perm_from_args("parent_id", ResourceTypeEnum.CI, PermEnum.CONFIG, CITypeManager.get_name_by_id)
@args_required("relation_type_id")