7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix update ci

This commit is contained in:
pycook 2023-08-22 11:34:40 +08:00
parent 590565bdf0
commit 8296e9a552
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmdb-api/api/app.py
View File

@ -6,13 +6,13 @@ import logging
import os import os
import sys import sys
from inspect import getmembers from inspect import getmembers
from flask.json.provider import DefaultJSONProvider
from logging.handlers import RotatingFileHandler from logging.handlers import RotatingFileHandler
from flask import Flask from flask import Flask
from flask import jsonify, make_response from flask import jsonify, make_response
from flask.blueprints import Blueprint from flask.blueprints import Blueprint
from flask.cli import click from flask.cli import click
from flask.json.provider import DefaultJSONProvider
import api.views.entry import api.views.entry
from api.extensions import (bcrypt, cache, celery, cors, db, es, login_manager, migrate, rd) from api.extensions import (bcrypt, cache, celery, cors, db, es, login_manager, migrate, rd)
@ -173,9 +173,8 @@ def register_commands(app):
for root, _, files in os.walk(os.path.join(HERE, "commands")): for root, _, files in os.walk(os.path.join(HERE, "commands")):
for filename in files: for filename in files:
if not filename.startswith("_") and filename.endswith("py"): if not filename.startswith("_") and filename.endswith("py"):
module_path = os.path.join(HERE, root[root.index("commands"):]) if root not in sys.path:
if module_path not in sys.path: sys.path.insert(1, root)
sys.path.insert(1, module_path)
command = __import__(os.path.splitext(filename)[0]) command = __import__(os.path.splitext(filename)[0])
func_list = [o[0] for o in getmembers(command) if isinstance(o[1], click.core.Command)] func_list = [o[0] for o in getmembers(command) if isinstance(o[1], click.core.Command)]
for func_name in func_list: for func_name in func_list:

5
cmdb-api/api/resource.py
View File

@ -34,9 +34,8 @@ def register_resources(resource_path, rest_api):
for root, _, files in os.walk(os.path.join(resource_path)): for root, _, files in os.walk(os.path.join(resource_path)):
for filename in files: for filename in files:
if not filename.startswith("_") and filename.endswith("py"): if not filename.startswith("_") and filename.endswith("py"):
module_path = os.path.join(API_PACKAGE, root[root.index("views"):]) if root not in sys.path:
if module_path not in sys.path: sys.path.insert(1, root)
sys.path.insert(1, module_path)
view = __import__(os.path.splitext(filename)[0]) view = __import__(os.path.splitext(filename)[0])
resource_list = [o[0] for o in getmembers(view) if isclass(o[1]) and issubclass(o[1], Resource)] resource_list = [o[0] for o in getmembers(view) if isclass(o[1]) and issubclass(o[1], Resource)]
resource_list = [i for i in resource_list if i != "APIView"] resource_list = [i for i in resource_list if i != "APIView"]

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

@ -106,6 +106,7 @@ class CIView(APIView):
_is_admin=request.values.pop('__is_admin', False), _is_admin=request.values.pop('__is_admin', False),
**ci_dict) **ci_dict)
else: else:
request.values.pop('exist_policy', None)
ci_id = manager.add(ci_type, ci_id = manager.add(ci_type,
exist_policy=ExistPolicy.REPLACE, exist_policy=ExistPolicy.REPLACE,
_no_attribute_policy=_no_attribute_policy, _no_attribute_policy=_no_attribute_policy,