Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: synchronise to ocm-api-model 0.0.377 #962

Merged
merged 1 commit into from
Jun 12, 2024
Merged

chore: synchronise to ocm-api-model 0.0.377 #962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export PATH := $(LOCAL_BIN_PATH):$(PATH)
export CGO_ENABLED=0

# Details of the model to use:
model_version:=v0.0.376
model_version:=v0.0.377
model_url:=https://github.com/openshift-online/ocm-api-model.git

# Details of the metamodel to use:
Expand Down
4 changes: 2 additions & 2 deletions clustersmgmt/v1/azure_node_pool_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ package v1 // github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1
// Representation of azure node pool specific parameters.
type AzureNodePoolBuilder struct {
bitmap_ uint32
osDiskSizeGibibytes string
osDiskSizeGibibytes int
osDiskStorageAccountType string
vmSize string
resourceName string
Expand All @@ -42,7 +42,7 @@ func (b *AzureNodePoolBuilder) Empty() bool {
}

// OSDiskSizeGibibytes sets the value of the 'OS_disk_size_gibibytes' attribute to the given value.
func (b *AzureNodePoolBuilder) OSDiskSizeGibibytes(value string) *AzureNodePoolBuilder {
func (b *AzureNodePoolBuilder) OSDiskSizeGibibytes(value int) *AzureNodePoolBuilder {
b.osDiskSizeGibibytes = value
b.bitmap_ |= 1
return b
Expand Down
8 changes: 4 additions & 4 deletions clustersmgmt/v1/azure_node_pool_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ package v1 // github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1
// Representation of azure node pool specific parameters.
type AzureNodePool struct {
bitmap_ uint32
osDiskSizeGibibytes string
osDiskSizeGibibytes int
osDiskStorageAccountType string
vmSize string
resourceName string
Expand All @@ -43,11 +43,11 @@ func (o *AzureNodePool) Empty() bool {
// Nodes in the Node Pool. The property
// is the number of bytes x 1024^3.
// If not specified, OS disk size is 30 GiB.
func (o *AzureNodePool) OSDiskSizeGibibytes() string {
func (o *AzureNodePool) OSDiskSizeGibibytes() int {
if o != nil && o.bitmap_&1 != 0 {
return o.osDiskSizeGibibytes
}
return ""
return 0
}

// GetOSDiskSizeGibibytes returns the value of the 'OS_disk_size_gibibytes' attribute and
Expand All @@ -57,7 +57,7 @@ func (o *AzureNodePool) OSDiskSizeGibibytes() string {
// Nodes in the Node Pool. The property
// is the number of bytes x 1024^3.
// If not specified, OS disk size is 30 GiB.
func (o *AzureNodePool) GetOSDiskSizeGibibytes() (value string, ok bool) {
func (o *AzureNodePool) GetOSDiskSizeGibibytes() (value int, ok bool) {
ok = o != nil && o.bitmap_&1 != 0
if ok {
value = o.osDiskSizeGibibytes
Expand Down
4 changes: 2 additions & 2 deletions clustersmgmt/v1/azure_node_pool_type_json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func writeAzureNodePool(object *AzureNodePool, stream *jsoniter.Stream) {
stream.WriteMore()
}
stream.WriteObjectField("os_disk_size_gibibytes")
stream.WriteString(object.osDiskSizeGibibytes)
stream.WriteInt(object.osDiskSizeGibibytes)
count++
}
present_ = object.bitmap_&2 != 0
Expand Down Expand Up @@ -111,7 +111,7 @@ func readAzureNodePool(iterator *jsoniter.Iterator) *AzureNodePool {
}
switch field {
case "os_disk_size_gibibytes":
value := iterator.ReadString()
value := iterator.ReadInt()
object.osDiskSizeGibibytes = value
object.bitmap_ |= 1
case "os_disk_storage_account_type":
Expand Down
6 changes: 4 additions & 2 deletions clustersmgmt/v1/openapi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27881,8 +27881,10 @@ var OpenAPI = []byte{
0x20, 0x6e, 0x6f, 0x74, 0x20, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x2c, 0x20,
0x4f, 0x53, 0x20, 0x64, 0x69, 0x73, 0x6b, 0x20, 0x73, 0x69, 0x7a, 0x65, 0x20, 0x69, 0x73, 0x20,
0x33, 0x30, 0x20, 0x47, 0x69, 0x42, 0x2e, 0x22, 0x2c, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x73,
0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x69,
0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x22, 0x2c, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0x3a, 0x20, 0x22,
0x69, 0x6e, 0x74, 0x33, 0x32, 0x22, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x7d, 0x2c, 0xa, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x6f,
0x73, 0x5f, 0x64, 0x69, 0x73, 0x6b, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x5f, 0x61,
0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3a, 0x20, 0x7b, 0xa,
Expand Down
3 changes: 2 additions & 1 deletion openapi/clusters_mgmt/v1/openapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14217,7 +14217,8 @@
"properties": {
"os_disk_size_gibibytes": {
"description": "The size in GiB to assign to the OS disks of the\nNodes in the Node Pool. The property\nis the number of bytes x 1024^3.\nIf not specified, OS disk size is 30 GiB.",
"type": "string"
"type": "integer",
"format": "int32"
},
"os_disk_storage_account_type": {
"description": "The disk storage account type to use for the OS disks of the Nodes in the\nNode Pool. Valid values are:\n* Standard_LRS: HDD\n* StandardSSD_LRS: Standard SSD\n* Premium_LRS: Premium SDD\n* UltraSSD_LRS: Ultra SDD\n\nIf not specified, `Premium_LRS` is used.",
Expand Down
Loading