Merge pull request #180 from axsh/template-misc

Template misc

Author: Masahiro Fujiwara

ci/citest/acceptance-test/tests/fixtures/lxc2.json

@@ -0,0 +1,13 @@
+{
+  "title": "CentOS7",
+  "template": {
+    "type": "vm/lxc",
+    "lxc_template": {
+      "openvdc": {
+        "distro": "centos",
+        "release": "7"
+      }
+    }
+  }
+}
+

ci/citest/acceptance-test/tests/local_image_test.go

@@ -3,20 +3,54 @@
 package tests
 
 import (
+	"fmt"
+	"path/filepath"
 	"strings"
 	"testing"
 	"time"
 )
 
+func init() {
+        if err := RestoreAssets("/var/tmp", "fixtures"); err != nil {
+                panic(err)
+        }
+}
+
 func TestLocalImage(t *testing.T) {
 
+	stdout, _, err := RunSsh(scheduler_ip, fmt.Sprintf("[ -f /var/www/html/images/centos/7/amd64/meta.tar.xz ] && echo meta.tar.xz found || echo meta.tar.xz not found"))
+
+        if err != nil {
+                t.Error(err)
+        }
+
+        t.Log(stdout.String())
+
 	// Use custom lxc-template.
-	stdout, _ := RunCmdAndReportFail(t, "openvdc", "run", "centos/7/lxc", `{"lxc_template":{"template":"openvdc"}, "node_groups":["linuxbr"]}`)
+	stdout, _ = RunCmdAndReportFail(t, "openvdc", "run", "/var/tmp/fixtures/lxc2.json", `{"node_groups":["linuxbr"]}`)
 	instance_id := strings.TrimSpace(stdout.String())
 
-	_, _ = RunCmdAndReportFail(t, "openvdc", "show", instance_id)
 	WaitInstance(t, 10*time.Minute, instance_id, "RUNNING", []string{"QUEUED", "STARTING"})
-	RunSshWithTimeoutAndReportFail(t, executor_lxc_ip, "sudo lxc-info -n "+instance_id, 10, 5)
+
+	configFile := filepath.Join("/var/lib/lxc/", instance_id, "config")
+	stdout, _, err = RunSsh(executor_lxc_ip, fmt.Sprintf("echo | sudo head -n 1 %s", configFile))
+
+	if err != nil {
+		t.Error(err)
+	}
+	if stdout.Len() == 0 {
+		t.Errorf("Couldn't read %s", configFile)
+	}
+
+	if testing.Verbose() {
+		t.Log(stdout.String())
+	}
+
+	s := strings.Split(strings.TrimSpace(stdout.String()), "/")
+	templateUsed := s[len(s)-1]
+	if templateUsed != "lxc-openvdc" {
+		t.Errorf("Expected templateUsed to be 'lxc-openvdc', got:  %s", templateUsed)
+	}
 
 	_, _ = RunCmdAndReportFail(t, "openvdc", "stop", instance_id)
 

cmd/lxc-openvdc/main.go

@@ -127,8 +127,8 @@ func PrepareCache() error {
 
 func GenerateConfig() error {
 	if lxcPath == "" {
-                return errors.New("lxcPath not set.")
-        }
+		return errors.New("lxcPath not set.")
+	}
 
 	lxcCfgPath := filepath.Join(lxcPath, "config")
 	cfgPath := filepath.Join(containerPath, "config")
@@ -179,7 +179,7 @@ func GetFile(fileName string) error {
 	}
 
 	if res.StatusCode != 200 {
-		return errors.New(fmt.Sprintf("Http status code: %s", res.StatusCode))
+		return errors.Errorf("Url: %s Http status code: %s", downloadUrl, res.StatusCode)
 	}
 
 	defer res.Body.Close()

templates/centos/7/lxc2.json

@@ -0,0 +1,12 @@
+{
+  "title": "CentOS7",
+  "template": {
+    "type": "vm/lxc",
+    "lxc_template": {
+      "openvdc": {
+        "distro": "centos",
+        "release": "7"
+      }
+    }
+  }
+}