Merge branch 'pre' into 'main'

GMT调用区服

See merge request codo/codo-cmdb!126

Author: 沈硕

cmdb/handlers/area_handler.py

@@ -8,16 +8,17 @@
 
 from tornado.concurrent import run_on_executor
 
-
 from libs.base_handler import BaseHandler
 from services.area_service import (
-    get_big_area_list,
-    get_area_list,
-    create_or_update_big_area,
     create_area,
-    delete_big_area,
+    create_or_update_big_area,
     delete_area,
+    delete_big_area,
+    get_area_list,
     get_big_area_detail,
+    get_big_area_detail_for_gmt,
+    get_big_area_list,
+    get_big_area_list_for_gmt,
     update_area,
 )
 from services.env_service import env_checker
@@ -171,11 +172,76 @@ def prepare(self):
         return super().prepare()
 
 
+class CBBBigAreaForGMTHandler(CBBBigAreaHandler):
+    _thread_pool = ThreadPoolExecutor(3)
+
+    @run_on_executor(executor="_thread_pool")
+    def async_get_big_area_list(self):
+        if not self.request_tenantid:
+            biz_id = self.params.get("biz_id")
+        else:
+            biz_id = self.request_tenantid
+        self.params.update(biz_id=biz_id)
+        return get_big_area_list_for_gmt(**self.params)
+
+    async def get(self):
+        res = await self.async_get_big_area_list()
+        return self.write(res)
+
+
+class CBBBigAreaDetailForGMTHandler(BaseHandler, ABC):
+    _thread_pool = ThreadPoolExecutor(3)
+
+    @run_on_executor(executor="_thread_pool")
+    def async_get_big_area_detail(self):
+        if not self.request_tenantid:
+            biz_id = self.params.get("biz_id")
+        else:
+            biz_id = self.request_tenantid
+
+        self.params.update(biz_id=biz_id)
+        return get_big_area_detail_for_gmt(**self.params)
+
+    async def get(self):
+        res = await self.async_get_big_area_detail()
+        return self.write(res)
+
+
+class CBBAreaForGMTHandler(CBBAreaHandler): ...
+
+
 area_urls = [
     (r"/cbb_area/area/", CBBAreaHandler, {"handle_name": "配置平台-区服管理", "method": ["ALL"]}),
     (r"/cbb_area/big_area/", CBBBigAreaHandler, {"handle_name": "配置平台-大区管理", "method": ["ALL"]}),
     (r"/cbb_area/big_area/detail/", CBBBigAreaDetailHandler, {"handle_name": "配置平台-大区详情", "method": ["GET"]}),
-    (r"/cbb_area/without_prd/area/", CBBAreaWithoutPrdHandler, {"handle_name": "配置平台-区服管理-非生产环境", "method": ["ALL"]}),
-    (r"/cbb_area/without_prd/big_area/",CBBBigAreaWithoutPrdHandler, {"handle_name": "配置平台-大区管理-非生产环境", "method": ["ALL"]}),
-    (r"/cbb_area/without_prd/big_area/detail/",CBBBigAreaDetailWithoutPrdHandler, {"handle_name": "配置平台-大区详情-非生产环境", "method": ["GET"]}),
+    (
+        r"/cbb_area/without_prd/area/",
+        CBBAreaWithoutPrdHandler,
+        {"handle_name": "配置平台-区服管理-非生产环境", "method": ["ALL"]},
+    ),
+    (
+        r"/cbb_area/without_prd/big_area/",
+        CBBBigAreaWithoutPrdHandler,
+        {"handle_name": "配置平台-大区管理-非生产环境", "method": ["ALL"]},
+    ),
+    (
+        r"/cbb_area/without_prd/big_area/detail/",
+        CBBBigAreaDetailWithoutPrdHandler,
+        {"handle_name": "配置平台-大区详情-非生产环境", "method": ["GET"]},
+    ),
+    (
+        r"/cbb_area/gmt/big_area/",
+        CBBBigAreaForGMTHandler,
+        {"handle_name": "配置平台-大区管理-GMT专用", "method": ["ALL"]},
+    ),
+    (
+        r"/cbb_area/gmt/big_area/detail/",
+        CBBBigAreaDetailForGMTHandler,
+        {"handle_name": "配置平台-大区详情-GMT专用", "method": ["GET"]},
+    ),
+    (
+        r"/cbb_area/gmt/area/",
+        CBBAreaForGMTHandler,
+        {"handle_name": "配置平台-区服管理-GMT专用", "method": ["ALL"]},
+    ),
 ]

cmdb/handlers/env_handler.py

@@ -77,6 +77,14 @@ def get(self):
         return self.write(res)
 
 
+class EnvListForGMTHandler(BaseHandler, ABC):
+    def get(self):
+        if self.request_tenantid:
+            self.params.update(biz_id=self.request_tenantid)
+        res = get_env_list_for_api_v2(**self.params)
+        return self.write(res)
+
+
 env_urls = [
     (
         r"/cbb_area/env/",
@@ -103,4 +111,9 @@ def get(self):
         EnvListWithoutPrdHandler,
         {"handle_name": "配置平台-环境列表-非生产环境", "method": ["GET"]},
     ),
+    (
+        r"/cbb_area/gmt/env/list/",
+        EnvListForGMTHandler,
+        {"handle_name": "配置平台-环境列表-GMT环境", "method": ["GET"]},
+    ),
 ]

db_sync.py

@@ -19,6 +19,7 @@
 from models.env import Base as EnvBase
 from models.secret import Base as SecretBase
 from models.agent import Base as AgentBase
+from models.cbb_area import Base as CbbAreaBase
 
 
 default_configs = app_settings[const.DB_CONFIG_ITEM][const.DEFAULT_DB_KEY]
@@ -48,6 +49,7 @@ def create():
     EnvBase.metadata.create_all(engine)
     SecretBase.metadata.create_all(engine)
     AgentBase.metadata.create_all(engine)
+    CbbAreaBase.metadata.create_all(engine)
     print('[Success] 表结构创建成功!')
 
 

models/cbb_area.py

@@ -0,0 +1,20 @@
+from sqlalchemy import Column, Integer, String, Text, UniqueConstraint
+from sqlalchemy.ext.declarative import declarative_base
+
+from models.base import TimeBaseModel
+
+Base = declarative_base()
+
+
+class CBBBigAreaModels(TimeBaseModel, Base):
+    __tablename__ = "t_cbb_big_area"
+
+    id = Column("id", Integer, primary_key=True, autoincrement=True)
+    biz_id = Column("biz_id", String(15), index=True, comment="业务ID")
+    env_id = Column("env_id", String(15), index=True, comment="环境ID")
+    big_area = Column("big_area", String(255), index=True, comment="大区")
+    idip = Column("idip", String(255), comment="idip")
+    app_secret = Column("app_secret", Text, comment="app_secret")
+    description = Column("description", String(255), default="", comment="备注")
+
+    __table_args__ = (UniqueConstraint("biz_id", "env_id", "big_area", name="biz_env_big_area_unique"),)