feat: add get volume info api and change get container info route

Author: mayooot

internal/api/code.go

@@ -26,8 +26,9 @@ const (
 	CodeContainerGpuCountMustGreaterThanZero
 	CodeContainerGpuNotEnough
 	CodeContainerGpuNoNeedPatch
+	CodeContainerVolumeNoNeedPatch
 	CodeContainerCommitFailed
-	COdeContainerGetInfoFailed
+	CodeContainerGetInfoFailed
 
 	CodeVolumeCreateFailed
 	CodeVolumeNameNotNull
@@ -39,7 +40,7 @@ const (
 	CodeVolumeSizeUsedGreaterThanReduce
 	CodeVolumeNameNotContainsDash
 	CodeVolumeNameNotBeginWithForwardSlash
-	CodeContainerVolumeNoNeedPatch
+	CodeVolumeGetInfoFailed
 
 	CodeEtcdDeleteFailed
 
@@ -72,7 +73,7 @@ var codeMsgMap = map[ResCode]string{
 	CodeContainerGpuNoNeedPatch:              "容器 GPU 资源不需要更新，因为更新前后数量一样",
 	CodeContainerVolumeNoNeedPatch:           "容器 Volume 挂载不需要更新，因为更新前后挂载一样",
 	CodeContainerCommitFailed:                "容器提交为镜像失败",
-	COdeContainerGetInfoFailed:               "获取容器信息失败",
+	CodeContainerGetInfoFailed:               "获取容器信息失败",
 
 	CodeVolumeCreateFailed:                 "Volume 创建失败",
 	CodeVolumeNameNotNull:                  "Volume name 不能为空",
@@ -84,6 +85,7 @@ var codeMsgMap = map[ResCode]string{
 	CodeVolumeSizeUsedGreaterThanReduce:    "Volume 大小更新失败，因为更新后的大小小于已使用的大小",
 	CodeVolumeNameNotContainsDash:          "Volume 名称不能包含-",
 	CodeVolumeNameNotBeginWithForwardSlash: "Volume 名称不能以 / 开头",
+	CodeVolumeGetInfoFailed:                "获取 Volume 信息失败",
 
 	CodeEtcdDeleteFailed: "删除 etcd 中的资源失败",
 

internal/api/container.go

@@ -34,7 +34,7 @@ func (ch *ContainerHandler) RegisterRoute(g *gin.RouterGroup) {
 	// 提交容器为镜像
 	g.POST("/containers/:name/commit", ch.commit)
 	// 查看容器创建信息
-	g.GET("/containers/:name/info", ch.info)
+	g.GET("/containers/:name", ch.info)
 }
 
 func (ch *ContainerHandler) run(c *gin.Context) {
@@ -337,13 +337,14 @@ func (ch *ContainerHandler) info(c *gin.Context) {
 	if !strings.Contains(name, "-") || len(strings.Split(name, "-")[1]) == 0 {
 		log.Errorf("failed to get container info, name: %s must be in format: name-version", name)
 		ResponseError(c, CodeContainerNameMustContainVersion)
+		return
 	}
 
 	info, err := cs.GetContainerInfo(name)
 	if err != nil {
 		log.Errorf("service.GetContainerInfo failed, original error: %T %v", errors.Cause(err), err)
 		log.Errorf("stack trace: \n%+v\n", err)
-		ResponseError(c, CodeContainerCommitFailed)
+		ResponseError(c, CodeContainerGetInfoFailed)
 		return
 	}
 

internal/api/resource.go

@@ -11,7 +11,7 @@ type Resource struct{}
 
 func (gh *Resource) RegisterRoute(g *gin.RouterGroup) {
 	g.GET("/resources/gpus", gh.getGpus)
-	g.GET("resources/usedPorts", gh.getUsedPorts)
+	g.GET("resources/ports", gh.getUsedPorts)
 }
 
 func (gh *Resource) getGpus(c *gin.Context) {
@@ -22,8 +22,8 @@ func (gh *Resource) getGpus(c *gin.Context) {
 }
 
 func (gh *Resource) getUsedPorts(c *gin.Context) {
-	ports := portscheduler.Scheduler.GetUsedPortSet()
+	status := portscheduler.Scheduler.GetPortStatus()
 	ResponseSuccess(c, gin.H{
-		"usedPorts": ports,
+		"portStatus": status,
 	})
 }

internal/api/volume.go

@@ -23,6 +23,8 @@ func (vh *VolumeHandler) RegisterRoute(g *gin.RouterGroup) {
 	g.DELETE("/volumes/:name", vh.delete)
 	// 变更已存在 Volume 的大小
 	g.PATCH("/volumes/:name/size", vh.patchSize)
+	// 查看 Volume 创建信息
+	g.GET("/volumes/:name", vh.info)
 }
 
 func (vh *VolumeHandler) create(c *gin.Context) {
@@ -146,3 +148,30 @@ func (vh *VolumeHandler) patchSize(c *gin.Context) {
 		"size": resp.Options["size"],
 	})
 }
+
+func (vh *VolumeHandler) info(c *gin.Context) {
+	name := c.Param("name")
+	if len(name) == 0 {
+		log.Error("failed to get volume info, name is empty")
+		ResponseError(c, CodeVolumeNameNotNull)
+		return
+	}
+
+	if !strings.Contains(name, "-") || len(strings.Split(name, "-")[1]) == 0 {
+		log.Errorf("failed to get volume info, name: %s must be in format: name-version", name)
+		ResponseError(c, CodeVolumeNameMustContainVersion)
+		return
+	}
+
+	info, err := vs.GetVolumeInfo(name)
+	if err != nil {
+		log.Errorf("service.GetVolumeInfo failed, original error: %T %v", errors.Cause(err), err)
+		log.Errorf("stack trace: \n%+v\n", err)
+		ResponseError(c, CodeVolumeGetInfoFailed)
+		return
+	}
+
+	ResponseSuccess(c, gin.H{
+		"info": info,
+	})
+}

internal/service/volume.go

@@ -186,6 +186,18 @@ func (vs *VolumeService) PatchVolumeSize(name string, spec *model.VolumeSize) (r
 	return
 }
 
+func (vs *VolumeService) GetVolumeInfo(name string) (info model.EtcdVolumeInfo, err error) {
+	infoBytes, err := etcd.Get(etcd.Volumes, name)
+	if err != nil {
+		return info, errors.WithMessage(err, "etcd.Get failed")
+	}
+
+	if err = json.Unmarshal(infoBytes, &info); err != nil {
+		return info, errors.WithMessage(err, "json.Unmarshal failed")
+	}
+	return
+}
+
 // 判断 Volume 是否存在
 func (vs *VolumeService) existVolume(name string) bool {
 	ctx := context.Background()