Skip to content

Commit

Permalink
Merge pull request kubevirt#567 from lukas-bednar/bootorder
Browse files Browse the repository at this point in the history
schema: update json tag to allow bootOrder be empty
  • Loading branch information
rmohr authored Nov 16, 2017
2 parents 8c67c92 + 1d5bf52 commit da40779
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
3 changes: 1 addition & 2 deletions api/openapi-spec/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -2585,8 +2585,7 @@
},
"v1.OS": {
"required": [
"type",
"bootOrder"
"type"
],
"properties": {
"bios": {
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/schema.go
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ type Alias struct {
type OS struct {
Type OSType `json:"type"`
SMBios *SMBios `json:"smBIOS,omitempty"`
BootOrder []Boot `json:"bootOrder"`
BootOrder []Boot `json:"bootOrder,omitempty"`
BootMenu *BootMenu `json:"bootMenu,omitempty"`
BIOS *BIOS `json:"bios,omitempty"`
}
Expand Down
3 changes: 1 addition & 2 deletions pkg/api/v1/schema_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ var exampleJSON = `{
"os": {
"type": {
"os": "hvm"
},
"bootOrder": null
}
},
"devices": {
"interfaces": [
Expand Down

0 comments on commit da40779

Please sign in to comment.