fix var name and integration test

Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>

Author: jimmyxian

api/handlers.go

@@ -72,43 +72,41 @@ func getImages(c *context, w http.ResponseWriter, r *http.Request) {
 
 	// find an engine which has all images
 	// Engine.Addr : [found names]
-	dict := make(map[string][]string)
-	bFoundEngine := false
+	imageMap := make(map[string][]string)
 	var foundEngineAddr string
 	for _, image := range c.cluster.Images() {
 		for _, name := range names {
 			if image.Match(name) {
 				// check if engine addr already exists
-				value, exists := dict[image.Engine.Addr]
+				value, exists := imageMap[image.Engine.Addr]
 				if exists {
 					// check if name already exists
-					found := false
+					nameAlreadyExisted := false
 					for _, tempName := range value {
 						if tempName == name {
-							found = true
+							nameAlreadyExisted = true
 						}
 					}
-					if found == false {
-						dict[image.Engine.Addr] = append(value, name)
-						if len(names) == len(dict[image.Engine.Addr]) {
-							bFoundEngine = true
+					if nameAlreadyExisted == false {
+						imageMap[image.Engine.Addr] = append(value, name)
+						if len(names) == len(imageMap[image.Engine.Addr]) {
 							foundEngineAddr = image.Engine.Addr
 						}
 					}
 				} else {
-					dict[image.Engine.Addr] = []string{name}
+					imageMap[image.Engine.Addr] = []string{name}
 				}
 			}
-			if bFoundEngine {
+			if foundEngineAddr != "" {
 				break
 			}
 		}
-		if bFoundEngine {
+		if foundEngineAddr != "" {
 			break
 		}
 	}
 
-	if bFoundEngine {
+	if foundEngineAddr != "" {
 		proxy(c.tlsConfig, foundEngineAddr, w, r)
 	} else {
 		httpError(w, fmt.Sprintf("Not found an engine which has all images: %s", names), http.StatusNotFound)

test/integration/api/save.bats

@@ -43,30 +43,46 @@ function teardown() {
 	rm -f $temp_file_name_o
 }
 
-@test "docker save muti-images" {
-	start_docker_with_busybox 1
+@test "docker save multi-images" {
+	start_docker_with_busybox 2
 	start_docker 1
-	swarm_manage
-	
 	# tag busybox
-	run docker_swarm tag busybox testimage
-	[ "$status" -eq 0 ]	
+	docker -H ${HOSTS[0]} tag busybox test1
+	docker -H ${HOSTS[1]} tag busybox test2
+
+	# start manage
+	swarm_manage		
 
 	# make sure image exists
 	run docker_swarm images
 	[ "$status" -eq 0 ]
 	[[ "${output}" == *"busybox"* ]]
-	[[ "${output}" == *"testimage"* ]]
+	[[ "${output}" == *"test1"* ]]
+	[[ "${output}" == *"test2"* ]]
 
 	temp_file_name=$(mktemp)
 
-	docker_swarm save busybox testimage > $temp_file_name
+	# do not support save images which are on multi machine
+	run docker_swarm save busybox test1 test2 > $temp_file_name
+	[ "$status" -ne 0 ]
+	[[ "${output}" == *"Not found an engine which has all images"* ]]
+
+	# save images which are on same machine
+	docker_swarm save busybox test1 > $temp_file_name
 
 	# saved image file exists, not empty and is tar file
 	[ -s $temp_file_name ]
 	run file $temp_file_name
 	[ "$status" -eq 0 ]
 	[[ "${output}" == *"tar archive"* ]]
 
+	# load image on node-3
+	docker -H ${HOSTS[2]} load < $temp_file_name
+	# check image
+	run docker -H ${HOSTS[2]} images
+	[ "$status" -eq 0 ]
+	[[ "${output}" == *"busybox"* ]]
+	[[ "${output}" == *"test1"* ]]
+
 	rm -f $temp_file_name
 }