diff --git a/sdks/imfs/package.go b/sdks/imfs/package.go index 5eb59c5..ffbab30 100644 --- a/sdks/imfs/package.go +++ b/sdks/imfs/package.go @@ -4,7 +4,7 @@ import ( "net/url" "gitlink.org.cn/cloudream/common/consts/errorcode" - stgsdk "gitlink.org.cn/cloudream/common/sdks/storage" + cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" myhttp "gitlink.org.cn/cloudream/common/utils/http" ) @@ -15,8 +15,8 @@ type PackageGetWithObjectCacheInfos struct { PackageID int64 `json:"packageID"` } type PackageGetWithObjectCacheInfosResp struct { - Package stgsdk.Package `json:"package"` - ObjectCacheInfos []stgsdk.ObjectCacheInfo `json:"objectCacheInfos"` + Package cdssdk.Package `json:"package"` + ObjectCacheInfos []cdssdk.ObjectCacheInfo `json:"objectCacheInfos"` } func (c *Client) PackageGetWithObjectCacheInfos(req PackageGetWithObjectCacheInfos) (*PackageGetWithObjectCacheInfosResp, error) { diff --git a/sdks/pcm/models.go b/sdks/pcm/models.go index 1123eb4..885de9f 100644 --- a/sdks/pcm/models.go +++ b/sdks/pcm/models.go @@ -1,27 +1,29 @@ package pcmsdk -import schsdk "gitlink.org.cn/cloudream/common/sdks/scheduler" +type ParticipantID int64 type Participant struct { - ID schsdk.SlwNodeID `json:"id"` - Name string `json:"name"` - Type string `json:"type"` + ID ParticipantID `json:"id"` + Name string `json:"name"` + Type string `json:"type"` } +type ImageID string + type Image struct { - ImageID schsdk.SlwNodeImageID `json:"imageID"` - ImageName string `json:"imageName"` - ImageStatus string `json:"imageStatus"` + ImageID ImageID `json:"imageID"` + ImageName string `json:"imageName"` + ImageStatus string `json:"imageStatus"` } type ResourceID string type Resource struct { - ParticipantID schsdk.SlwNodeID `json:"participantID"` - ParticipantName string `json:"participantName"` - SpecName string `json:"specName"` - SpecID ResourceID `json:"specId"` - SpecPrice float64 `json:"specPrice"` + ParticipantID ParticipantID `json:"participantID"` + ParticipantName string `json:"participantName"` + SpecName string `json:"specName"` + SpecID ResourceID `json:"specId"` + SpecPrice float64 `json:"specPrice"` } type TaskID string diff --git a/sdks/pcm/pcm.go b/sdks/pcm/pcm.go index 6aba911..9bf513a 100644 --- a/sdks/pcm/pcm.go +++ b/sdks/pcm/pcm.go @@ -15,13 +15,14 @@ import ( const CodeOK int = 200 type UploadImageReq struct { - SlwNodeID schsdk.SlwNodeID `json:"slwNodeID"` - ImagePath string `json:"imagePath"` + PartID ParticipantID `json:"partID"` + ImagePath string `json:"imagePath"` } type UploadImageResp struct { - Result string `json:"result"` - ImageID schsdk.SlwNodeImageID `json:"imageID"` + Result string `json:"result"` + ImageID ImageID `json:"imageID"` + Name string `json:"name"` } // TODO @@ -93,7 +94,7 @@ func (c *Client) GetParticipants() (*GetParticipantsResp, error) { } type GetImageListReq struct { - PartID schsdk.SlwNodeID `json:"partId"` + PartID ParticipantID `json:"partId"` } type GetImageListResp struct { @@ -133,8 +134,8 @@ func (c *Client) GetImageList(req GetImageListReq) (*GetImageListResp, error) { } type DeleteImageReq struct { - PartID schsdk.SlwNodeID `json:"partID"` - ImageID schsdk.SlwNodeImageID `json:"imageID"` + PartID ParticipantID `json:"partID"` + ImageID ImageID `json:"imageID"` } func (c *Client) DeleteImage(req DeleteImageReq) error { @@ -167,12 +168,12 @@ func (c *Client) DeleteImage(req DeleteImageReq) error { } type SubmitTaskReq struct { - PartID schsdk.SlwNodeID `json:"partId"` - ImageID schsdk.SlwNodeImageID `json:"imageId"` - ResourceID ResourceID `json:"resourceId"` - CMD string `json:"cmd"` - Params []schsdk.KVPair `json:"params"` - Envs []schsdk.KVPair `json:"envs"` + PartID ParticipantID `json:"partId"` + ImageID ImageID `json:"imageId"` + ResourceID ResourceID `json:"resourceId"` + CMD string `json:"cmd"` + Params []schsdk.KVPair `json:"params"` + Envs []schsdk.KVPair `json:"envs"` } type SubmitTaskResp struct { @@ -212,8 +213,8 @@ func (c *Client) SubmitTask(req SubmitTaskReq) (*SubmitTaskResp, error) { } type GetTaskReq struct { - PartID schsdk.SlwNodeID `json:"partId"` - TaskID TaskID `json:"taskId"` + PartID ParticipantID `json:"partId"` + TaskID TaskID `json:"taskId"` } type GetTaskResp struct { @@ -265,8 +266,8 @@ func (c *Client) GetTask(req GetTaskReq) (*GetTaskResp, error) { } type DeleteTaskReq struct { - PartID schsdk.SlwNodeID `json:"partId"` - TaskID TaskID `json:"taskId"` + PartID ParticipantID `json:"partId"` + TaskID TaskID `json:"taskId"` } func (c *Client) DeleteTask(req DeleteTaskReq) error { @@ -299,7 +300,7 @@ func (c *Client) DeleteTask(req DeleteTaskReq) error { } type GetResourceSpecs struct { - PartID schsdk.SlwNodeID `json:"partId"` + PartID ParticipantID `json:"partId"` } type GetResourceSpecsResp struct { diff --git a/sdks/scheduler/models.go b/sdks/scheduler/models.go index b0db970..f5bcbb4 100644 --- a/sdks/scheduler/models.go +++ b/sdks/scheduler/models.go @@ -3,7 +3,7 @@ package schsdk import ( "gitlink.org.cn/cloudream/common/pkgs/mq" "gitlink.org.cn/cloudream/common/pkgs/types" - stgsdk "gitlink.org.cn/cloudream/common/sdks/storage" + cdssdk "gitlink.org.cn/cloudream/common/sdks/storage" "gitlink.org.cn/cloudream/common/utils/serder" ) @@ -23,9 +23,8 @@ type JobSetID string type ImageID string -type SlwNodeID int64 - -type SlwNodeImageID string +// 计算中心ID +type CCID string type JobSetInfo struct { Jobs []JobInfo `json:"jobs"` @@ -62,7 +61,7 @@ type ResourceJobInfo struct { JobInfoBase Type string `json:"type" union:"Resource"` BucketID int64 `json:"bucketID"` - Redundancy stgsdk.TypedRedundancyInfo `json:"redundancy"` + Redundancy cdssdk.TypedRedundancyInfo `json:"redundancy"` TargetLocalJobID string `json:"targetLocalJobID"` } @@ -155,5 +154,5 @@ type JobSetFilesUploadScheme struct { type LocalFileUploadScheme struct { LocalPath string `json:"localPath"` - UploadToStgNodeID *int64 `json:"uploadToStgNodeID"` + UploadToCDSNodeID *int64 `json:"uploadToCDSNodeID"` } diff --git a/sdks/storage/cache.go b/sdks/storage/cache.go index 18bc5f7..3deab7f 100644 --- a/sdks/storage/cache.go +++ b/sdks/storage/cache.go @@ -1,4 +1,4 @@ -package stgsdk +package cdssdk import ( "net/url" diff --git a/sdks/storage/client.go b/sdks/storage/client.go index d3e2be6..96c96b7 100644 --- a/sdks/storage/client.go +++ b/sdks/storage/client.go @@ -1,4 +1,4 @@ -package stgsdk +package cdssdk import ( "gitlink.org.cn/cloudream/common/sdks" diff --git a/sdks/storage/config.go b/sdks/storage/config.go index a9b8807..9900c08 100644 --- a/sdks/storage/config.go +++ b/sdks/storage/config.go @@ -1,4 +1,4 @@ -package stgsdk +package cdssdk type Config struct { URL string `json:"url"` diff --git a/sdks/storage/models.go b/sdks/storage/models.go index 9cc4d41..5e35809 100644 --- a/sdks/storage/models.go +++ b/sdks/storage/models.go @@ -1,4 +1,4 @@ -package stgsdk +package cdssdk import ( "fmt" diff --git a/sdks/storage/object.go b/sdks/storage/object.go index b233d30..c7152bb 100644 --- a/sdks/storage/object.go +++ b/sdks/storage/object.go @@ -1,4 +1,4 @@ -package stgsdk +package cdssdk import ( "fmt" diff --git a/sdks/storage/package.go b/sdks/storage/package.go index 4462cb0..fd11d84 100644 --- a/sdks/storage/package.go +++ b/sdks/storage/package.go @@ -1,4 +1,4 @@ -package stgsdk +package cdssdk import ( "fmt" diff --git a/sdks/storage/storage.go b/sdks/storage/storage.go index c8038e3..376aecd 100644 --- a/sdks/storage/storage.go +++ b/sdks/storage/storage.go @@ -1,4 +1,4 @@ -package stgsdk +package cdssdk import ( "fmt" diff --git a/sdks/storage/storage_test.go b/sdks/storage/storage_test.go index b6a9e8f..a41732b 100644 --- a/sdks/storage/storage_test.go +++ b/sdks/storage/storage_test.go @@ -1,4 +1,4 @@ -package stgsdk +package cdssdk import ( "bytes" diff --git a/sdks/storage/utils.go b/sdks/storage/utils.go index 521cf19..89cb5a2 100644 --- a/sdks/storage/utils.go +++ b/sdks/storage/utils.go @@ -1,4 +1,4 @@ -package stgsdk +package cdssdk import "path/filepath" diff --git a/sdks/unifyops/models.go b/sdks/unifyops/models.go index 8f8c2b9..655738c 100644 --- a/sdks/unifyops/models.go +++ b/sdks/unifyops/models.go @@ -3,7 +3,6 @@ package uopsdk import ( "gitlink.org.cn/cloudream/common/pkgs/mq" "gitlink.org.cn/cloudream/common/pkgs/types" - schsdk "gitlink.org.cn/cloudream/common/sdks/scheduler" "gitlink.org.cn/cloudream/common/utils/serder" ) @@ -18,12 +17,12 @@ const ( ResourceTypeMemory ResourceType = "MEMORY" ) +type SlwNodeID int64 + type SlwNode struct { - ID schsdk.SlwNodeID `json:"id"` - Name string `json:"name"` - SlwRegionID int64 `json:"slwRegionID"` - StgNodeID int64 `json:"stgNodeID"` - StorageID int64 `json:"StorageID"` + ID SlwNodeID `json:"id"` + Name string `json:"name"` + SlwRegionID int64 `json:"slwRegionID"` } type ResourceData interface { diff --git a/sdks/unifyops/unifyops.go b/sdks/unifyops/unifyops.go index 75a8649..97e64a7 100644 --- a/sdks/unifyops/unifyops.go +++ b/sdks/unifyops/unifyops.go @@ -5,7 +5,6 @@ import ( "net/url" "strings" - schsdk "gitlink.org.cn/cloudream/common/sdks/scheduler" myhttp "gitlink.org.cn/cloudream/common/utils/http" "gitlink.org.cn/cloudream/common/utils/serder" ) @@ -40,7 +39,7 @@ func (c *Client) GetAllSlwNodeInfo() ([]SlwNode, error) { } type GetOneResourceDataReq struct { - SlwNodeID schsdk.SlwNodeID `json:"nodeId"` + SlwNodeID SlwNodeID `json:"nodeId"` } func (c *Client) GetCPUData(node GetOneResourceDataReq) (*CPUResourceData, error) {