[region] add test case for region

Author: Jimmy-Xu

hack/generate-hyper-conf-dev.sh

@@ -11,6 +11,10 @@ if [ "$@" != "./build.sh" ];then
 {
     "clouds": {
         "${DOCKER_HOST}": {
+            "accesskey": "${ACCESS_KEY}",
+            "secretkey": "${SECRET_KEY}"
+        },
+        "tcp://*.hyper.sh:443": {
             "accesskey": "${ACCESS_KEY}",
             "secretkey": "${SECRET_KEY}",
             "region": "${REGION}"

hack/generate-hyper-conf-qa.sh

@@ -35,6 +35,10 @@ if [[ "$@" != "./build.sh" ]];then
 {
     "clouds": {
         "${DOCKER_HOST}": {
+            "accesskey": "${ACCESS_KEY}",
+            "secretkey": "${SECRET_KEY}"
+        },
+        "tcp://*.hyper.sh:443": {
             "accesskey": "${ACCESS_KEY}",
             "secretkey": "${SECRET_KEY}",
             "region": "${REGION}"

integration-cli/README.md

@@ -66,6 +66,7 @@ Functional test for hyper cli.
 - [x] cli_ps_test
 - [x] cli_pull_test
 - [x] cli_push_test
+- [x] cli_region_test
 - [x] cli_rename_test
 - [x] cli_restart_test
 - [x] cli_rm_test
@@ -374,4 +375,19 @@ $ docker run -it --rm \
     -e http_proxy=${http_proxy} \
     -e https_proxy=${https_proxy} \
     hyperhq/hypercli-auto-test:qa go test -check.f TestCliInfo
+    
+//test with region(region name could be us-west-1/eu-central-1)
+$ docker run -it --rm \
+    -e ACCESS_KEY=${ACCESS_KEY} \
+    -e SECRET_KEY=${SECRET_KEY} \
+    -e REGION=${REGION} \
+    -e http_proxy=${http_proxy} \
+    -e https_proxy=${https_proxy} \
+    hyperhq/hypercli-auto-test:qa go test -check.f TestCliInfo
+
+//test basic test case only
+$ docker run -it --rm \
+    -e ACCESS_KEY=${ACCESS_KEY} \
+    -e SECRET_KEY=${SECRET_KEY} \
+    hyperhq/hypercli-auto-test:qa go test -check.f "TestCli.*Basic" -timeout 180m
 ```

integration-cli/hyper_cli_region_test.go

@@ -0,0 +1,97 @@
+package main
+
+import (
+	"time"
+	"os"
+	"os/exec"
+
+	"github.com/go-check/check"
+	"github.com/docker/docker/pkg/integration/checker"
+)
+
+func (s *DockerSuite) TestCliRegionBasic(c *check.C) {
+	printTestCaseName()
+	defer printTestDuration(time.Now())
+
+	var (
+		defaultRegion = os.Getenv("REGION")
+		anotherRegion = ""
+		err error
+	)
+	switch defaultRegion {
+	case "":
+		defaultRegion = "us-west-1"
+		anotherRegion = "eu-central-1"
+	case "us-west-1":
+		anotherRegion = "eu-central-1"
+	case "eu-central-1":
+		anotherRegion = "us-west-1"
+	}
+
+	//delete busybox
+	cmd := exec.Command(dockerBinary, "rmi", "-f", "busybox")
+	runCommandWithOutput(cmd)
+	cmd = exec.Command(dockerBinary, "images", "busybox")
+	out, _, _ := runCommandWithOutput(cmd)
+	c.Assert(out, checker.Not(checker.Contains), "busybox")
+	//delete ubuntu
+	cmd = exec.Command(dockerBinary, "--region", anotherRegion, "rmi", "-f", "ubuntu")
+	runCommandWithOutput(cmd)
+	cmd = exec.Command(dockerBinary, "--region", anotherRegion, "images", "ubuntu")
+	out, _, _ = runCommandWithOutput(cmd)
+	c.Assert(out, checker.Not(checker.Contains), "ubuntu")
+
+	////////////////////////////////////////////
+	//pull image with default region
+	cmd = exec.Command(dockerBinary, "pull", "busybox")
+	out, _, err = runCommandWithOutput(cmd)
+	if err != nil {
+		c.Fatal(err, out)
+	}
+	c.Assert(out, checker.Contains, "Status: Downloaded newer image for busybox:latest")
+
+	cmd = exec.Command(dockerBinary, "run", "busybox", "echo", "test123")
+	out, _, err = runCommandWithOutput(cmd)
+	if err != nil {
+		c.Fatal(err, out)
+	}
+	c.Assert(out, checker.Not(checker.Contains), "Unable to find image 'busybox:latest' in the current region")
+	c.Assert(out, checker.Contains, "test123")
+
+	////////////////////////////////////////////
+	//image not exist in another region
+	cmd = exec.Command(dockerBinary, "--region", anotherRegion, "images", "busybox")
+	out, _, err = runCommandWithOutput(cmd)
+	if err != nil {
+		c.Fatal(err, out)
+	}
+	c.Assert(out, checker.Not(checker.Contains), "busybox")
+
+	////////////////////////////////////////////
+	//pull image with specified region
+	cmd = exec.Command(dockerBinary, "--region", anotherRegion, "pull", "ubuntu")
+	out, _, err = runCommandWithOutput(cmd)
+	if err != nil {
+		c.Fatal(err, out)
+	}
+	c.Assert(out, checker.Contains, "Status: Downloaded newer image for ubuntu:latest")
+
+	cmd = exec.Command(dockerBinary, "--region", anotherRegion, "run", "ubuntu", "echo", "test123")
+	out, _, err = runCommandWithOutput(cmd)
+	if err != nil {
+		c.Fatal(err, out)
+	}
+	c.Assert(out, checker.Not(checker.Contains), "Unable to find image 'ubuntu:latest' in the current region")
+	c.Assert(out, checker.Contains, "test123")
+}
+
+func (s *DockerSuite) TestCliRegionWithFullEntrypoint(c *check.C) {
+	printTestCaseName()
+	defer printTestDuration(time.Now())
+	cmd := exec.Command(dockerBinary, "--region", os.Getenv("DOCKER_HOST"), "pull", "busybox")
+	out, _, err := runCommandWithOutput(cmd)
+	if err != nil {
+		c.Fatal(err, out)
+	}
+	c.Assert(out, checker.Contains, "Status: Downloaded newer image for busybox:latest")
+}