Skip to content

[fix][cloudkitty]Add code for forwoarded rating hashmap mapping and t… #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 5, 2025
Merged

[fix][cloudkitty]Add code for forwoarded rating hashmap mapping and t… #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 39 additions & 19 deletions dingo_command/api/cloudkitty.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from fastapi.responses import FileResponse
from urllib.parse import unquote
from starlette.background import BackgroundTask
from dingo_command.api.model.cloudkitty import CloudKittyRatingSummaryDetail
from dingo_command.api.model.cloudkitty import CloudKittyRatingSummaryDetail, RatingModuleConfigHashMapMapping, RatingModuleConfigHashMapThreshold
from dingo_command.services.cloudkitty import CloudKittyService
from dingo_command.utils import file_utils

Expand Down Expand Up @@ -87,30 +87,50 @@ async def download_rating_summary_detail_pdf(filePath: str = Query(None, descrip
)
raise HTTPException(status_code=400, detail="PDf file not found")

@router.post("/cloudkitty/download/ratingSummaryDetail/execl", summary="下载计费汇总详情execl", description="下载计费汇总详情execl")
async def download_rating_summary_detail_execl(detail: List[CloudKittyRatingSummaryDetail],
language: str = Query(None, description="当前环境语言")):
result_file_execl_name = "rating_summary_detail_" + format_d8q_timestamp() + ".xlsx"
# 导出文件路径
result_file_execl_path = EXCEL_TEMP_DIR + result_file_execl_name
# @router.post("/cloudkitty/download/ratingSummaryDetail/execl", summary="下载计费汇总详情execl", description="下载计费汇总详情execl")
# async def download_rating_summary_detail_execl(detail: List[CloudKittyRatingSummaryDetail],
# language: str = Query(None, description="当前环境语言")):
# result_file_execl_name = "rating_summary_detail_" + format_d8q_timestamp() + ".xlsx"
# # 导出文件路径
# result_file_execl_path = EXCEL_TEMP_DIR + result_file_execl_name
#
# # 1. 生成Excel文件
# try:
# cloudkitty_service.download_rating_summary_detail_execl(result_file_execl_path, detail, language)
# except Exception as e:
# import traceback
# traceback.print_exc()
# file_utils.cleanup_temp_file(result_file_execl_path)
# raise HTTPException(status_code=400, detail="generate execl file error")
#
# # 文件存在则下载
# if os.path.exists(result_file_execl_path):
# return FileResponse(
# path=result_file_execl_path,
# media_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
# filename=result_file_execl_name, # 下载时显示的文件名
# background=BackgroundTask(file_utils.cleanup_temp_file, result_file_execl_path)
# )
# raise HTTPException(status_code=400, detail="Execl file not found")

# 1. 生成Excel文件
@router.put("/rating/module_config/hashmap/mappings/{mapping_id}", summary="编辑计费映射哈希字段或服务映射",description="编辑计费映射哈希字段或服务映射")
async def edit_rating_module_config_hashmap_mappings(mapping_id: str, mapping: RatingModuleConfigHashMapMapping):
# 文件存在则下载
try:
cloudkitty_service.download_rating_summary_detail_execl(result_file_execl_path, detail, language)
return cloudkitty_service.edit_rating_module_config_hashmap_mappings(mapping_id, mapping)
except Exception as e:
import traceback
traceback.print_exc()
file_utils.cleanup_temp_file(result_file_execl_path)
raise HTTPException(status_code=400, detail="generate execl file error")
raise HTTPException(status_code=400, detail={e})

@router.put("/rating/module_config/hashmap/thresholds/{threshold_id}", summary="编辑计费映射哈希服务阈值",description="编辑计费映射哈希服务阈值")
async def edit_rating_module_config_hashmap_thresholdings(threshold_id: str, thresholding: RatingModuleConfigHashMapThreshold):
# 文件存在则下载
if os.path.exists(result_file_execl_path):
return FileResponse(
path=result_file_execl_path,
media_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
filename=result_file_execl_name, # 下载时显示的文件名
background=BackgroundTask(file_utils.cleanup_temp_file, result_file_execl_path)
)
raise HTTPException(status_code=400, detail="Execl file not found")
try:
return cloudkitty_service.edit_rating_module_config_hashmap_thresholdings(threshold_id, thresholding)
except Exception as e:
import traceback
traceback.print_exc()
raise HTTPException(status_code=400, detail={e})


22 changes: 21 additions & 1 deletion dingo_command/api/model/cloudkitty.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,24 @@ class CloudKittyRatingSummaryDetail(BaseModel):
tenant_name: Optional[str] = Field(None, description="项目名称")
end: Optional[str] = Field(None, description="结束时间")
total: Optional[str] = Field(None, description="总计")
flavor: Optional[List[FlavorObject]] = Field(None, description="描述信息")
flavor: Optional[List[FlavorObject]] = Field(None, description="描述信息")

class RatingModuleConfigHashMapMapping(BaseModel):
mapping_id: Optional[str] = Field(None, description="映射ID")
cost: Optional[str] = Field(None, description="费用")
type: Optional[str] = Field(None, description="类型")
group_id: Optional[str] = Field(None, description="组ID")
tenant_id: Optional[str] = Field(None, description="项目ID")
value: Optional[str] = Field(None, description="值")
field_id: Optional[str] = Field(None, description="字段ID")
service_id: Optional[str] = Field(None, description="服务ID")

class RatingModuleConfigHashMapThreshold(BaseModel):
threshold_id: Optional[str] = Field(None, description="阈值ID")
cost: Optional[str] = Field(None, description="费用")
type: Optional[str] = Field(None, description="类型")
group_id: Optional[str] = Field(None, description="组ID")
tenant_id: Optional[str] = Field(None, description="项目ID")
field_id: Optional[str] = Field(None, description="字段ID")
service_id: Optional[str] = Field(None, description="服务ID")
level: Optional[str] = Field(None, description="级别")
Binary file removed dingo_command/api/template/rating_summary_detail_en_template.xlsx
View file
Open in desktop
Binary file not shown.
Binary file removed dingo_command/api/template/rating_summary_detail_zh_template.xlsx
View file
Open in desktop
Binary file not shown.
33 changes: 18 additions & 15 deletions dingo_command/common/cloudkitty_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from dingo_command.common import CONF


# 配置nova信息
# 配置cloudkitty信息
CLOUDKITTY_AUTH_URL = CONF.cloudkitty.auth_url
CLOUDKITTY_AUTH_TYPE = CONF.cloudkitty.auth_type
CLOUDKITTY_PROJECT_NAME = CONF.cloudkitty.project_name
Expand All @@ -26,7 +26,7 @@ def __new__(cls):
if not cls._singleton_instance or not cls._is_token_valid():
cls._singleton_instance = super().__new__(cls)
cls._singleton_instance._init_client()
print("generate New Ironic instance client")
print("generate New CloudKitty instance client")
return cls._singleton_instance

def _init_client(self):
Expand All @@ -48,7 +48,8 @@ def _is_token_valid(cls):
return False

remaining_time = instance._token_expiry - timeutils.utcnow()
#print(f"cloudkitty client single instance id: {instance._singleton_instance_uuid}, token[{instance._current_token}]剩余时间：{remaining_time}, token过期阈值：{cls.TOKEN_EXPIRY_THRESHOLD}， 当前token是否有效：{remaining_time > cls.TOKEN_EXPIRY_THRESHOLD}")
if remaining_time < cls.TOKEN_EXPIRY_THRESHOLD:
print(f"cloudkitty client single instance id: {instance._singleton_instance_uuid}, token[{instance._current_token}]剩余时间：{remaining_time}, token过期阈值：{cls.TOKEN_EXPIRY_THRESHOLD}， 当前token是否有效：{remaining_time > cls.TOKEN_EXPIRY_THRESHOLD}")
return remaining_time > cls.TOKEN_EXPIRY_THRESHOLD

def _acquire_new_token(self):
Expand Down Expand Up @@ -126,19 +127,21 @@ def get_storage_dataframes(self, filters=None):

# 添加cloudkitty服务编辑服务映射
@_require_valid_token
def modify_rating_module_config_hashmap_mappings(self):
def modify_rating_module_config_hashmap_mappings(self, mapping_id, mapping):
endpoint = self.get_service_endpoint('rating')
headers = {'Content-Type': 'application/json'}
data = {
"mapping_id":"67588126-54a4-42a1-9e41-3d2e48484080",
"type":"flat",
"cost":"0.2000000000000000111022302463",
"tenant_id":"3e1f5092111841e6a3f70e072fcc8864",
"value":"1014f026-1a4e-455c-afaa-99e7f78a9e57",
"field_id":"822de49d-578e-426d-8157-2b6a96e58ad2"
}
response = self._session.put(f"{endpoint}/v1/rating/module_config/hashmap/mappings/{mapping_id}", data=mapping.json(), headers=headers)
if response.status_code != 200:
print(f"cloudkitty[{endpoint}/v1/rating/module_config/hashmap/mappings/{mapping_id}] status_code:{response.status_code}, 请求失败: {response.text}")
raise Exception(f"{response.text}")
return response.json()

response = self._session.put(f"{endpoint}/v1/rating/module_config/hashmap/mappings", data=json.dumps(data), headers=headers)
@_require_valid_token
def modify_rating_module_config_hashmap_thresholdings(self, threshold_id, thresholding):
endpoint = self.get_service_endpoint('rating')
headers = {'Content-Type': 'application/json'}
response = self._session.put(f"{endpoint}/v1/rating/module_config/hashmap/thresholds/{threshold_id}", data=thresholding.json(), headers=headers)
if response.status_code != 200:
raise Exception(f"cloudkitty[{endpoint}/v1/rating/module_config/hashmap/mappings] status_code:{response.status_code}, 请求失败: {response.text}")
print(response)
print(f"cloudkitty[{endpoint}/v1/rating/module_config/hashmap/thresholds/{mapping_id}] status_code:{response.status_code}, 请求失败: {response.text}")
raise Exception(f"{response.text}")
return response.json()
3 changes: 2 additions & 1 deletion dingo_command/common/ironic_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ def _is_token_valid(cls):
return False

remaining_time = instance._token_expiry - timeutils.utcnow()
#print(f"ironic client single instance id: {instance._singleton_instance_uuid}, token[{instance._current_token}]剩余时间：{remaining_time}, token过期阈值：{cls.TOKEN_EXPIRY_THRESHOLD}， 当前token是否有效：{remaining_time > cls.TOKEN_EXPIRY_THRESHOLD}")
if remaining_time < cls.TOKEN_EXPIRY_THRESHOLD:
print(f"ironic client single instance id: {instance._singleton_instance_uuid}, token[{instance._current_token}]剩余时间：{remaining_time}, token过期阈值：{cls.TOKEN_EXPIRY_THRESHOLD}， 当前token是否有效：{remaining_time > cls.TOKEN_EXPIRY_THRESHOLD}")
return remaining_time > cls.TOKEN_EXPIRY_THRESHOLD

def _acquire_new_token(self):
Expand Down
29 changes: 11 additions & 18 deletions dingo_command/db/models/asset_resoure_relation/sql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,26 +114,19 @@ def resource_detail_list(cls, resource_project_id, query_params, page=1, page_si
query = query.order_by(resource_detail_list_dir_dic[sort_keys].asc())
elif sort_dirs == "descend":
query = query.order_by(resource_detail_list_dir_dic[sort_keys].desc())
elif sort_keys == "resource_gpu_count":
if sort_dirs == "ascend" or sort_dirs is None:
query = query.filter(ResourceMetrics.name == "gpu_count").order_by(ResourceMetrics.data.asc())
elif sort_dirs == "descend":
query = query.filter(ResourceMetrics.name == "gpu_count").order_by(ResourceMetrics.data.desc())
elif sort_keys == "resource_gpu_power":
if sort_dirs == "ascend" or sort_dirs is None:
query = query.filter(ResourceMetrics.name == "gpu_power").order_by(ResourceMetrics.data.asc())
elif sort_dirs == "descend":
query = query.filter(ResourceMetrics.name == "gpu_power").order_by(ResourceMetrics.data.desc())
elif sort_keys == "resource_cpu_usage":
if sort_dirs == "ascend" or sort_dirs is None:
query = query.filter(ResourceMetrics.name == "cpu_usage").order_by(ResourceMetrics.data.asc())
elif sort_dirs == "descend":
query = query.filter(ResourceMetrics.name == "cpu_usage").order_by(ResourceMetrics.data.desc())
elif sort_keys == "resource_memory_usage":
else:
from sqlalchemy import case, null
metric_name = sort_keys.replace("resource_", "")

# 构建case表达式处理空值
order_expr = case(
(ResourceMetrics.name == metric_name, ResourceMetrics.data),
else_=0 # 默认值为0，可根据业务需求调整
)
if sort_dirs == "ascend" or sort_dirs is None:
query = query.filter(ResourceMetrics.name == "memory_usage").order_by(ResourceMetrics.data.asc())
query = query.order_by(order_expr.asc())
elif sort_dirs == "descend":
query = query.filter(ResourceMetrics.name == "memory_usage").order_by(ResourceMetrics.data.desc())
query = query.order_by(order_expr.desc())
else:
query = query.order_by(AssetResourceRelationInfo.create_date.desc())
# 分页条件
Expand Down
7 changes: 3 additions & 4 deletions dingo_command/jobs/asset_resource_relation_syncer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def fetch_relation_info():
# print(f"虚拟机列表数据: {server_list}")
# 数据判空
if not node_list:
print("裸金属列表数据")
print("裸金属列表数据为空，清除资源相关数据")
# 删除资源与资产关联表中的数据
AssetResourceRelationSQL.delete_all_asset_resource_relation_data()
# 删除资源metrics表中数据
Expand All @@ -48,15 +48,14 @@ def fetch_relation_info():
asset_resource_relation_list = []
resource_id_list = []
for temp_node in node_list:
print(f"裸金属数据:{temp_node}")
# print(f"裸金属数据:{temp_node}")
# uuid是裸金属的id instance_uuid是对应的虚拟机的id
resource_id_list.append(temp_node.get('uuid'))
#print(f"裸金属列表数据:{temp_node.get('uuid')}")
server_detail = None
if temp_node.get('instance_uuid'):
try:
nova_client = NovaClient()
server_detail = nova_client.nova_get_server_detail(temp_node.get('instance_uuid'))
server_detail = NovaClient().nova_get_server_detail(temp_node.get('instance_uuid'))
print(f"虚拟机详情数据: {server_detail}")
except Exception as e:
print(f"虚拟机[{temp_node.get('instance_uuid')}]详情数据失败: {e}")
Expand Down
Loading