Boolean field in machine allocation network can not be optional.

Swagger clients will omit the value due to a bug: swagger-api/swagger-codegen#7391
metal-stack · Jul 19, 2019 · 582fb16 · 582fb16
1 parent 1f3cd79
commit 582fb16
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 24 deletions.
diff --git a/cmd/metal-api/internal/service/v1/machine.go b/cmd/metal-api/internal/service/v1/machine.go
@@ -155,7 +155,7 @@ type MachineAllocationNetworks []MachineAllocationNetwork
 
 type MachineAllocationNetwork struct {
 	NetworkID     string `json:"networkid" description:"the id of the network that this machine will be placed in"`
-	AutoAcquireIP *bool  `json:"autoacquire" description:"will automatically acquire an ip in this network if set to true, default is true" optional:"true"`
+	AutoAcquireIP *bool  `json:"autoacquire" description:"will automatically acquire an ip in this network if set to true, default is true"`
 }
 
 type MachineFinalizeAllocationRequest struct {

diff --git a/spec/metal-api.json b/spec/metal-api.json
@@ -2627,12 +2627,12 @@
     },
     "v1.FirewallCreateRequest": {
       "required": [
+        "projectid",
+        "imageid",
         "sizeid",
-        "partitionid",
         "ssh_pub_keys",
         "tenant",
-        "imageid",
-        "projectid"
+        "partitionid"
       ],
       "properties": {
         "description": {
@@ -2711,18 +2711,18 @@
     },
     "v1.FirewallResponse": {
       "required": [
+        "id",
         "liveliness",
-        "changed",
-        "size",
-        "allocation",
-        "rackid",
+        "tags",
         "hardware",
-        "id",
+        "state",
         "events",
         "partition",
-        "tags",
-        "state",
-        "created"
+        "rackid",
+        "changed",
+        "allocation",
+        "created",
+        "size"
       ],
       "properties": {
         "allocation": {
@@ -3152,7 +3152,8 @@
     },
     "v1.MachineAllocationNetwork": {
       "required": [
-        "networkid"
+        "networkid",
+        "autoacquire"
       ],
       "properties": {
         "autoacquire": {
@@ -3231,9 +3232,9 @@
     },
     "v1.MachineHardware": {
       "required": [
+        "memory",
         "cpu_cores",
         "disks",
-        "memory",
         "nics"
       ],
       "properties": {
@@ -3542,13 +3543,13 @@
       "required": [
         "id",
         "partition",
-        "size",
         "allocation",
-        "state",
-        "liveliness",
+        "events",
         "rackid",
+        "size",
         "hardware",
-        "events",
+        "state",
+        "liveliness",
         "tags",
         "created",
         "changed"
@@ -3642,12 +3643,12 @@
     "v1.NetworkCreateRequest": {
       "required": [
         "id",
-        "underlay",
-        "parentnetworkid",
         "prefixes",
         "destinationprefixes",
         "nat",
-        "primary"
+        "primary",
+        "underlay",
+        "parentnetworkid"
       ],
       "properties": {
         "description": {
@@ -3711,12 +3712,12 @@
     "v1.NetworkResponse": {
       "required": [
         "id",
+        "parentnetworkid",
         "prefixes",
         "destinationprefixes",
         "nat",
         "primary",
         "underlay",
-        "parentnetworkid",
         "usage",
         "created",
         "changed"
@@ -3934,8 +3935,8 @@
       "required": [
         "id",
         "bootconfig",
-        "created",
-        "changed"
+        "changed",
+        "created"
       ],
       "properties": {
         "bootconfig": {