codosdk 1.0.8__tar.gz → 1.0.10__tar.gz

{codosdk-1.0.8 → codosdk-1.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: codosdk
-Version: 1.0.8
+Version: 1.0.10
 Summary: CODO项目的Python SDK
 Home-page: https://github.com/ss1917/codo_sdk/
 Author: shenshuo
@@ -31,5 +31,15 @@ Requires-Dist: loguru>=0.6.0
 Requires-Dist: cryptography==42.0.4
 Requires-Dist: ldap3==2.9
 Requires-Dist: pydantic>=1.10.5
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: platform
+Dynamic: requires-dist
+Dynamic: summary
 
 SDK of the operation and maintenance script logs operate

{codosdk-1.0.8 → codosdk-1.0.10}/codosdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: codosdk
-Version: 1.0.8
+Version: 1.0.10
 Summary: CODO项目的Python SDK
 Home-page: https://github.com/ss1917/codo_sdk/
 Author: shenshuo
@@ -31,5 +31,15 @@ Requires-Dist: loguru>=0.6.0
 Requires-Dist: cryptography==42.0.4
 Requires-Dist: ldap3==2.9
 Requires-Dist: pydantic>=1.10.5
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: platform
+Dynamic: requires-dist
+Dynamic: summary
 
 SDK of the operation and maintenance script logs operate

{codosdk-1.0.8 → codosdk-1.0.10}/setup.py

@@ -9,7 +9,7 @@ desc   : CODO SDK
 import sys
 from distutils.core import setup
 
-VERSION = '1.0.8'
+VERSION = '1.0.10'
 
 if sys.version_info < (2, 7) or (3, 0) <= sys.version_info < (3, 6):
     print('This program requires at least Python 2.7 or 3.6 to run.')

codosdk-1.0.10/websdk2/apis/cmdb_apis.py

@@ -0,0 +1,47 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+Contact : 191715030@qq.com
+Author  : shenshuo
+Date    : 2018年2月5日13:37:54
+Desc    ：记录 CMDB API
+"""
+
+
+class CMDBAPIS:
+    cmdb_prefix = "/api/cmdb"
+
+    get_tag_list = dict(
+        method='GET',
+        url=f'{cmdb_prefix}/api/v2/cmdb/tag/list/',
+        params={
+            'page_number': '1',  # 分页/第几页
+            'page_size': '200',  # 分页/每页多少个
+            "tag_key": None
+        },
+        description='CMDB 获取标签key、value列表'
+    )
+
+    get_service_tree = dict(method='GET',
+                            url=f'{cmdb_prefix}/api/v2/cmdb/tree/',
+                            params={"biz_id": "0"},
+                            description='获取当前业务服务树')
+
+    get_dynamic_groups = dict(method='GET',
+                              url=f'{cmdb_prefix}/api/v2/cmdb/biz/dynamic_group/list/',
+                              params={
+                                  "biz_id": ""
+                              },
+                              description='获取当前业务下动态分组')
+
+    get_dynamic_group_details = dict(method='GET',
+                                     url=f'{cmdb_prefix}/api/v2/cmdb/biz/dynamic_group/preview/',
+                                     params={
+                                     },
+                                     description='获取动态分组详细数据')
+
+    get_tree_asset_server = dict(method='GET',
+                                 url=f'{cmdb_prefix}/api/v2/cmdb/tree/asset/server',
+                                 params={
+                                 },
+                                 description='根据业务获取资源信息')

{codosdk-1.0.8 → codosdk-1.0.10}/websdk2/tools.py

@@ -11,18 +11,22 @@ import re
 import time
 import redis
 import subprocess
+from threading import Lock
 from concurrent.futures import ThreadPoolExecutor
 from .consts import const
 
+
 def singleton(class_):
     instances = {}
+    lock = Lock()  # 线程锁
 
-    def getinstance(*args, **kwargs):
-        if class_ not in instances:
-            instances[class_] = class_(*args, **kwargs)
+    def get_instance(*args, **kwargs):
+        with lock:  # 确保线程安全
+            if class_ not in instances:
+                instances[class_] = class_(*args, **kwargs)
         return instances[class_]
 
-    return getinstance
+    return get_instance
 
 
 def bytes_to_unicode(input_bytes):

codosdk-1.0.8/websdk2/apis/cmdb_apis.py

@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-"""
-Contact : 191715030@qq.com
-Author  : shenshuo
-Date    : 2018年2月5日13:37:54
-Desc    ：记录API
-"""
-
-
-class CMDBAPIS:
-    cmdb_prefix = "/api/cmdb"
-    create_jobs = dict(method='GET',
-                       url=f'{cmdb_prefix}/api/v2/cmdb/tag/list/',
-                       params={
-                           'page_number': '1',  ### 分页/第几页
-                           'page_size': '200',  ### 分页/每页多少个
-                           "tag_key": None
-                       },
-                       field_help={
-                       },
-                       description='CMDB 获取标签key、value列表')