[Agent][Deploy] - add zjyd

agent-common/image/ImageNameConvert.go

@@ -20,16 +20,27 @@ func ImageFullNameToAppName(imageFullName string) (appName string) {
 	// 10.1.1.1:8033/cmii/ok:1.2  不支持 不允许存在
 	// rancher/fleet:v0.3.4
 
-	// ossr/srs:v5.0.1  ==> docker=cmii=srs=v5.0.1.tar.gz
+	// ossr/srs:v5.0.1
 	// nginx:latest
 	// bitnami/minio:2022.5.4
 	// simonrupf/chronyd:0.4.3
 
-	if strings.HasPrefix(imageFullName, CmiiHarborPrefix) {
-		return strings.Split(strings.TrimPrefix(imageFullName, CmiiHarborPrefix), ":")[0]
+	s := strings.Split(imageFullName, ":")
+	if len(s) == 1 {
+		// nginx
+		return imageFullName
 	}
+	// 10.1.1.1:8033/cmii/ok:1.2
+	// harbor.cdcyy.cn/cmii/cmii-uav-platform:5.4.0 ==> cmii-uav-platform
+	// rancher/fleet:v0.3.4
+	// ossr/srs:v5.0.1
+	// nginx:latest
+	// bitnami/minio:2022.5.4
+	// simonrupf/chronyd:0.4.3
 
-	return ""
+	middle := s[len(s)-2]
+	split := strings.Split(middle, "/")
+	return split[len(split)-1]
 }
 
 func ImageFullNameToImageTag(imageFullName string) (imageTag string) {
@@ -43,6 +54,27 @@ func ImageFullNameToImageTag(imageFullName string) (imageTag string) {
 	return s
 }
 
+func ImageFullNameToImageNameAndTag(imageFullName string) (imageName, imageTag string) {
+
+	s := strings.Split(imageFullName, ":")
+	if len(s) == 1 {
+		// nginx
+		return imageFullName, "latest"
+	}
+	// 10.1.1.1:8033/cmii/ok:1.2
+	// harbor.cdcyy.cn/cmii/cmii-uav-platform:5.4.0 ==> cmii-uav-platform
+	// rancher/fleet:v0.3.4
+	// ossr/srs:v5.0.1
+	// nginx:latest
+	// bitnami/minio:2022.5.4
+	// simonrupf/chronyd:0.4.3
+
+	middle := s[len(s)-2]
+	split := strings.Split(middle, "/")
+	return split[len(split)-1], s[len(s)-1]
+
+}
+
 // ImageFullNameToGzipFileName 必须输出长度为4的内容 =出现得次数为3
 func ImageFullNameToGzipFileName(imageFullName string) (gzipFileName string) {
 
@@ -226,3 +258,35 @@ func GzipFolderPathToCmiiImageTagMaps(gzipFolderPath string) (frontendImageVersi
 
 	return frontendImageVersionMap, backendImageVersionMap, srsImageVersionMap
 }
+
+func CmiiImageMapFromImageFullNameList(cmiiImageFullNameList []string) (cmiiImageVersionMap map[string]string) {
+
+	cmiiImageVersionMap = make(map[string]string)
+	for _, imageFullName := range cmiiImageFullNameList {
+		imageName, imageTag := ImageFullNameToImageNameAndTag(imageFullName)
+		cmiiImageVersionMap[imageName] = imageTag
+	}
+
+	return cmiiImageVersionMap
+}
+
+func FrontendBackendSrsImageMapFromCmiiImageMap(cmiiImageVersionMap map[string]string) (frontendImageVersionMap, backendImageVersionMap, srsImageVersionMap map[string]string) {
+
+	frontendImageVersionMap = make(map[string]string)
+	backendImageVersionMap = make(map[string]string)
+	srsImageVersionMap = make(map[string]string)
+
+	for imageName, imageTag := range cmiiImageVersionMap {
+		if strings.Contains(imageName, "platform") {
+			frontendImageVersionMap[imageName] = imageTag
+		} else if strings.Contains(imageName, "srs") {
+			srsImageVersionMap[imageName] = imageTag
+		} else if strings.Contains(imageName, "operator") {
+			srsImageVersionMap[imageName] = imageTag
+		} else {
+			backendImageVersionMap[imageName] = imageTag
+		}
+	}
+
+	return frontendImageVersionMap, backendImageVersionMap, srsImageVersionMap
+}

agent-common/image/ImageNameConvert_test.go

@@ -6,11 +6,12 @@ import (
 	"path/filepath"
 	"strings"
 	"testing"
+	"wdd.io/agent-common/real_project/zhejianyidong_erjipingtai"
+	"wdd.io/agent-common/real_project/zjjt"
 	"wdd.io/agent-common/utils"
 )
 
-func TestImageFullNameToGzipFileName(t *testing.T) {
-	test := []string{
+var imageFullNameList = []string{
 	"bitnami/redis:6.2.6-debian-10-r0",
 	"simonrupf/chronyd:0.4.3",
 	"harbor.cdcyy.com.cn/cmii/cmii-rtsp-operator:v4.1.0",
@@ -21,9 +22,12 @@ func TestImageFullNameToGzipFileName(t *testing.T) {
 	"busybox:latest",
 	"busybox",
 	"rancher/rancher:v2.7.0",
+	"10.1.1.1:8033/cmii/ok:1.2",
 }
 
-	for _, s := range test {
+func TestImageFullNameToGzipFileName(t *testing.T) {
+
+	for _, s := range imageFullNameList {
 		gzipFileName := ImageFullNameToGzipFileName(s)
 		fmt.Println(gzipFileName)
 	}
@@ -244,3 +248,36 @@ func TestImageGzipFileNameToImageFullName(t *testing.T) {
 	utils.BeautifulPrint(frontendMap)
 	utils.BeautifulPrint(srsMap)
 }
+
+func TestFrontendBackendImageMapFromCmiiImageMap(t *testing.T) {
+	frontendImageVersionMap, backendImageVersionMap, _ := FrontendBackendSrsImageMapFromCmiiImageMap(zjjt.CmiiImageMap)
+
+	utils.BeautifulPrint(frontendImageVersionMap)
+	utils.BeautifulPrint(backendImageVersionMap)
+}
+
+func TestImageFullNameToImageNameAndTag(t *testing.T) {
+
+	for _, s := range imageFullNameList {
+		imageName, imageTag := ImageFullNameToImageNameAndTag(s)
+		fmt.Printf("%-8s %-8s %-8s\n", imageName, imageTag, s)
+
+	}
+}
+
+func TestImageFullNameToAppName(t *testing.T) {
+
+	for _, s := range imageFullNameList {
+		imageName := ImageFullNameToAppName(s)
+		fmt.Printf("%-8s %-8s\n", imageName, s)
+
+	}
+}
+
+func TestCmiiImageMapFromImageFullNameList(t *testing.T) {
+	imageList := zhejianyidong_erjipingtai.Cmii570ImageList
+
+	cmiiImageVersionMap := CmiiImageMapFromImageFullNameList(imageList)
+
+	utils.BeautifulPrint(cmiiImageVersionMap)
+}