From f5886d86934b10592fb70eebe491dd6e70158f63 Mon Sep 17 00:00:00 2001 From: Steve Fraser Date: Mon, 8 Jan 2024 12:37:43 -0500 Subject: [PATCH 1/5] adding provider to convert --- infrastructure/grpc/convert.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/infrastructure/grpc/convert.go b/infrastructure/grpc/convert.go index fa28cdd8..fb222197 100644 --- a/infrastructure/grpc/convert.go +++ b/infrastructure/grpc/convert.go @@ -77,6 +77,10 @@ func convertMicroVMToModel(spec *types.MicroVMSpec) (*models.MicroVM, error) { convertedModel.Spec.Metadata[metadataKey] = metadataValue } + if convertedModel.Spec.Provider != nil { + convertedModel.Spec.Provider = *spec.Provider + } + return convertedModel, nil } From 3654eea4f2975162228b4f4fc1fee8d1a868c944 Mon Sep 17 00:00:00 2001 From: Steve Fraser Date: Mon, 8 Jan 2024 12:42:39 -0500 Subject: [PATCH 2/5] add to creation statement --- infrastructure/grpc/convert.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/infrastructure/grpc/convert.go b/infrastructure/grpc/convert.go index fb222197..c5a0a1bc 100644 --- a/infrastructure/grpc/convert.go +++ b/infrastructure/grpc/convert.go @@ -34,6 +34,7 @@ func convertMicroVMToModel(spec *types.MicroVMSpec) (*models.MicroVM, error) { VCPU: int64(spec.Vcpu), MemoryInMb: int64(spec.MemoryInMb), Metadata: instance.New(), + Provider: spec.Kernel.Provider, }, } @@ -77,10 +78,6 @@ func convertMicroVMToModel(spec *types.MicroVMSpec) (*models.MicroVM, error) { convertedModel.Spec.Metadata[metadataKey] = metadataValue } - if convertedModel.Spec.Provider != nil { - convertedModel.Spec.Provider = *spec.Provider - } - return convertedModel, nil } From 638d0ec85f0aee2ff79a6fafe7db40ed4ff0da35 Mon Sep 17 00:00:00 2001 From: Steve Fraser Date: Mon, 8 Jan 2024 12:49:32 -0500 Subject: [PATCH 3/5] fix variable --- infrastructure/grpc/convert.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure/grpc/convert.go b/infrastructure/grpc/convert.go index c5a0a1bc..98fc9563 100644 --- a/infrastructure/grpc/convert.go +++ b/infrastructure/grpc/convert.go @@ -34,7 +34,7 @@ func convertMicroVMToModel(spec *types.MicroVMSpec) (*models.MicroVM, error) { VCPU: int64(spec.Vcpu), MemoryInMb: int64(spec.MemoryInMb), Metadata: instance.New(), - Provider: spec.Kernel.Provider, + Provider: spec.Provider, }, } From af0bcb3fbc03157934f917ac7a1fc150c07b20ce Mon Sep 17 00:00:00 2001 From: Steve Fraser Date: Mon, 8 Jan 2024 13:02:12 -0500 Subject: [PATCH 4/5] fix provider variable --- infrastructure/grpc/convert.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure/grpc/convert.go b/infrastructure/grpc/convert.go index 98fc9563..da5771f2 100644 --- a/infrastructure/grpc/convert.go +++ b/infrastructure/grpc/convert.go @@ -34,7 +34,7 @@ func convertMicroVMToModel(spec *types.MicroVMSpec) (*models.MicroVM, error) { VCPU: int64(spec.Vcpu), MemoryInMb: int64(spec.MemoryInMb), Metadata: instance.New(), - Provider: spec.Provider, + Provider: *spec.Provider, }, } From 03d3230fc8c51b5433dab7130a644f956841ee24 Mon Sep 17 00:00:00 2001 From: Steve Fraser Date: Mon, 8 Jan 2024 13:10:14 -0500 Subject: [PATCH 5/5] fix tests --- infrastructure/grpc/convert.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/infrastructure/grpc/convert.go b/infrastructure/grpc/convert.go index da5771f2..741a27b6 100644 --- a/infrastructure/grpc/convert.go +++ b/infrastructure/grpc/convert.go @@ -34,7 +34,6 @@ func convertMicroVMToModel(spec *types.MicroVMSpec) (*models.MicroVM, error) { VCPU: int64(spec.Vcpu), MemoryInMb: int64(spec.MemoryInMb), Metadata: instance.New(), - Provider: *spec.Provider, }, } @@ -78,6 +77,10 @@ func convertMicroVMToModel(spec *types.MicroVMSpec) (*models.MicroVM, error) { convertedModel.Spec.Metadata[metadataKey] = metadataValue } + if spec.Provider != nil { + convertedModel.Spec.Provider = *spec.Provider + } + return convertedModel, nil }