AMDプラン対応 (#238)

sacloud · Aug 8, 2023 · 104bc72 · 104bc72
1 parent ef9d83f
commit 104bc72
Show file tree

Hide file tree

Showing 14 changed files with 128 additions and 24 deletions.
diff --git a/fake/init.go b/fake/init.go
@@ -442,6 +442,7 @@ func initServerPlan(s Store, p *valuePool) {
 			CPU:          1,
 			MemoryMB:     1 * size.MiB,
 			GPU:          0,
+			CPUModel:     "uncategorized",
 			Commitment:   types.Commitments.Standard,
 			Generation:   100,
 			Availability: types.Availabilities.Available,
@@ -452,6 +453,7 @@ func initServerPlan(s Store, p *valuePool) {
 			CPU:          2,
 			MemoryMB:     4 * size.MiB,
 			GPU:          0,
+			CPUModel:     "uncategorized",
 			Commitment:   types.Commitments.Standard,
 			Generation:   100,
 			Availability: types.Availabilities.Available,
@@ -462,10 +464,22 @@ func initServerPlan(s Store, p *valuePool) {
 			CPU:          4,
 			MemoryMB:     56 * 1024 * size.MiB,
 			GPU:          1,
+			CPUModel:     "uncategorized",
 			Commitment:   types.Commitments.Standard,
 			Generation:   200,
 			Availability: types.Availabilities.Available,
 		},
+		{
+			ID:           p.generateID(),
+			Name:         "コア専有プラン/32Core-120GB",
+			CPU:          32,
+			MemoryMB:     120 * 1024 * size.MiB,
+			GPU:          0,
+			CPUModel:     "amd_epyc_7713p",
+			Commitment:   types.Commitments.DedicatedCPU,
+			Generation:   200,
+			Availability: types.Availabilities.Available,
+		},
 		// TODO add more plans
 	}
 

diff --git a/fake/ops_server.go b/fake/ops_server.go
@@ -230,6 +230,10 @@ func (o *ServerOp) ChangePlan(ctx context.Context, zone string, id types.ID, pla
 
 	value.CPU = plan.CPU
 	value.MemoryMB = plan.MemoryMB
+	value.ServerPlanCPUModel = plan.ServerPlanCPUModel
+	if value.ServerPlanCPUModel == "" {
+		value.ServerPlanCPUModel = "uncategorized"
+	}
 	value.ServerPlanCommitment = plan.ServerPlanCommitment
 	value.ServerPlanGeneration = plan.ServerPlanGeneration
 	value.ServerPlanID = types.StringID(fmt.Sprintf("%03d%03d%03d", value.ServerPlanGeneration, value.GetMemoryGB(), value.CPU))

diff --git a/helper/plans/change_plan.go b/helper/plans/change_plan.go
@@ -21,7 +21,6 @@ import (
 
 	"github.com/sacloud/iaas-api-go"
 	"github.com/sacloud/iaas-api-go/types"
-	"github.com/sacloud/packages-go/size"
 )
 
 var (
@@ -37,10 +36,7 @@ func ChangeServerPlan(
 	caller iaas.APICaller,
 	zone string,
 	id types.ID,
-	cpu int,
-	memoryGB int,
-	commitment types.ECommitment,
-	generation types.EPlanGeneration,
+	planRequest *iaas.ServerChangePlanRequest,
 ) (*iaas.Server, error) {
 	serverOp := iaas.NewServerOp(caller)
 	server, err := serverOp.Read(ctx, zone, id)
@@ -65,12 +61,7 @@ func ChangeServerPlan(
 		server = updated
 	}
 
-	return serverOp.ChangePlan(ctx, zone, server.ID, &iaas.ServerChangePlanRequest{
-		CPU:                  cpu,
-		MemoryMB:             memoryGB * size.GiB,
-		ServerPlanGeneration: generation,
-		ServerPlanCommitment: commitment,
-	})
+	return serverOp.ChangePlan(ctx, zone, server.ID, planRequest)
 }
 
 // ChangeRouterPlan 現在のIDをタグとして保持しつつプランを変更する

diff --git a/helper/query/server_plan.go b/helper/query/server_plan.go
@@ -29,6 +29,7 @@ type FindServerPlanRequest struct {
 	CPU        int
 	MemoryGB   int
 	GPU        int
+	CPUModel   string
 	Commitment types.ECommitment
 	Generation types.EPlanGeneration
 }
@@ -40,6 +41,7 @@ func (f *FindServerPlanRequest) findCondition() *iaas.FindCondition {
 		},
 		Filter: search.Filter{
 			search.Key("Commitment"): types.Commitments.Standard,
+			search.Key("GPU"):        f.GPU,
 		},
 		Count: 1000,
 	}
@@ -50,14 +52,15 @@ func (f *FindServerPlanRequest) findCondition() *iaas.FindCondition {
 		cond.Filter[search.Key("MemoryMB")] = size.GiBToMiB(f.MemoryGB)
 	}
 
-	cond.Filter[search.Key("GPU")] = f.GPU
-
 	if f.Generation != types.PlanGenerations.Default {
 		cond.Filter[search.Key("Generation")] = f.Generation
 	}
 	if f.Commitment != types.Commitments.Unknown && f.Commitment != types.Commitments.Standard {
 		cond.Filter[search.Key("Commitment")] = f.Commitment
 	}
+	if f.CPUModel != "" {
+		cond.Filter[search.Key("CPUModel")] = f.CPUModel
+	}
 	return cond
 }
 

diff --git a/internal/define/fields.go b/internal/define/fields.go
@@ -197,6 +197,16 @@ func (f *fieldsDef) Generation() *dsl.FieldDesc {
 	}
 }
 
+func (f *fieldsDef) CPUModel() *dsl.FieldDesc {
+	return &dsl.FieldDesc{
+		Name: "ServerPlanCPUModel",
+		Tags: &dsl.FieldTags{
+			JSON: "CPUModel,omitempty",
+		},
+		Type: meta.TypeString,
+	}
+}
+
 func (f *fieldsDef) Commitment() *dsl.FieldDesc {
 	return &dsl.FieldDesc{
 		Name: "ServerPlanCommitment",
@@ -274,6 +284,16 @@ func (f *fieldsDef) ServerPlanGeneration() *dsl.FieldDesc {
 	}
 }
 
+func (f *fieldsDef) ServerPlanCPUModel() *dsl.FieldDesc {
+	return &dsl.FieldDesc{
+		Name: "ServerPlanCPUModel",
+		Tags: &dsl.FieldTags{
+			MapConv: "ServerPlan.CPUModel",
+			JSON:    ",omitempty",
+		},
+		Type: meta.TypeString,
+	}
+}
 func (f *fieldsDef) ServerPlanCommitment() *dsl.FieldDesc {
 	return &dsl.FieldDesc{
 		Name: "ServerPlanCommitment",

diff --git a/internal/define/server.go b/internal/define/server.go
@@ -240,6 +240,7 @@ var (
 			fields.ServerPlanCPU(),
 			fields.ServerPlanMemoryMB(),
 			fields.ServerPlanGPU(),
+			fields.ServerPlanCPUModel(),
 			fields.ServerPlanCommitment(),
 			fields.ServerPlanGeneration(),
 			// zone
@@ -333,6 +334,7 @@ var (
 			fields.ServerPlanCPU(),
 			fields.ServerPlanMemoryMB(),
 			fields.ServerPlanGPU(),
+			fields.ServerPlanCPUModel(),
 			fields.ServerPlanCommitment(),
 			fields.ServerPlanGeneration(),
 			fields.ServerConnectedSwitch(),
@@ -382,6 +384,7 @@ var (
 			fields.CPU(),
 			fields.MemoryMB(),
 			fields.GPU(),
+			fields.CPUModel(),
 			fields.Generation(),
 			fields.Commitment(),
 		},

diff --git a/internal/define/server_plan.go b/internal/define/server_plan.go
@@ -47,6 +47,7 @@ var (
 			fields.CPU(),
 			fields.MemoryMB(),
 			fields.GPU(),
+			fields.Def("CPUModel", meta.TypeString),
 			fields.Def("Commitment", meta.TypeCommitment),
 			fields.Def("Generation", meta.TypePlanGeneration),
 			fields.Availability(),

diff --git a/naked/server_plan.go b/naked/server_plan.go
@@ -23,6 +23,7 @@ type ServerPlan struct {
 	CPU          int                 `json:",omitempty" yaml:"cpu,omitempty" structs:",omitempty"`
 	MemoryMB     int                 `json:",omitempty" yaml:"memory_mb,omitempty" structs:",omitempty"`
 	GPU          int                 `json:",omitempty" yaml:"gpu,omitempty" structs:",omitempty"`
+	CPUModel     string              `json:",omitempty" yaml:"cpu_model,omitempty" structs:",omitempty"`
 	Commitment   types.ECommitment   `json:",omitempty" yaml:"commitment,omitempty" structs:",omitempty"`
 	Generation   int                 `json:",omitempty" yaml:"generation,omitempty" structs:",omitempty"`
 	ServiceClass string              `json:",omitempty" yaml:"service_class,omitempty" structs:",omitempty"`

diff --git a/test/server_op_test.go b/test/server_op_test.go
@@ -152,6 +152,7 @@ var (
 		"Availability",
 		"ServerPlanID",
 		"ServerPlanName",
+		"ServerPlanCPUModel",
 		"ServerPlanGeneration",
 		"ServerPlanCommitment",
 		"Zone",

diff --git a/test/server_plan_op_test.go b/test/server_plan_op_test.go
@@ -36,6 +36,7 @@ func TestServerPlanOp_Find(t *testing.T) {
 		testutil.AssertNotEmptyFunc(t, searched.ServerPlans[0].ID, "ServerPlans.ID"),
 		testutil.AssertNotEmptyFunc(t, searched.ServerPlans[0].Name, "ServerPlans.Name"),
 		testutil.AssertNotEmptyFunc(t, searched.ServerPlans[0].CPU, "ServerPlans.CPU"),
+		testutil.AssertNotEmptyFunc(t, searched.ServerPlans[0].CPUModel, "ServerPlans.CPUModel"),
 		testutil.AssertNotEmptyFunc(t, searched.ServerPlans[0].Commitment, "ServerPlans.Commitment"),
 		testutil.AssertNotEmptyFunc(t, searched.ServerPlans[0].Generation, "ServerPlans.Generation"),
 		testutil.AssertNotEmptyFunc(t, searched.ServerPlans[0].Availability, "ServerPlans.Availability"),

diff --git a/trace/otel/go.mod b/trace/otel/go.mod
@@ -5,9 +5,9 @@ go 1.20
 replace github.com/sacloud/iaas-api-go => ../../
 
 require (
-	github.com/sacloud/api-client-go v0.0.2
+	github.com/sacloud/api-client-go v0.2.8
 	github.com/sacloud/iaas-api-go v0.0.0-00010101000000-000000000000
-	github.com/stretchr/testify v1.7.0
+	github.com/stretchr/testify v1.8.4
 	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.29.0
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.27.0
 	go.opentelemetry.io/otel v1.4.1
@@ -22,21 +22,21 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fatih/structs v1.1.0 // indirect
 	github.com/felixge/httpsnoop v1.0.2 // indirect
-	github.com/fsnotify/fsnotify v1.5.1 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/go-logr/logr v1.2.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
-	github.com/hashicorp/go-retryablehttp v0.7.0 // indirect
+	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
+	github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/mitchellh/mapstructure v1.4.3 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/sacloud/go-http v0.0.4 // indirect
-	github.com/sacloud/packages-go v0.0.1 // indirect
+	github.com/sacloud/go-http v0.1.6 // indirect
+	github.com/sacloud/packages-go v0.0.9 // indirect
 	go.opentelemetry.io/otel/internal/metric v0.25.0 // indirect
 	go.opentelemetry.io/otel/metric v0.25.0 // indirect
 	go.uber.org/ratelimit v0.2.0 // indirect
-	golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
-	golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	golang.org/x/crypto v0.10.0 // indirect
+	golang.org/x/sys v0.9.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/trace/otel/go.sum b/trace/otel/go.sum
@@ -10,6 +10,7 @@ github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW
 github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
 github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
+github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
 github.com/go-logr/logr v1.2.2 h1:ahHml/yUpnlb96Rp8HCvtYVPY8ZYpxq3g7UYchIYwbs=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
@@ -20,11 +21,13 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
+github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
 github.com/hashicorp/go-hclog v0.9.2 h1:CG6TE5H9/JXsFWJCfoIVpKFIkFe6ysEuHirp4DxCsHI=
 github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hashicorp/go-retryablehttp v0.7.0 h1:eu1EI/mbirUgP5C8hVsTNaGZreBDlYiwC1FZWkvQPQ4=
 github.com/hashicorp/go-retryablehttp v0.7.0/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
+github.com/hashicorp/go-retryablehttp v0.7.2/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8=
 github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
@@ -38,6 +41,7 @@ github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs=
 github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -46,17 +50,21 @@ github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUA
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/sacloud/api-client-go v0.0.2 h1:yEcMiqjZ0hIjg5xB2f4L+BfGVrilurXieZGHZvGgQWE=
 github.com/sacloud/api-client-go v0.0.2/go.mod h1:9KvGD1aKfIBFjF16Nel8ylQs79FpTzEJr2yTLtyyOsA=
+github.com/sacloud/api-client-go v0.2.8/go.mod h1:0CV/kWNYlS1hCNdnk6Wx7Wdg8DPFCnv0zOIzdXjeAeY=
 github.com/sacloud/go-http v0.0.4 h1:+vgx/uCctcGiHMe8jE+qirMKd3+d73MNZXK7nrUo0po=
 github.com/sacloud/go-http v0.0.4/go.mod h1:aYTXNuAnPmD6Ar3ktDaR1gPxJCPv2CqpppcYciy1hmo=
+github.com/sacloud/go-http v0.1.6/go.mod h1:oLAHoDJRkptf8sq4fE8oERLkdCh0kJWfWu+paoJY7I0=
 github.com/sacloud/packages-go v0.0.1 h1:9sLJV6i4GyccQwJ2wlkE4WVq63BptVV7EqWrH85f62c=
 github.com/sacloud/packages-go v0.0.1/go.mod h1:m1yCD3nnwkontNZPNMEw/sRWkLIJcIJjsSUzWFamdlo=
+github.com/sacloud/packages-go v0.0.9/go.mod h1:k+EEUMF2LlncjbNIJNOqLyZ9wjTESPIWIk1OA7x9j2Q=
 github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.29.0 h1:Wjp9vsVSIEyvdiaECfqxY9xBqQ7JaSCGtvHgR4doXZk=
 go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.29.0/go.mod h1:vHItvsnJtp7ES++nFLLFBzUWny7fJQSvTlxFcqQGUr4=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.27.0 h1:0BgiNWjN7rUWO9HdjF4L12r8OW86QkVQcYmCjnayJLo=
@@ -85,6 +93,7 @@ go.uber.org/ratelimit v0.2.0 h1:UQE2Bgi7p2B85uP5dC2bbRtig0C+OeNRnNEafLjsLPA=
 go.uber.org/ratelimit v0.2.0/go.mod h1:YYBV4e4naJvhpitQrWJu1vCpgB7CboMe0qhltKt6mUg=
 golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE=
 golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -93,6 +102,8 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069 h1:siQdpVirKtzPhKl3lZWozZraCFObP8S1v6PRp0bLrtU=
 golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -106,3 +117,4 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/zz_envelopes.go b/zz_envelopes.go
@@ -2584,6 +2584,7 @@ type serverChangePlanRequestEnvelope struct {
 	CPU                  int                   `json:",omitempty"`
 	MemoryMB             int                   `json:",omitempty"`
 	GPU                  int                   `json:",omitempty"`
+	ServerPlanCPUModel   string                `json:"CPUModel,omitempty"`
 	ServerPlanGeneration types.EPlanGeneration `json:"Generation,omitempty"`
 	ServerPlanCommitment types.ECommitment     `json:"Commitment,omitempty"`
 }