Merge pull request #1028 from rbradford/fix-1027

Fix #1027 - workload yaml parsing
ciao-project · Jan 18, 2017 · de1a5da · de1a5da
2 parents f16db23 + 055c2d8
commit de1a5da
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/ciao-cli/examples/fedora_cloud.yaml b/ciao-cli/examples/fedora_cloud.yaml
@@ -1,9 +1,14 @@
 description: "Fedora VM no storage"
 vm_type: qemu
 fw_type: legacy
-image_id: "73a86d7e-93c0-480e-9c41-ab42f69b7799"
 defaults:
     vcpus: 2
     mem_mb: 512
     disk_mb: 1024
 cloud_init: fedora_vm.yaml
+disks:
+  - source:
+       service: image
+       id: "73a86d7e-93c0-480e-9c41-ab42f69b7799"
+    ephemeral: true
+    bootable: true
diff --git a/ciao-cli/examples/fedora_cloud_disk.yaml b/ciao-cli/examples/fedora_cloud_disk.yaml
@@ -1,12 +1,16 @@
 description: "Fedora VM with attached empty storage"
 vm_type: qemu
 fw_type: legacy
-image_id: "73a86d7e-93c0-480e-9c41-ab42f69b7799"
 defaults:
     vcpus: 2
     mem_mb: 512
     disk_mb: 1024
 cloud_init: "fedora_vm.yaml"
 disks:
+- source:
+    service: image
+    id: "73a86d7e-93c0-480e-9c41-ab42f69b7799"
+  bootable: true
+  ephemeral: true
 - size: 20
   ephemeral: true
diff --git a/ciao-cli/workload.go b/ciao-cli/workload.go
@@ -144,8 +144,8 @@ func getCiaoWorkloadsResource() (string, error) {
 }
 
 type source struct {
-	Type types.SourceType `json:"service"`
-	ID   string           `json:"id"`
+	Type types.SourceType `yaml:"service"`
+	ID   string           `yaml:"id"`
 }
 
 type disk struct {