floraachy
/
pcm-coordinator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: update vmInfo 0606 

Former-commit-id: a1711e74b84d91e661c7e6d4257f8967c17cf573
This commit is contained in:
qiwang 2024-06-06 10:30:48 +08:00
parent f66138afa0
commit db9fe273d8
2 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
api/client/types.go
View File

@ -156,21 +156,27 @@ type AiInfo struct {
} }
type VmInfo struct { type VmInfo struct {
TaskId int64 `json:"taskId,omitempty"` Id int64 `json:"id,omitempty"`
Name string `json:"name,omitempty"` TaskId int64 `json:"taskId,omitempty"`
AdapterId int64 `json:"adapterId,omitempty,optional"` Name string `json:"name,omitempty"`
AdapterName string `json:"adapterName,omitempty,optional"` AdapterId int64 `json:"adapterId,omitempty,optional"`
ClusterId int64 `json:"clusterId,omitempty,optional"` AdapterName string `json:"adapterName,omitempty,optional"`
ClusterName string `json:"clusterName,omitempty,optional"` ClusterId int64 `json:"clusterId,omitempty,optional"`
FlavorRef string `json:"flavor_ref,omitempty"` ClusterName string `json:"clusterName,omitempty,optional"`
ImageRef string `json:"image_ref,omitempty"` FlavorRef string `json:"flavor_ref,omitempty"`
Uuid string `json:"uuid,omitempty"` ImageRef string `json:"image_ref,omitempty"`
SourceType string `json:"source_type,omitempty"` Status string `json:"status,omitempty"`
Status string `json:"status,omitempty"` Platform string `json:"platform,omitempty"`
StartTime string `json:"startTime,omitempty"` Description string `json:"description,omitempty"` // 描述
Platform string `json:"platform,omitempty"` AvailabilityZone string `json:"availability_zone,omitempty"`
VmName string `json:"vm_name,omitempty"` MinCount string `json:"min_count,omitempty"`
ServerId string `json:"server_id,omitempty"` Uuid string `json:"uuid,omitempty"`
StartTime string `json:"startTime,omitempty"`
RunningTime string `json:"runningTime,omitempty"`
Result string `json:"result,omitempty"`
DeletedAt string `json:"deleted_at,omitempty"`
VmName string `json:"vm_name,omitempty"`
Replicas int64 `json:"replicas,omitempty"`
} }
type ResourceStats struct { type ResourceStats struct {

11
pkg/models/taskvmmodel_gen.go
View File

@ -37,7 +37,7 @@ type (
TaskVm struct { TaskVm struct {
Id int64 `db:"id"` // id Id int64 `db:"id"` // id
TaskId int64 `db:"task_id"` // 任务id TaskId int64 `db:"task_id"` // 任务id
Name string `db:"name"` // 虚拟机名称 Name string `db:"name"` // 任务名称
AdapterId int64 `db:"adapter_id"` // 执行任务的适配器id AdapterId int64 `db:"adapter_id"` // 执行任务的适配器id
AdapterName string `db:"adapter_name"` // 适配器名称 AdapterName string `db:"adapter_name"` // 适配器名称
ClusterId int64 `db:"cluster_id"` // 执行任务的集群id ClusterId int64 `db:"cluster_id"` // 执行任务的集群id
@ -53,7 +53,10 @@ type (
StartTime string `db:"start_time"` // 开始时间 StartTime string `db:"start_time"` // 开始时间
RunningTime string `db:"running_time"` // 运行时间 RunningTime string `db:"running_time"` // 运行时间
Result string `db:"result"` // 运行结果 Result string `db:"result"` // 运行结果
Remark string `db:"remark"` // 备注
DeletedAt string `db:"deleted_at"` // 删除时间 DeletedAt string `db:"deleted_at"` // 删除时间
VmName string `db:"vm_name"` // 虚拟机名称
Replicas int64 `db:"replicas"` // 副本数
} }
) )
@ -92,14 +95,14 @@ func (m *defaultTaskVmModel) FindOne(ctx context.Context, id int64) (*TaskVm, er
} }
func (m *defaultTaskVmModel) Insert(ctx context.Context, data *TaskVm) (sql.Result, error) { func (m *defaultTaskVmModel) Insert(ctx context.Context, data *TaskVm) (sql.Result, error) {
query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, taskVmRowsExpectAutoSet) query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, taskVmRowsExpectAutoSet)
ret, err := m.conn.ExecCtx(ctx, query, data.TaskId, data.Name, data.AdapterId, data.AdapterName, data.ClusterId, data.ClusterName, data.FlavorRef, data.ImageRef, data.Status, data.Platform, data.Description, data.AvailabilityZone, data.MinCount, data.Uuid, data.StartTime, data.RunningTime, data.Result, data.DeletedAt) ret, err := m.conn.ExecCtx(ctx, query, data.TaskId, data.Name, data.AdapterId, data.AdapterName, data.ClusterId, data.ClusterName, data.FlavorRef, data.ImageRef, data.Status, data.Platform, data.Description, data.AvailabilityZone, data.MinCount, data.Uuid, data.StartTime, data.RunningTime, data.Result, data.Remark, data.DeletedAt, data.VmName, data.Replicas)
return ret, err return ret, err
} }
func (m *defaultTaskVmModel) Update(ctx context.Context, data *TaskVm) error { func (m *defaultTaskVmModel) Update(ctx context.Context, data *TaskVm) error {
query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, taskVmRowsWithPlaceHolder) query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, taskVmRowsWithPlaceHolder)
_, err := m.conn.ExecCtx(ctx, query, data.TaskId, data.Name, data.AdapterId, data.AdapterName, data.ClusterId, data.ClusterName, data.FlavorRef, data.ImageRef, data.Status, data.Platform, data.Description, data.AvailabilityZone, data.MinCount, data.Uuid, data.StartTime, data.RunningTime, data.Result, data.DeletedAt, data.Id) _, err := m.conn.ExecCtx(ctx, query, data.TaskId, data.Name, data.AdapterId, data.AdapterName, data.ClusterId, data.ClusterName, data.FlavorRef, data.ImageRef, data.Status, data.Platform, data.Description, data.AvailabilityZone, data.MinCount, data.Uuid, data.StartTime, data.RunningTime, data.Result, data.Remark, data.DeletedAt, data.VmName, data.Replicas, data.Id)
return err return err
} }