查询p端列表信息

Former-commit-id: 4da76886f5de6c1939d5d9011acc37fc237d4043
This commit is contained in:
zhangwei 2023-09-06 16:22:20 +08:00
parent 7313ee2446
commit ae939a78a0
4 changed files with 82 additions and 48 deletions

View File

@ -402,17 +402,17 @@ type (
} }
) )
type( type (
ComputilityStatisticsResp{ ComputilityStatisticsResp {
Code int32 `json:"code,omitempty"` Code int32 `json:"code,omitempty"`
Msg string `json:"msg,omitempty"` Msg string `json:"msg,omitempty"`
ErrorMsg string `json:"ErrorMsg,omitempty"` ErrorMsg string `json:"ErrorMsg,omitempty"`
ComputilityStatistics ComputilityStatistics `json:"data"` //容器节点已使用 ComputilityStatistics ComputilityStatistics `json:"data"` //容器节点已使用
} }
ComputilityStatistics { ComputilityStatistics {
DomainSum int64 `json:"domainSum"` //域总数 DomainSum int64 `json:"domainSum"` //域总数
TotalComputility float64 `json:"totalComputility"` //算力总和 TotalComputility float64 `json:"totalComputility"` //算力总和
ClusterNum int64 `json:"clusterNum"` //集群总数 ClusterNum int64 `json:"clusterNum"` //集群总数
} }
) )
@ -458,13 +458,13 @@ type NodeAsset {
} }
type SaveHashcatReq { type SaveHashcatReq {
CrackTaskId string `json:"crackTaskId"` // 任务id CrackTaskId string `json:"crackTaskId"` // 任务id
CrackContainerId string `json:"crackContainerId"` // 容器id CrackContainerId string `json:"crackContainerId"` // 容器id
CrackStatus string `json:"crackStatus"` // 状态 CrackStatus string `json:"crackStatus"` // 状态
CrackStartTime string `json:"crackStartTime"` //开始时间 CrackStartTime string `json:"crackStartTime"` //开始时间
CrackEstimatedTime string `json:"crackEstimatedTime"` // 预计时间 CrackEstimatedTime string `json:"crackEstimatedTime"` // 预计时间
CrackProgress string `json:"crackProgress"` // 进度 CrackProgress string `json:"crackProgress"` // 进度
CrackResult string `json:"crackResult"` // 结果 CrackResult string `json:"crackResult"` // 结果
} }
type getHashcatHandlerReq { type getHashcatHandlerReq {
@ -476,11 +476,23 @@ type getHashcatHandlerResp {
} }
type HashCat { type HashCat {
CrackTaskId string `json:"crackTaskId"` // 任务id CrackTaskId string `json:"crackTaskId"` // 任务id
CrackContainerId string `json:"crackContainerId"` // 容器id CrackContainerId string `json:"crackContainerId"` // 容器id
CrackStatus string `json:"crackStatus"` // 状态 CrackStatus string `json:"crackStatus"` // 状态
CrackStartTime string `json:"crackStartTime"` //开始时间 CrackStartTime string `json:"crackStartTime"` //开始时间
CrackEstimatedTime string `json:"crackEstimatedTime"` // 预计时间 CrackEstimatedTime string `json:"crackEstimatedTime"` // 预计时间
CrackProgress string `json:"crackProgress"` // 进度 CrackProgress string `json:"crackProgress"` // 进度
CrackResult string `json:"crackResult"` // 结果 CrackResult string `json:"crackResult"` // 结果
}
type participantListResp {
Participants []Participant `json:"participants"`
}
type Participant {
id int64 `json:"id"`
name string `json:"name"`
address string `json:"address"`
metricsUrl string `json:"metricsUrl"`
tenantName string `json:"tenantName"`
typeName string `json:"typeName"`
} }

View File

@ -23,57 +23,61 @@ info(
group : core group : core
) )
service pcm { service pcm {
@handler participantListHandler
get /core/participantList () returns (participantListResp)
@handler scheduleTaskByYamlHandler @handler scheduleTaskByYamlHandler
post /core/scheduleTaskByYaml (scheduleTaskByYamlReq) returns () post /core/scheduleTaskByYaml (scheduleTaskByYamlReq) returns ()
@handler scheduleTaskHandler @handler scheduleTaskHandler
post /core/scheduleTask (scheduleTaskReq) returns () post /core/scheduleTask (scheduleTaskReq) returns ()
@handler TaskListHandler @handler TaskListHandler
get /core/taskList () returns (taskListResp) get /core/taskList () returns (taskListResp)
@handler JobTotalHandler @handler JobTotalHandler
get /core/jobTotal () returns (jobTotalResp) get /core/jobTotal () returns (jobTotalResp)
@handler listCenterHandler @handler listCenterHandler
get /core/listCenter () returns (listCenterResp) get /core/listCenter () returns (listCenterResp)
@handler listClusterHandler @handler listClusterHandler
get /core/listCluster/:centerId (listClusterReq) returns (listClusterResp) get /core/listCluster/:centerId (listClusterReq) returns (listClusterResp)
@handler submitJobHandler @handler submitJobHandler
post /core/submitJob (submitJobReq) returns (submitJobResp) post /core/submitJob (submitJobReq) returns (submitJobResp)
@handler getRegionHandler @handler getRegionHandler
get /core/getRegion () returns (getRegionResp) get /core/getRegion () returns (getRegionResp)
@handler listRegionHandler @handler listRegionHandler
get /core/listRegion () returns (listRegionResp) get /core/listRegion () returns (listRegionResp)
@handler getComputingPowerHandler @handler getComputingPowerHandler
get /core/getComputingPower returns (cpResp) get /core/getComputingPower returns (cpResp)
@handler getGeneralInfoHandler @handler getGeneralInfoHandler
get /core/getGeneralInfo () returns (GiResp) get /core/getGeneralInfo () returns (GiResp)
@handler listDomainResourceHandler @handler listDomainResourceHandler
get /core/listDomainResource returns (DomainResourceResp) get /core/listDomainResource returns (DomainResourceResp)
@handler getResourcePanelConfigHandler @handler getResourcePanelConfigHandler
get /core/getResourcePanelConfigHandler () returns (ResourcePanelConfigResp) get /core/getResourcePanelConfigHandler () returns (ResourcePanelConfigResp)
@handler putResourcePanelConfigHandler @handler putResourcePanelConfigHandler
put /core/resourcePanelConfigHandler (ResourcePanelConfigReq) returns () put /core/resourcePanelConfigHandler (ResourcePanelConfigReq) returns ()
@handler getComputilityStatisticsHandler @handler getComputilityStatisticsHandler
get /core/getComputilityStatistics () returns (ComputilityStatisticsResp) get /core/getComputilityStatistics () returns (ComputilityStatisticsResp)
@handler nodeAssetsHandler @handler nodeAssetsHandler
get /core/assets () returns (NodeAssetsResp) get /core/assets () returns (NodeAssetsResp)
@handler saveHashcatHandler @handler saveHashcatHandler
post /core/saveHashcat (SaveHashcatReq) returns () post /core/saveHashcat (SaveHashcatReq) returns ()
@handler getHashcatHandler @handler getHashcatHandler
get /core/getHashcat/:crackTaskId (getHashcatHandlerReq) returns (getHashcatHandlerResp) get /core/getHashcat/:crackTaskId (getHashcatHandlerReq) returns (getHashcatHandlerResp)
} }
@ -86,10 +90,10 @@ service pcm {
service pcm { service pcm {
@handler listJobHandler @handler listJobHandler
get /hpc/listJob (listJobReq) returns (listJobResp) get /hpc/listJob (listJobReq) returns (listJobResp)
@handler listHistoryJobHandler @handler listHistoryJobHandler
get /hpc/listHistoryJob (listHistoryJobReq) returns (listHistoryJobResp) get /hpc/listHistoryJob (listHistoryJobReq) returns (listHistoryJobResp)
@handler queueAssetsHandler @handler queueAssetsHandler
get /queue/assets () returns (QueueAssetsResp) get /queue/assets () returns (QueueAssetsResp)
} }
@ -102,7 +106,7 @@ service pcm {
service pcm { service pcm {
@handler cloudListHandler @handler cloudListHandler
get /task/list () returns (cloudListResp) get /task/list () returns (cloudListResp)
@handler deleteYamlHandler @handler deleteYamlHandler
get /cloud/DeleteYaml (ApplyReq) returns (DeleteResp) get /cloud/DeleteYaml (ApplyReq) returns (DeleteResp)
} }
@ -115,10 +119,10 @@ service pcm {
service pcm { service pcm {
@handler listDataSetHandler @handler listDataSetHandler
get /ai/listDataSet/:projectId (DataSetReq) returns (DataSetResp) get /ai/listDataSet/:projectId (DataSetReq) returns (DataSetResp)
@handler CreateDataSetHandler @handler CreateDataSetHandler
post /ai/createDataSet/:projectId (CreateDataSetReq) returns (CreateDataSetResp) post /ai/createDataSet/:projectId (CreateDataSetReq) returns (CreateDataSetResp)
@handler DeleteDataSetHandler @handler DeleteDataSetHandler
delete /ai/deleteDataSet/:projectId/:datasetId (DeleteDataSetReq) returns (DeleteDataSetResp) delete /ai/deleteDataSet/:projectId/:datasetId (DeleteDataSetReq) returns (DeleteDataSetResp)
// creat task 创建导入任务 // creat task 创建导入任务
@ -149,7 +153,7 @@ service pcm {
// ShowAlgorithmByUuid 展示算法详情 // ShowAlgorithmByUuid 展示算法详情
@handler ShowAlgorithmByUuid @handler ShowAlgorithmByUuid
get /ai/ShowAlgorithmByUuid/:projectId/:algorithmId (ShowAlgorithmByUuidReq) returns (ShowAlgorithmByUuidResp) get /ai/ShowAlgorithmByUuid/:projectId/:algorithmId (ShowAlgorithmByUuidReq) returns (ShowAlgorithmByUuidResp)
// creat export task 创建导出任务 // creat export task 创建导出任务
@handler CreateExportTaskHandler @handler CreateExportTaskHandler
post /ai/CreateExportTask/:projectId/:datasetId (CreateExportTaskReq) returns (ExportTaskDataResp) post /ai/CreateExportTask/:projectId/:datasetId (CreateExportTaskReq) returns (ExportTaskDataResp)
@ -157,11 +161,11 @@ service pcm {
get /ai/GetExportTasksOfDataset/:projectId/:datasetId (GetExportTasksOfDatasetReq) returns (GetExportTasksOfDatasetResp) get /ai/GetExportTasksOfDataset/:projectId/:datasetId (GetExportTasksOfDatasetReq) returns (GetExportTasksOfDatasetResp)
@handler GetExportTaskStatusOfDatasetHandler @handler GetExportTaskStatusOfDatasetHandler
get /ai/GetExportTaskStatusOfDataset/:projectId/:resourceId/:taskId (GetExportTaskStatusOfDatasetReq) returns (GetExportTaskStatusOfDatasetResp) get /ai/GetExportTaskStatusOfDataset/:projectId/:resourceId/:taskId (GetExportTaskStatusOfDatasetReq) returns (GetExportTaskStatusOfDatasetResp)
// create processor task 创建处理任务 // create processor task 创建处理任务
@handler CreateProcessorTaskHandler @handler CreateProcessorTaskHandler
post /ai/CreateProcessorTask (CreateProcessorTaskReq) returns (CreateProcessorTaskResp) post /ai/CreateProcessorTask (CreateProcessorTaskReq) returns (CreateProcessorTaskResp)
// create service 创建服务 // create service 创建服务
@handler CreateServiceHandler @handler CreateServiceHandler
post /ai/CreateService/:projectId (CreateServiceReq) returns (CreateServiceResp) post /ai/CreateService/:projectId (CreateServiceReq) returns (CreateServiceResp)
@ -177,7 +181,7 @@ service pcm {
// ListClusters查询专属资源池列表 // ListClusters查询专属资源池列表
@handler ListClustersHandler @handler ListClustersHandler
get /ai/ListClusters (ListClustersReq) returns (ListClustersResp) get /ai/ListClusters (ListClustersReq) returns (ListClustersResp)
/******************Notebook Method start*************************/ /******************Notebook Method start*************************/
@handler listNotebookHandler @handler listNotebookHandler
get /ai/listNotebook (ListNotebookReq) returns (ListNotebookResp) get /ai/listNotebook (ListNotebookReq) returns (ListNotebookResp)
@ -192,7 +196,7 @@ service pcm {
@handler mountNotebookStorageHandler @handler mountNotebookStorageHandler
post /ai/mountNotebookStorage (MountNotebookStorageReq) returns (MountNotebookStorageResp) post /ai/mountNotebookStorage (MountNotebookStorageReq) returns (MountNotebookStorageResp)
/******************Notebook Method end*************************/ /******************Notebook Method end*************************/
/******************Visualization Job Method start*************************/ /******************Visualization Job Method start*************************/
@handler getVisualizationJobHandler @handler getVisualizationJobHandler
get /ai/getVisualizationJob (GetVisualizationJobReq) returns (GetVisualizationJobResp) get /ai/getVisualizationJob (GetVisualizationJobReq) returns (GetVisualizationJobResp)
@ -223,16 +227,16 @@ service pcm {
service pcm { service pcm {
@handler uploadHandler @handler uploadHandler
post /upload () returns () post /upload () returns ()
@handler chunkHandler @handler chunkHandler
post /chunk () returns () post /chunk () returns ()
@handler imageListHandler @handler imageListHandler
get /image/list () returns (imageListResp) get /image/list () returns (imageListResp)
@handler dataSetCheckHandler @handler dataSetCheckHandler
get /dataSet/check/:fileMd5 (checkReq) returns (checkResp) get /dataSet/check/:fileMd5 (checkReq) returns (checkResp)
@handler uploadDataSetHandler @handler uploadDataSetHandler
post /dataSet/upload () returns () post /dataSet/upload () returns ()
} }

View File

@ -19,6 +19,11 @@ import (
func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
server.AddRoutes( server.AddRoutes(
[]rest.Route{ []rest.Route{
{
Method: http.MethodGet,
Path: "/core/participantList",
Handler: core.ParticipantListHandler(serverCtx),
},
{ {
Method: http.MethodPost, Method: http.MethodPost,
Path: "/core/scheduleTaskByYaml", Path: "/core/scheduleTaskByYaml",

View File

@ -454,6 +454,19 @@ type HashCat struct {
CrackResult string `json:"crackResult"` // 结果 CrackResult string `json:"crackResult"` // 结果
} }
type ParticipantListResp struct {
Participants []Participant `json:"participants"`
}
type Participant struct {
Id int64 `json:"id"`
Name string `json:"name"`
Address string `json:"address"`
MetricsUrl string `json:"metricsUrl"`
TenantName string `json:"tenantName"`
TypeName string `json:"typeName"`
}
type Job struct { type Job struct {
SlurmVersion string `json:"slurmVersion"` SlurmVersion string `json:"slurmVersion"`
Name string `json:"name"` Name string `json:"name"`