From 4404eb588d7137daf3bc9162e19a2642152316f5 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Wed, 23 Oct 2024 17:39:50 -0500 Subject: [PATCH] another total violation of protobuf by renumbering Signed-off-by: Jeff Carr --- droplet.proto | 33 +++++++++++++++++---------------- sampleData.go | 4 ++-- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/droplet.proto b/droplet.proto index eb27479..db24050 100644 --- a/droplet.proto +++ b/droplet.proto @@ -8,26 +8,27 @@ message Droplets { } message Droplet { - string uuid = 1; - string name = 2; - string hostname = 3; - int64 cpus = 4; - int64 memory = 5; - string start_state = 6; // what the state of the droplet is SUPPOSED TO BE ('on' or 'off') + string uuid = 1; // should be unique across the cluster + string hostname = 2; // should be unique and work in DNS + int64 cpus = 3; // what's the point of int64 vs int32 + int64 memory = 4; // in bytes + string start_state = 5; // what the state of the droplet is SUPPOSED TO BE ('on' or 'off') + string notes = 6; // maybe useful for something + string preferred_hypervisor = 7; // the hypervisor to prefer to run the droplet on + string qemu_arch = 8; // what arch. example: "x86_64" or "riscv64" + string qemu_cpu = 9; // qemu-system -cpu help + string qemu_machine = 10; // qemu-system -machine help + int64 spice_port = 11; // preferred port to use for spice - repeated Network networks = 7; - repeated Disk disks = 8; + repeated Network networks = 12; // really just mac addresses. should be unique across cluster + repeated Disk disks = 13; // disks to attach - string comment = 9; - string preferred_hypervisor = 10; // the hypervisor to prefer to run the droplet on - google.protobuf.Any testany = 11; - StorageInfo humantest = 12; - - string qemu_arch = 13; - string qemu_cpu = 14; // qemu-system -cpu help - string qemu_machine = 15; // qemu-system -machine help + // trying to figure out how this stuff should work + google.protobuf.Any testany = 14; + StorageInfo humantest = 15; } + message Network { string mac = 1; string name = 2; diff --git a/sampleData.go b/sampleData.go index 02c6a0b..c87fcd0 100644 --- a/sampleData.go +++ b/sampleData.go @@ -21,7 +21,7 @@ func CreateSampleDroplet(hostname string) *Droplet { d := &Droplet{ Uuid: id.String(), Hostname: hostname, - Comment: "this is a droplet for testing", + Notes: "this is a droplet for testing", } return d } @@ -47,7 +47,7 @@ func CreateSampleCluster(total int) *Cluster { for i := 0; i < total; i++ { hostname := fmt.Sprintf("bmath%d.wit.com", i) d := CreateSampleDroplet(hostname) - d.Comment = fmt.Sprintf("Sample Droplet %d", i) + d.Notes = fmt.Sprintf("Sample Droplet %d", i) d.PreferredHypervisor = fmt.Sprintf("farm%d", i) if d.PreferredHypervisor == "farm4" { d.Cpus = 16