bat: Remove testing of instance ImageID

This field is no longer relevant and not populated with anything useful. Fixes: ciao-project#988 Signed-off-by: Rob Bradford <[email protected]>
sboeuf · Jul 11, 2017 · 2359ca4 · 2359ca4
1 parent 3fc5f2f
commit 2359ca4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/_release/bat/base_bat/base_bat_test.go b/_release/bat/base_bat/base_bat_test.go
@@ -236,7 +236,7 @@ func TestStartAllWorkloads(t *testing.T) {
 
 func checkInstances(t *testing.T, a, b *bat.Instance) {
 	if !(a.TenantID == b.TenantID &&
-		a.FlavorID == b.FlavorID && a.ImageID == b.ImageID &&
+		a.FlavorID == b.FlavorID &&
 		a.PrivateIP == b.PrivateIP && a.MacAddress == b.MacAddress &&
 		a.SSHIP == b.SSHIP && a.SSHPort == b.SSHPort) {
 		t.Fatalf("Instance details do not match: %v %v", a, b)

diff --git a/bat/compute.go b/bat/compute.go
@@ -36,7 +36,7 @@ import (
 
 const instanceTemplateDesc = `{ "host_id" : "{{.HostID | js }}", 
     "tenant_id" : "{{.TenantID | js }}", "flavor_id" : "{{.Flavor.ID | js}}",
-    "image_id" : "{{.Image.ID | js}}", "status" : "{{.Status | js}}",
+    "status" : "{{.Status | js}}",
     "ssh_ip" : "{{.SSHIP | js }}", "ssh_port" : {{.SSHPort}},
     "volumes" : {{tojson .OsExtendedVolumesVolumesAttached}}
     {{ $addrLen := len .Addresses.Private }}
@@ -67,7 +67,6 @@ type Instance struct {
 	HostID     string   `json:"host_id"`
 	TenantID   string   `json:"tenant_id"`
 	FlavorID   string   `json:"flavor_id"`
-	ImageID    string   `json:"image_id"`
 	Status     string   `json:"status"`
 	PrivateIP  string   `json:"private_ip"`
 	MacAddress string   `json:"mac_address"`